Index: /applications/editors/josm/i18n/po/ar.po =================================================================== --- /applications/editors/josm/i18n/po/ar.po (revision 17821) +++ /applications/editors/josm/i18n/po/ar.po (revision 17822) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-22 17:52+0200\n" -"PO-Revision-Date: 2009-09-22 15:24+0000\n" +"POT-Creation-Date: 2009-09-28 16:38+0200\n" +"PO-Revision-Date: 2009-09-22 18:55+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: 2009-09-22 15:46+0000\n" +"X-Launchpad-Export-Date: 2009-09-28 14:34+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -67,8 +67,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250 @@ -91,9 +91,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -126,6 +126,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -142,7 +142,7 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:172 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 @@ -155,5 +155,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 @@ -330,6 +329,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -339,6 +337,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 @@ -348,5 +346,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -357,5 +355,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180 @@ -364,5 +362,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -455,9 +453,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -489,10 +487,9 @@ msgstr "الرجاء إختيار أربعة عقد على الأقل." -#. FIXME: not sure whether this fits in a dialog #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:85 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -602,5 +599,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 #, java-format msgid "File: {0}" @@ -622,36 +619,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine Way" msgstr "ادمج الطريق" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 msgid "Combine several ways into one." msgstr "ادمج عدة طرق في طريق واحدة." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 -msgid "Combine ways with different memberships?" -msgstr "ادمج الطرقات رغم إختلاف عضويتها ؟" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -msgid "Combine Anyway" -msgstr "على أي حال ادمج" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "إن للطرقات المختارة عضويات في علاقات مختلفة. هل تريد دمجها رغم ذلك ؟" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 msgid "Change directions?" msgstr "غيّر الإتجاه ؟" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Reverse and Combine" msgstr "أعكس ثم إدمج" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -659,5 +642,5 @@ msgstr "لا يمكن ضمّ الطرقات في إتجاهاتها الحالية. هل تريد عكس إتجاهات بعضها ؟" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -665,10 +648,10 @@ msgstr "لا يمكن تجميع الطرق (لا يمكن دمجها في سلسلة عقد واحدة)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 #, java-format msgid "Combine {0} ways" msgstr "ادمج {0} طرقات" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 msgid "Please select at least two ways to combine." msgstr "الرجاء إختر على الأقل طريقتين للدمج." @@ -713,6 +696,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -777,5 +759,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -806,5 +788,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307 #, java-format msgid "There were {0} conflicts during import." @@ -822,5 +803,4 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Duplicate" @@ -851,10 +831,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:209 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "صدّر إلى GPX ..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:208 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "صدّر المعطيات إلى ملف GPX..." @@ -865,8 +845,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -931,5 +911,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 @@ -972,6 +952,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1059,22 +1038,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge Nodes" msgstr "إدمج العقد" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 msgid "Merge nodes into the oldest one." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 msgid "Please select at least two nodes to merge." msgstr "الرجاء إختيار على الأقل عقدتين للدمج." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "غير قادر على دمج العقد: فسيتم محو طريق هو قيد الإستعمال." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 #, java-format msgid "Merge {0} nodes" @@ -1146,5 +1125,4 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350 msgid "New" msgstr "جديد" @@ -1322,10 +1300,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "إحفَظ" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "إحفظ المعطيات الحالية." @@ -1380,10 +1358,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "إحفظ كــ ..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "إحفظ المعطيات الحالية في ملف جديد." @@ -1424,5 +1402,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:961 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888 @@ -1658,14 +1636,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 msgid "Upload to OSM..." msgstr "حمّل إلى أو.أس.أم ..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload all changes to the OSM server." msgstr "حمّل كل التغييرات إلى الخادم أو.أس.أم ." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 #, java-format msgid "" @@ -1674,23 +1652,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "لا شيء للتحميل. إحصل على بعض المعطيات أولاً" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:171 msgid "No changes to upload." msgstr "لا يوجد تغييرات للتحميل." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223 #, java-format msgid "Synchronize {0} {1} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 msgid "Synchronize entire dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:228 #, java-format msgid "" @@ -1704,17 +1682,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:283 msgid "Conflict detected" msgstr "" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:257 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 #, java-format msgid "Unexpected return value. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:272 #, java-format msgid "" @@ -1725,5 +1703,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:306 #, java-format msgid "" @@ -1733,34 +1711,39 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 msgid "Changeset closed" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:425 #, java-format msgid "Uploading failed.
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:434 msgid "Upload to OSM API failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457 msgid "Updating primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:514 #, java-format msgid "Uploading data for layer ''{0}''" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." msgstr "" @@ -1849,13 +1832,13 @@ msgstr "تقدّم بطيء" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34 msgid "Downloading GPS data" msgstr "تنزيل معطيات جهاز نظام تحديد المواقع العالمي" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57 msgid "Downloaded GPX Data" msgstr "تمّ تنزيل معطيات جهاز نظام تحديد المواقع العالمي" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87 msgid "Raw GPS data" msgstr "المعطيات الخام لجهاز نظام تحديد المواقع العالمي" @@ -1869,4 +1852,8 @@ msgid "" "Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 +msgid "No data found in this area." msgstr "" @@ -2553,9 +2540,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 +#, java-format +msgid "" +"Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -2604,5 +2591,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Delete from relation" msgstr "أمحي من العلاقة" @@ -2652,14 +2639,15 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 -msgid "Purging 1 primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 -#, java-format -msgid "removing reference from way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 +#, fuzzy, java-format +msgid "Purged object ''{0}''" +msgstr "حرّك الأغراض {0}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 +#, fuzzy, java-format +msgid "Purged {0} objects" +msgstr "غيّر غرض {0}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 #, java-format msgid "" @@ -2668,12 +2656,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203 -#, java-format -msgid "removing reference from relation {0}" -msgstr "" +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 +#, fuzzy, java-format +msgid "Removing reference from relation {0}" +msgstr "هل حقاً أمحي الخيار من العلاقة {0} ؟" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 #, java-format msgid "Resolve conflicts in member list of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -3015,24 +3008,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Error: {0}" msgstr "خطأ : {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Warning: {0}" msgstr "تحذير: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3040,5 +3033,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3064,6 +3057,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:244 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3119,120 +3112,113 @@ msgstr "الطريق ''{0}'' المتعددة الأضلاع هي غير مغلقة." -#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed -#. TODO Remove useless nullcheck when RelationMember.member is encalupsed -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855 -msgid "Empty member in relation." -msgstr "عضو فارغ في العلاقة." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:850 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "أمحي العضو ''{0}'' في العلاقة." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:861 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "للطريق ''{0}'' أقل من نقطتين." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:607 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:613 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627 msgid "More than one \"via\" found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:632 #, java-format msgid "Unknown role ''{0}''." msgstr "دور غير معروف ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 #, java-format msgid "Unknown member type for ''{0}''." msgstr "نوع عضو غير معروف لِــ ''{0}''" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:641 msgid "No \"from\" way found." msgstr "لم أجد طريق \"من\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645 msgid "No \"to\" way found." msgstr "لم أجد طريق \"إلى\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:649 msgid "No \"via\" node or way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:658 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:662 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693 -msgid "The \"from\" way doesn't start or end at the \"via\" way." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:870 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:882 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:940 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1029 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1041 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "الطريق الداخلية ''{0}''موجودة في الخارج." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1094 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1120 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1324 msgid "untagged" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1325 msgid "text" msgstr "النص" @@ -3254,5 +3240,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:249 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 @@ -3267,5 +3253,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 @@ -3302,5 +3288,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:169 msgid "background" msgstr "الخلفية" @@ -3392,5 +3378,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "railway" msgstr "خط سكة حديد" @@ -3450,9 +3436,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +#, fuzzy +msgid "Not Found" +msgstr "لم يُعثر على الملف" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 msgid "Unknown host" msgstr "مضيف غير معروف" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:247 msgid "Primitive already deleted" msgstr "" @@ -4754,5 +4745,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -4966,43 +4957,43 @@ msgstr "عضو من" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 msgid "Add Properties" msgstr "أضف صفة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 msgid "Add a new key/value pair to all objects" msgstr "أضف زوج جديد مفتاح/قيمة إلى كلّ الأغراض" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 msgid "Edit Properties" msgstr "حرّر الخصائص" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 msgid "Edit the value of the selected key for all objects" msgstr "حرّر المحتاح المنقى لكلّ الأغراض" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "الخصائص: {0} / العضويات: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 msgid "Properties / Memberships" msgstr "الخصائص/ العضويات" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 msgid "Change relation" msgstr "غيّر العلاقة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 #, java-format msgid "Really delete selection from relation {0}?" msgstr "هل حقاً أمحي الخيار من العلاقة {0} ؟" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:855 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 msgid "Delete the selected key in all objects" msgstr "أمحي المفتاح المنتقى من كلّ الأغراض" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 msgid "Delete Properties" msgstr "أمحي الخصائص" @@ -5012,6 +5003,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168 -#: build/trans_presets.java:3121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 +#: build/trans_presets.java:3133 msgid "Relations" msgstr "العلاقات" @@ -5021,25 +5012,30 @@ msgstr "إفتح لائحة بكل العلاقات." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:174 #, java-format msgid "Relations: {0}" msgstr "العلاقات: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 msgid "Open an editor for the selected relation" msgstr "إفتح محرر نص للعلاقة المحددة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:325 msgid "Delete the selected relation" msgstr "أمحي العلاقة المحددة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:363 msgid "Create a new relation" msgstr "أنشئ علاقة جديدة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:400 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280 msgid "Create a copy of this relation and open it in another editor window" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 +#, fuzzy +msgid "Set the current selection to the list of selected relations" +msgstr "إفتح محرر نص للعلاقة المحددة" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5080,14 +5076,14 @@ msgstr "الخيار: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 msgid "Undock the panel" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "أغلق هذه اللوحة. يمكنك إعادة فتحها في شريط الأدوات اليساري." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 msgid "Click to minimize/maximize the panel content" msgstr "أنقر لتكبير/تصغير محتويات اللوحة" @@ -5595,5 +5591,5 @@ #. group "Geography" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2771 msgid "Places" msgstr "الأماكن" @@ -6267,6 +6263,4 @@ #. item "Man Made/Windmill" label "Edit Windmill" #. -#. item "Man Made/Pipeline" label "Edit Pipeline" -#. #. item "Man Made/Wastewater Plant" label "Edit Wastewater Plant" #. @@ -6279,4 +6273,6 @@ #. item "Man Made/Surveillance" label "Edit Surveillance Camera" #. +#. item "Man Made/Power Station" label "Edit Power Station" +#. #. item "Amenities/Fountain" label "Edit Fountain" #. @@ -6601,57 +6597,57 @@ #: build/trans_presets.java:2250 build/trans_presets.java:2258 #: build/trans_presets.java:2290 build/trans_presets.java:2295 -#: build/trans_presets.java:2300 build/trans_presets.java:2305 -#: build/trans_presets.java:2311 build/trans_presets.java:2317 -#: build/trans_presets.java:2323 build/trans_presets.java:2331 -#: build/trans_presets.java:2337 build/trans_presets.java:2343 -#: build/trans_presets.java:2349 build/trans_presets.java:2355 -#: build/trans_presets.java:2365 build/trans_presets.java:2462 -#: build/trans_presets.java:2469 build/trans_presets.java:2483 -#: build/trans_presets.java:2489 build/trans_presets.java:2496 -#: build/trans_presets.java:2503 build/trans_presets.java:2509 -#: build/trans_presets.java:2515 build/trans_presets.java:2537 -#: build/trans_presets.java:2544 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2305 build/trans_presets.java:2310 +#: build/trans_presets.java:2316 build/trans_presets.java:2322 +#: build/trans_presets.java:2339 build/trans_presets.java:2345 +#: build/trans_presets.java:2351 build/trans_presets.java:2357 +#: build/trans_presets.java:2363 build/trans_presets.java:2373 +#: build/trans_presets.java:2380 build/trans_presets.java:2474 +#: build/trans_presets.java:2481 build/trans_presets.java:2495 +#: build/trans_presets.java:2501 build/trans_presets.java:2508 +#: build/trans_presets.java:2515 build/trans_presets.java:2521 +#: build/trans_presets.java:2527 build/trans_presets.java:2549 +#: build/trans_presets.java:2556 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2576 #: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2594 build/trans_presets.java:2601 -#: build/trans_presets.java:2608 build/trans_presets.java:2615 -#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2594 build/trans_presets.java:2600 +#: build/trans_presets.java:2606 build/trans_presets.java:2613 +#: build/trans_presets.java:2620 build/trans_presets.java:2627 #: build/trans_presets.java:2633 build/trans_presets.java:2639 -#: build/trans_presets.java:2645 build/trans_presets.java:2652 -#: build/trans_presets.java:2659 build/trans_presets.java:2666 -#: build/trans_presets.java:2672 build/trans_presets.java:2678 -#: build/trans_presets.java:2688 build/trans_presets.java:2697 -#: build/trans_presets.java:2712 build/trans_presets.java:2718 -#: build/trans_presets.java:2726 build/trans_presets.java:2733 -#: build/trans_presets.java:2753 build/trans_presets.java:2764 -#: build/trans_presets.java:2770 build/trans_presets.java:2776 +#: build/trans_presets.java:2645 build/trans_presets.java:2651 +#: build/trans_presets.java:2657 build/trans_presets.java:2664 +#: build/trans_presets.java:2671 build/trans_presets.java:2678 +#: build/trans_presets.java:2684 build/trans_presets.java:2690 +#: build/trans_presets.java:2700 build/trans_presets.java:2709 +#: build/trans_presets.java:2724 build/trans_presets.java:2730 +#: build/trans_presets.java:2738 build/trans_presets.java:2745 +#: build/trans_presets.java:2765 build/trans_presets.java:2776 #: build/trans_presets.java:2782 build/trans_presets.java:2788 -#: build/trans_presets.java:2795 build/trans_presets.java:2802 -#: build/trans_presets.java:2809 build/trans_presets.java:2815 -#: build/trans_presets.java:2821 build/trans_presets.java:2829 -#: build/trans_presets.java:2836 build/trans_presets.java:2843 -#: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2879 build/trans_presets.java:2885 +#: build/trans_presets.java:2794 build/trans_presets.java:2800 +#: build/trans_presets.java:2807 build/trans_presets.java:2814 +#: build/trans_presets.java:2821 build/trans_presets.java:2827 +#: build/trans_presets.java:2833 build/trans_presets.java:2841 +#: build/trans_presets.java:2848 build/trans_presets.java:2855 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2875 build/trans_presets.java:2882 #: build/trans_presets.java:2891 build/trans_presets.java:2897 -#: build/trans_presets.java:2903 build/trans_presets.java:2912 -#: build/trans_presets.java:2922 build/trans_presets.java:2931 -#: build/trans_presets.java:2937 build/trans_presets.java:2943 -#: build/trans_presets.java:2948 build/trans_presets.java:2954 -#: build/trans_presets.java:2960 build/trans_presets.java:2969 -#: build/trans_presets.java:2975 build/trans_presets.java:2981 +#: build/trans_presets.java:2903 build/trans_presets.java:2909 +#: build/trans_presets.java:2915 build/trans_presets.java:2924 +#: build/trans_presets.java:2934 build/trans_presets.java:2943 +#: build/trans_presets.java:2949 build/trans_presets.java:2955 +#: build/trans_presets.java:2960 build/trans_presets.java:2966 +#: build/trans_presets.java:2972 build/trans_presets.java:2981 #: build/trans_presets.java:2987 build/trans_presets.java:2993 #: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3012 build/trans_presets.java:3018 -#: build/trans_presets.java:3023 build/trans_presets.java:3030 -#: build/trans_presets.java:3037 build/trans_presets.java:3043 -#: build/trans_presets.java:3052 build/trans_presets.java:3060 -#: build/trans_presets.java:3066 build/trans_presets.java:3072 -#: build/trans_presets.java:3079 build/trans_presets.java:3085 -#: build/trans_presets.java:3092 build/trans_presets.java:3098 +#: build/trans_presets.java:3011 build/trans_presets.java:3017 +#: build/trans_presets.java:3024 build/trans_presets.java:3030 +#: build/trans_presets.java:3035 build/trans_presets.java:3042 +#: build/trans_presets.java:3049 build/trans_presets.java:3055 +#: build/trans_presets.java:3064 build/trans_presets.java:3072 +#: build/trans_presets.java:3078 build/trans_presets.java:3084 +#: build/trans_presets.java:3091 build/trans_presets.java:3097 #: build/trans_presets.java:3104 build/trans_presets.java:3110 -#: build/trans_presets.java:3116 build/trans_presets.java:3129 -#: build/trans_presets.java:3143 build/trans_presets.java:3157 +#: build/trans_presets.java:3116 build/trans_presets.java:3122 +#: build/trans_presets.java:3128 build/trans_presets.java:3141 +#: build/trans_presets.java:3155 build/trans_presets.java:3169 msgid "Name" msgstr "الإسم" @@ -6714,5 +6710,4 @@ msgstr "" -#. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 msgid "Close the selected open changesets" @@ -6740,25 +6735,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "Yes" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "No" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47 #, java-format msgid "Layer ''{0}'' has modifications which should be uploaded to the server." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49 #, java-format msgid "Layer ''{0}'' has no modifications to be uploaded." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60 #, java-format msgid "" @@ -6767,29 +6762,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62 #, java-format msgid "Layer ''{0}'' has no modifications to be saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80 msgid "No file associated with this layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:83 msgid "Please select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:86 #, java-format msgid "Layer ''{0}'' is not backed by a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:101 #, java-format msgid "File ''{0}'' is not writable. Please enter another file name." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:115 #, java-format msgid "Select to upload layer ''{0}'' to the server ''{1}''" @@ -6882,5 +6877,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -msgid "Save and Exit" +#, fuzzy +msgid "Save/Upload and Exit" msgstr "حفظ و خروج" @@ -6890,6 +6886,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -msgid "Save and Delete" -msgstr "" +#, fuzzy +msgid "Save/Upload and Delete" +msgstr "تمّ إلغاء التحميل" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 @@ -6905,5 +6902,5 @@ msgid "" "An upload and/or save operation of one layer with modifications
was " -"cancelled or has been failed." +"cancelled or has failed." msgstr "" @@ -6989,6 +6986,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:891 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:921 msgid "Tags of new changeset" msgstr "" @@ -7085,7 +7082,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:909 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:933 #, java-format msgid "Tags of changeset {0}" @@ -7093,48 +7089,48 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:949 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:963 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1011 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106 msgid "Preparing primitives to upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "الصول لِــ {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "إقرءGPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "لا توقيت للنقطة {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "غير قادر على قراءة الزمن \"{0}\" من النقطة {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325 msgid "No images with readable timestamps found." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format @@ -7142,29 +7138,29 @@ msgstr "جاري قراءة {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:402 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246 msgid "Geotagged Images" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:587 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "GPS start: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 #, java-format msgid "GPS end: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594 #, java-format msgid "current delta: {0}s" msgstr "الإنحراف الحالي: {0}ث" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595 msgid "timezone difference: " msgstr "إختلاف في التوقيت الجغرافي: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284 msgid "image" @@ -7177,14 +7173,14 @@ msgstr[5] "صور" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #, java-format msgid "{0} within the track." msgstr "{0} من ضمن المسلك." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680 msgid "Sync clock" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7192,32 +7188,32 @@ msgstr "صور (*.jpg)JPEG" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:734 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 msgid "Image" msgstr "الصورة" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:752 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759 msgid "GPS unit timezone (difference to photo)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:767 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771 msgid "Synchronize Time with GPS Unit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:790 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 msgid "Time entered could not be parsed." msgstr "" @@ -7301,5 +7297,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 #, java-format msgid "Name: {0}" @@ -7322,5 +7318,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3160 +#: build/trans_presets.java:3172 msgid "Description" msgstr "" @@ -7376,5 +7372,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:587 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 @@ -7435,42 +7431,73 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:105 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:107 #, java-format msgid "Data Layer {0}" msgstr "طبقة المعطيات {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 msgid "outside downloaded area" msgstr "خارج عن المنطقة المنزلة" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:252 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:289 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:290 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 +#, java-format +msgid "There was {0} conflict detected." +msgid_plural "There were {0} conflicts detected." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 +#, java-format +msgid "" +"{0} object has been purged from the local dataset because it is deleted on " +"the server." +msgid_plural "" +"{0} objects have been purged from the local dataset because they are deleted " +"on the server." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 +#, fuzzy +msgid "Conflicts detected" +msgstr "التناقضات" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 #, java-format msgid "{0} consists of:" msgstr "{0} يتألف من:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:476 #, java-format msgid " ({0} deleted.)" msgstr " ({0} ممحي.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:501 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:584 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" @@ -7828,5 +7855,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:412 #: ../plugins/terracer/src/terracer/TerracerAction.java:430 @@ -8556,5 +8583,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261 msgid "More information about this feature" msgstr "مزيد من المعلومات عن هذه الميزة" @@ -8603,5 +8630,5 @@ msgstr "العناصر من الفصيلة {0} هي مدعومة" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:700 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -8615,18 +8642,18 @@ msgstr[5] "غيّر {0} غرض" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "الخيار فارغ !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 msgid "Selection unsuitable!" msgstr "الخيار غير مناسب !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 msgid "Apply Preset" msgstr "طبّق الخيار المسبق" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788 msgid "Change Properties" msgstr "غيّر الخصائص" @@ -8910,44 +8937,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 msgid "Preparing..." msgstr "اعداد..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 msgid "Uploading..." msgstr "جاري الإرسال..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9176,5 +9203,5 @@ msgid "" "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}''," -"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." +"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." msgstr "" @@ -9291,6 +9318,6 @@ #, java-format msgid "" -"Relation with external id ''{0}'' refers to missing primitive with external " -"id ''{1}''." +"Relation with external id ''{0}'' refers to a missing primitive with " +"external id ''{1}''." msgstr "" @@ -9385,32 +9412,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:73 msgid "Starting to upload with one request per primitive ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Starting to upload in one request ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 +#, java-format +msgid "Parameter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 msgid "Uploading data ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 msgid "" "WARNING: no API version defined for data to upload. Falling back to version " @@ -9418,5 +9450,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:153 #, java-format msgid "" @@ -9623,5 +9655,5 @@ #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:202 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:324 build/trans_presets.java:325 @@ -9643,6 +9675,6 @@ #: build/trans_presets.java:789 build/trans_presets.java:1333 #: build/trans_presets.java:1400 build/trans_presets.java:1401 -#: build/trans_presets.java:1402 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 +#: build/trans_presets.java:1402 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 msgid "unknown" msgstr "مجهول" @@ -9781,5 +9813,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:192 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:182 +#, java-format +msgid "" +"The OSM server ''{0}'' doesn't know about an object
you tried to read, " +"update, or delete. Either the respective object
doesn''t exist on the " +"server or you''re using an invalid URL to access
it. Please carefully " +"check the servers address ''{1}'' for typos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:209 #, java-format msgid "" @@ -9789,5 +9830,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:262 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:279 #, java-format msgid "" @@ -10043,17 +10084,15 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35 msgid "Define Address Interpolation" msgstr "" -#. Whether to re-trigger data changed for relation #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:413 #: ../plugins/terracer/src/terracer/TerracerAction.java:437 @@ -10061,99 +10100,99 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 msgid "Alphabetic" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161 #, java-format msgid "Relation: {0}" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173 msgid "Associate with street using:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184 msgid "Numbering Scheme:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 msgid "Starting #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188 msgid "Ending #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 #, java-format msgid "Will associate {0} additional house number nodes" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 msgid "Starting address number must be less than ending address number" msgstr "" @@ -10879,4 +10918,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52 +#: build/trans_presets.java:2331 msgid "Location" msgstr "" @@ -11416,4 +11456,5 @@ msgstr "" +#. item "Man Made/Pipeline" combo "Type" #. color highway_track #. @@ -11459,7 +11500,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:990 build/trans_style.java:1007 -#: build/trans_style.java:1023 build/trans_style.java:3400 -#: build/trans_style.java:3408 +#: build/trans_presets.java:2330 build/trans_style.java:990 +#: build/trans_style.java:1007 build/trans_style.java:1023 +#: build/trans_style.java:3400 build/trans_style.java:3408 msgid "water" msgstr "الماء" @@ -13982,9 +14023,11 @@ #. item "Public Transport/Airport" text "Name" #. +#. item "Man Made/Power Station" text "Operator" #. item "Relations/Route" text "Name" #: build/trans_presets.java:65 build/trans_presets.java:101 #: build/trans_presets.java:121 build/trans_presets.java:141 #: build/trans_presets.java:178 build/trans_presets.java:198 -#: build/trans_presets.java:1560 build/trans_presets.java:3158 +#: build/trans_presets.java:1560 build/trans_presets.java:2382 +#: build/trans_presets.java:3170 msgid "Reference" msgstr "" @@ -14546,5 +14589,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 msgid "metal" msgstr "" @@ -14564,5 +14607,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 #: build/trans_style.java:3375 msgid "wood" @@ -14851,7 +14894,7 @@ #: build/trans_presets.java:1401 build/trans_presets.java:1402 #: build/trans_presets.java:1767 build/trans_presets.java:1777 -#: build/trans_presets.java:2408 build/trans_presets.java:2444 -#: build/trans_presets.java:2453 build/trans_presets.java:2454 -#: build/trans_presets.java:2455 build/trans_presets.java:2725 +#: build/trans_presets.java:2420 build/trans_presets.java:2456 +#: build/trans_presets.java:2465 build/trans_presets.java:2466 +#: build/trans_presets.java:2467 build/trans_presets.java:2737 msgid "yes" msgstr "" @@ -15000,8 +15043,8 @@ #: build/trans_presets.java:1400 build/trans_presets.java:1401 #: build/trans_presets.java:1402 build/trans_presets.java:1767 -#: build/trans_presets.java:1777 build/trans_presets.java:2408 -#: build/trans_presets.java:2444 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 -#: build/trans_presets.java:2725 +#: build/trans_presets.java:1777 build/trans_presets.java:2420 +#: build/trans_presets.java:2456 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 +#: build/trans_presets.java:2737 msgid "no" msgstr "" @@ -15139,6 +15182,8 @@ #. item "Water/Wetland" text "Name" #. item "Car/Parking" text "Reference number" +#. item "Man Made/Pipeline" text "Operator" #. item "Man Made/Power Generator" label "Edit Power Generator" #. +#. item "Man Made/Power Tower" label "Edit Power Tower" #. item "Land use/Tree" text "Name" #. item "Land use/Wood" text "Name" @@ -15146,7 +15191,8 @@ #: build/trans_presets.java:350 build/trans_presets.java:649 #: build/trans_presets.java:789 build/trans_presets.java:1137 -#: build/trans_presets.java:1395 build/trans_presets.java:2364 -#: build/trans_presets.java:2913 build/trans_presets.java:2923 -#: build/trans_presets.java:2932 +#: build/trans_presets.java:1395 build/trans_presets.java:2330 +#: build/trans_presets.java:2372 build/trans_presets.java:2398 +#: build/trans_presets.java:2925 build/trans_presets.java:2935 +#: build/trans_presets.java:2944 msgid "Type" msgstr "النوع" @@ -15696,10 +15742,10 @@ #. item "Tourism/Information Terminal" text "Closer description" #. item "Tourism/Audioguide" text "Closer description" -#. item "Man Made/Power Station" label "Edit Power Station" -#. +#. item "Man Made/Tower" text "Height (meters)" +#. item "Man Made/Pipeline" label "Edit Pipeline" +#. +#. item "Man Made/Power Station" text "Name" #. item "Man Made/Power Sub Station" label "Edit Power Sub Station" #. -#. item "Man Made/Power Line" label "Edit Power Line" -#. #. item #. #: build/trans_presets.java:1535 build/trans_presets.java:1789 -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2465 msgid "Shelter" msgstr "ملجأ" @@ -18057,5 +18105,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1877 build/trans_presets.java:2669 +#: build/trans_presets.java:1877 build/trans_presets.java:2681 msgid "Sports" msgstr "" @@ -19408,6 +19456,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "Religion" msgstr "الديانة" @@ -19416,66 +19464,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "bahai" msgstr "بهائي" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "buddhist" msgstr "بوذي" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "christian" msgstr "نصراني" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "hindu" msgstr "هندوس" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jain" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jewish" msgstr "يهودي" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "muslim" msgstr "مسلم" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "sikh" msgstr "سيخ" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "spiritualist" msgstr "روحاني" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "taoist" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "zoroastrian" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "Denomination" msgstr "الطقوس الدينية" @@ -19484,76 +19532,76 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "anglican" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "baptist" msgstr "معمداني" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "catholic" msgstr "كثليك" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "evangelical" msgstr "إنجيلي" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "jehovahs_witness" msgstr "شهود يهوه" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "lutheran" msgstr "لوثري" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "methodist" msgstr "منهجي" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "mormon" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "orthodox" msgstr "أرثدكس" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "pentecostal" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "presbyterian" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "protestant" msgstr "بروتستاني" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "quaker" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "shia" msgstr "شيعي" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "sunni" msgstr "سنّي" @@ -19649,25 +19697,49 @@ #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2296 +#, fuzzy +msgid "Tower type" +msgstr "نوع الطريق" + +#. item "Man Made/Tower" combo "Tower type" +#: build/trans_presets.java:2296 +#, fuzzy +msgid "communication" +msgstr "الإتصال" + +#: build/trans_presets.java:2296 +#, fuzzy +msgid "observation" +msgstr "إرتفاع" + +#. +#: build/trans_presets.java:2298 +#, fuzzy +msgid "Height (meters)" +msgstr "الإرتفاع الأقصى (أمتار)" + +#. item "Man Made/Tower" text "Operator" +#. +#: build/trans_presets.java:2302 msgid "Water Tower" msgstr "خزان / برج مياه" #. item -#: build/trans_presets.java:2298 +#: build/trans_presets.java:2303 msgid "Edit Water Tower" msgstr "حرّر خزان/برج مياه" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2307 msgid "Gasometer" msgstr "خزان محروقات" #. item -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2308 msgid "Edit Gasometer" msgstr "حرّر خزان المحروقات" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2307 +#: build/trans_presets.java:2312 msgid "Lighthouse" msgstr "منارة" @@ -19675,10 +19747,10 @@ #. item #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2314 msgid "Edit Lighthouse" msgstr "حرّر منارة" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2318 msgid "Windmill" msgstr "طاحونة هوائية" @@ -19686,21 +19758,54 @@ #. item #. -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2320 msgid "Edit Windmill" msgstr "حرّر طاحونة هوائية" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2319 +#: build/trans_presets.java:2324 msgid "Pipeline" msgstr "خط أنابيب" #. item -#. -#: build/trans_presets.java:2321 +#. +#: build/trans_presets.java:2327 msgid "Edit Pipeline" msgstr "حرّر خط أنابيب" -#. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2330 +#, fuzzy +msgid "oil" +msgstr "طاقة أحفورية" + +#: build/trans_presets.java:2330 build/trans_presets.java:2372 +msgid "gas" +msgstr "غاز" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "sewage" +msgstr "الإستعمال" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "heat" +msgstr "أرض بور" + +#: build/trans_presets.java:2330 +msgid "any substance" +msgstr "" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "underwater" +msgstr "الماء" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "overground" +msgstr "تحت الأرض" + +#: build/trans_presets.java:2333 msgid "Wastewater Plant" msgstr "محطّة تكرير مياه" @@ -19710,10 +19815,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:2329 +#: build/trans_presets.java:2337 msgid "Edit Wastewater Plant" msgstr "حرّر محطّة تكرير مياه" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2333 +#: build/trans_presets.java:2341 msgid "Crane" msgstr "ونش" @@ -19721,10 +19826,10 @@ #. item #. -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2343 msgid "Edit Crane" msgstr "حرّر ونش" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2347 msgid "Beacon" msgstr "عمود إضائة" @@ -19732,10 +19837,10 @@ #. item #. -#: build/trans_presets.java:2341 +#: build/trans_presets.java:2349 msgid "Edit Beacon" msgstr "حرّر عمود إضاءة" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2353 msgid "Survey Point" msgstr "نقطة رؤية" @@ -19743,10 +19848,10 @@ #. item #. -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2355 msgid "Edit Survey Point" msgstr "حرّر نقطة رؤية" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2359 msgid "Surveillance" msgstr "مراقبة" @@ -19754,5 +19859,5 @@ #. item #. -#: build/trans_presets.java:2353 +#: build/trans_presets.java:2361 msgid "Edit Surveillance Camera" msgstr "حرّر كامرة مراقبة" @@ -19760,5 +19865,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2366 msgid "Power Generator" msgstr "مولد طاقة" @@ -19768,39 +19873,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:2362 +#: build/trans_presets.java:2370 msgid "Edit Power Generator" msgstr "حرّر مولد طاقة" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "wind" msgstr "أرياح" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "hydro" msgstr "مائية" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "fossil" msgstr "طاقة أحفورية" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "nuclear" msgstr "نووية" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "coal" msgstr "فحم" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "photovoltaic" msgstr "كهرباء شمسية" -#: build/trans_presets.java:2364 -msgid "gas" -msgstr "غاز" - #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2375 msgid "Power Station" msgstr "محطة توليد طاقة" @@ -19809,10 +19910,10 @@ #. -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2378 msgid "Edit Power Station" msgstr "حرّر محطة توليد طاقة" -#. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2374 +#. item "Man Made/Power Station" text "Reference" +#: build/trans_presets.java:2384 msgid "Power Sub Station" msgstr "محطة طاقة فرعية" @@ -19821,5 +19922,5 @@ #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2387 msgid "Edit Power Sub Station" msgstr "حرّر محطة طاقة فرعية" @@ -19827,10 +19928,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2380 build/trans_presets.java:2396 +#: build/trans_presets.java:2390 build/trans_presets.java:2407 msgid "Line reference" msgstr "رقم الخط" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2382 +#: build/trans_presets.java:2392 msgid "Power Tower" msgstr "عمود كهربائي" @@ -19841,11 +19942,26 @@ #. 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:2387 +#: build/trans_presets.java:2397 msgid "Edit Power Tower" msgstr "حرّر عمود كهربائي" -#. item "Man Made/Power Tower" label "Edit Power Tower" -#. -#: build/trans_presets.java:2390 +#. item "Man Made/Power Tower" combo "Type" +#: build/trans_presets.java:2398 +#, fuzzy +msgid "tower" +msgstr "برج" + +#: build/trans_presets.java:2398 +#, fuzzy +msgid "pole" +msgstr "الدّور" + +#: build/trans_presets.java:2399 +#, fuzzy +msgid "Tower reference" +msgstr "رقم الخط" + +#. item "Man Made/Power Tower" text "Tower reference" +#: build/trans_presets.java:2401 msgid "Power Line" msgstr "سلك/خط كهربائي" @@ -19854,40 +19970,82 @@ #. -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2404 msgid "Edit Power Line" msgstr "حرّر عمود كهربائي" +#. item "Man Made/Power Line" label "Edit Power Line" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "Line type" +msgstr "نوع الطريق" + +#. item "Man Made/Power Line" combo "Line type" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "line" +msgstr "خط أنابيب" + +#: build/trans_presets.java:2405 +msgid "minor_line" +msgstr "" + #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2408 msgid "Voltage" msgstr "التوتر" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2398 -msgid "Amount of Wires" +#: build/trans_presets.java:2409 +#, fuzzy +msgid "Amount of Cables" msgstr "عدد الأسلاك" -#. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2401 +#. item "Man Made/Power Line" text "Amount of Cables" +#: build/trans_presets.java:2410 +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:2410 +#, fuzzy +msgid "single" +msgstr "الزاوية" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "double" +msgstr "الدّور" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "triple" +msgstr "الملفّ" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "quad" +msgstr "كسارة / مقلع حجارة" + +#: build/trans_presets.java:2413 msgid "Amenities" msgstr "خدمات/نافعات" #. group "Amenities" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2414 msgid "Toilets" msgstr "مراحيض" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2409 build/trans_presets.java:2525 +#: build/trans_presets.java:2421 build/trans_presets.java:2537 msgid "Note" msgstr "الملاحظة" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2411 +#: build/trans_presets.java:2423 msgid "Post Box" msgstr "صندوق بريد" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2428 msgid "Telephone" msgstr "هاتف" @@ -19896,5 +20054,5 @@ #. -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2431 msgid "Edit Telephone" msgstr "حرّر هاتف" @@ -19902,5 +20060,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2422 build/trans_presets.java:2526 +#: build/trans_presets.java:2434 build/trans_presets.java:2538 msgid "Coins" msgstr "عملات معدنية" @@ -19908,5 +20066,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2423 build/trans_presets.java:2527 +#: build/trans_presets.java:2435 build/trans_presets.java:2539 msgid "Notes" msgstr "الملاحظات" @@ -19914,5 +20072,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2424 build/trans_presets.java:2528 +#: build/trans_presets.java:2436 build/trans_presets.java:2540 msgid "Electronic purses and Charge cards" msgstr "" @@ -19920,5 +20078,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2425 build/trans_presets.java:2529 +#: build/trans_presets.java:2437 build/trans_presets.java:2541 msgid "Debit cards" msgstr "" @@ -19926,15 +20084,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2426 build/trans_presets.java:2530 +#: build/trans_presets.java:2438 build/trans_presets.java:2542 msgid "Credit cards" msgstr "بطاقات إعتماد" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2439 msgid "Telephone cards" msgstr "بطاقات هاتفية" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2429 +#: build/trans_presets.java:2441 msgid "Recycling" msgstr "إعادة تصنيع الأشياء" @@ -19943,5 +20101,5 @@ #. -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2444 msgid "Edit Recycling station" msgstr "حرّر إعادة تصنيع الأشياء" @@ -19949,35 +20107,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2446 msgid "Batteries" msgstr "بطاريات" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2435 +#: build/trans_presets.java:2447 msgid "Cans" msgstr "علب (معدنية)" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2448 msgid "Clothes" msgstr "ملابس" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2437 +#: build/trans_presets.java:2449 msgid "Glass" msgstr "زجاج" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2450 msgid "Paper" msgstr "ورق" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2451 msgid "Scrap Metal" msgstr "" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2453 msgid "Bench" msgstr "" @@ -19986,31 +20144,31 @@ #. #. -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2456 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "stone" msgstr "" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "plastic" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "black" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "brown" msgstr "" @@ -20081,5 +20239,5 @@ #. #. -#: build/trans_presets.java:2446 build/trans_style.java:3063 +#: build/trans_presets.java:2458 build/trans_style.java:3063 #: build/trans_style.java:3071 build/trans_style.java:3079 #: build/trans_style.java:3087 build/trans_style.java:3135 @@ -20089,27 +20247,27 @@ msgstr "خضار" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "red" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "blue" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "white" msgstr "" -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2459 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2461 msgid "Hunting Stand" msgstr "" #. item -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2462 msgid "Edit Hunting Stand" msgstr "" @@ -20118,30 +20276,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2452 build/trans_presets.java:2914 +#: build/trans_presets.java:2464 build/trans_presets.java:2926 msgid "Height" msgstr "الإرتفاع" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "low" msgstr "منخفض" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "half" msgstr "نصف" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "full" msgstr "ملء" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2466 msgid "Hide" msgstr "مخبئ" -#: build/trans_presets.java:2455 +#: build/trans_presets.java:2467 msgid "Lock" msgstr "" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2469 msgid "Fountain" msgstr "نافورة" @@ -20150,10 +20308,10 @@ #. -#: build/trans_presets.java:2460 +#: build/trans_presets.java:2472 msgid "Edit Fountain" msgstr "حرّر نافورة" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2476 msgid "Drinking Water" msgstr "ماء شفة" @@ -20162,10 +20320,10 @@ #. -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2479 msgid "Edit Drinking Water" msgstr "حرّر ماء شفة" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2471 +#: build/trans_presets.java:2483 msgid "Baby Hatch" msgstr "" @@ -20173,33 +20331,33 @@ #. item #. -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2485 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2491 msgid "Shops" msgstr "مَتاجر/دكاكين" #. group "Shops" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2492 msgid "Supermarket" msgstr "سوبرماركت" #. item -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2493 msgid "Edit Supermarket" msgstr "حرّر سوبرماركت" -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2498 msgid "Chemist" msgstr "" #. item -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2499 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2504 msgid "Convenience Store" msgstr "" @@ -20207,9 +20365,9 @@ #. item #. -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2506 msgid "Edit Convenience Store" msgstr "" -#: build/trans_presets.java:2499 +#: build/trans_presets.java:2511 msgid "Kiosk" msgstr "كشك" @@ -20217,27 +20375,27 @@ #. item #. -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2513 msgid "Edit Kiosk" msgstr "حرّر كشك" -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2518 msgid "Book Store" msgstr "" #. item -#: build/trans_presets.java:2507 +#: build/trans_presets.java:2519 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2524 msgid "Travel Agency" msgstr "" #. item -#: build/trans_presets.java:2513 +#: build/trans_presets.java:2525 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2518 +#: build/trans_presets.java:2530 msgid "Vending machine" msgstr "آلة بيع" @@ -20245,5 +20403,5 @@ #. item #. -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2532 msgid "Edit Vending machine" msgstr "" @@ -20251,88 +20409,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "Vending products" msgstr "نوعية المبيعات" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_tickets" msgstr "تذاكر_النقل_العام" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_plans" msgstr "خرائط_النقل_العام" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "parking_tickets" msgstr "تذاكر_موقف_سيارات" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "food" msgstr "مأكولات" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "drinks" msgstr "مشروبات" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "sweets" msgstr "حلويات" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "cigarettes" msgstr "سجائر" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "photos" msgstr "صور" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "animal_food" msgstr "مأكولات للحيوانات" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "news_papers" msgstr "جرائد" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "toys" msgstr "ألعاب" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "stamps" msgstr "طوابع" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "SIM-cards" msgstr "رقائق SIM" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "telephone_vouchers" msgstr "قسائم تعبئة هاتفية" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "vouchers" msgstr "قسائم" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "condoms" msgstr "مانع الحمل" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "tampons" msgstr "سدادات قطنية" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "excrement_bags" msgstr "" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2543 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2545 msgid "Butcher" msgstr "جزار" @@ -20340,9 +20498,9 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2547 msgid "Edit Butcher" msgstr "حرّر جزار" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2552 msgid "Baker" msgstr "خباز" @@ -20350,9 +20508,9 @@ #. item #. -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2554 msgid "Edit Baker" msgstr "حرّر خباز" -#: build/trans_presets.java:2547 +#: build/trans_presets.java:2559 msgid "Florist" msgstr "بائع الزهور" @@ -20360,18 +20518,18 @@ #. item #. -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2561 msgid "Edit Florist" msgstr "حرّر بائع الزهور" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2566 msgid "Organic" msgstr "مأكولات عضوية" #. item -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2567 msgid "Edit Organic Shop" msgstr "حرّر مبيع مأكولات عضوية" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2572 msgid "Alcohol" msgstr "" @@ -20379,54 +20537,54 @@ #. item #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2574 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2579 msgid "Beverages" msgstr "مشروبات" #. item -#: build/trans_presets.java:2568 +#: build/trans_presets.java:2580 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2573 +#: build/trans_presets.java:2585 msgid "Computer" msgstr "حاسوب" #. item -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2586 msgid "Edit Computer Shop" msgstr "حرّر مبيع قطع حاسوب" -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2591 msgid "Electronics" msgstr "إلكترونيات" #. item -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2592 msgid "Edit Electronics Shop" msgstr "حرّر إلكترونيات" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2597 msgid "Hifi" msgstr "Hifi" #. item -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2598 msgid "Edit Hifi Shop" msgstr "حرّر مبيع Hifi" -#: build/trans_presets.java:2591 +#: build/trans_presets.java:2603 msgid "Furniture" msgstr "أثاث/فرش" #. item -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2604 msgid "Edit Furniture Shop" msgstr "حرّر مبيع فرش/أثاث" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2609 msgid "Garden Centre" msgstr "" @@ -20434,9 +20592,9 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2611 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2616 msgid "Hardware" msgstr "خردوات/أدوات منزلية" @@ -20444,9 +20602,9 @@ #. item #. -#: build/trans_presets.java:2606 +#: build/trans_presets.java:2618 msgid "Edit Hardware Store" msgstr "حرّر مخزن خردوات/أدوات منزلية" -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2623 msgid "Do-it-yourself-store" msgstr "" @@ -20454,54 +20612,54 @@ #. item #. -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2625 msgid "Edit Do-it-yourself-store" msgstr "" -#: build/trans_presets.java:2618 +#: build/trans_presets.java:2630 msgid "Stationery" msgstr "قرطاسية" #. item -#: build/trans_presets.java:2619 +#: build/trans_presets.java:2631 msgid "Edit Stationery Shop" msgstr "حرّر مبيع قرطاسية" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2636 msgid "Hairdresser" msgstr "حلاق" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2637 msgid "Edit Hairdresser" msgstr "حرّر حلاق" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2642 msgid "Shoes" msgstr "أحذية" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2643 msgid "Edit Shoe Shop" msgstr "حرّر أحذية" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2648 msgid "Toys" msgstr "ألعاب" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2649 msgid "Edit Toy Shop" msgstr "حرّر مبيع ألعاب" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2654 msgid "Video" msgstr "مرئيّات" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2655 msgid "Edit Video Shop" msgstr "حرّر مبيع مرئيّات" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2660 msgid "Dry Cleaning" msgstr "تنظيف جاف" @@ -20509,9 +20667,9 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2662 msgid "Edit Dry Cleaning" msgstr "حرّر تنظيف جاف" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2667 msgid "Laundry" msgstr "مصبغة/غسيل" @@ -20519,9 +20677,9 @@ #. item #. -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2669 msgid "Edit Laundry" msgstr "حرّر مصبغة/غسيل" -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2674 msgid "Outdoor" msgstr "نشاطات في الخلاء" @@ -20529,28 +20687,28 @@ #. item #. -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2676 msgid "Edit Outdoor Shop" msgstr "حرّر متجر نشاطات في الخلاء" #. item -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2682 msgid "Edit Sports Shop" msgstr "حرّرمبيع لوازم للأنشطة رياضية" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2687 msgid "Optician" msgstr "" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2688 msgid "Edit Optician" msgstr "حرّر نظاراتي" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2695 msgid "Cash" msgstr "نقود/أموال" #. group "Cash" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2696 msgid "Bank" msgstr "مصرف" @@ -20558,14 +20716,14 @@ #. item #. -#: build/trans_presets.java:2686 +#: build/trans_presets.java:2698 msgid "Edit Bank" msgstr "حرّر مصرف" -#: build/trans_presets.java:2691 build/trans_presets.java:2700 +#: build/trans_presets.java:2703 build/trans_presets.java:2712 msgid "Automated Teller Machine" msgstr "صرّاف آلي" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2705 msgid "Money Exchange" msgstr "صرّاف" @@ -20573,5 +20731,5 @@ #. item #. -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2707 msgid "Edit Money Exchange" msgstr "حرّر صرّاف" @@ -20579,15 +20737,15 @@ #. item #. -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2714 msgid "Edit Automated Teller Machine" msgstr "حرّر صراف آلي" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2719 msgid "Health" msgstr "صحة" #. group "Health" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2720 msgid "Doctors" msgstr "أطباء" @@ -20595,18 +20753,18 @@ #. item #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2722 msgid "Edit Doctors" msgstr "حرّر أطباء" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2727 msgid "Dentist" msgstr "طبيب أسنان" #. item -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2728 msgid "Edit Dentist" msgstr "حرّر طبيب أسنان" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2733 msgid "Pharmacy" msgstr "صيدلية" @@ -20614,5 +20772,5 @@ #. item #. -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2735 msgid "Edit Pharmacy" msgstr "حرّر صيدلية" @@ -20620,9 +20778,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2737 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2741 msgid "Hospital" msgstr "مستشفى" @@ -20630,10 +20788,10 @@ #. item #. -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2743 msgid "Edit Hospital" msgstr "حرّر مستشفى" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2747 msgid "Emergency Access Point" msgstr "نقطة دخول طوارئ" @@ -20642,5 +20800,5 @@ #. -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2750 msgid "Edit Emergency Access Point" msgstr "حرّر نقطة دخول طوارئ" @@ -20649,20 +20807,20 @@ #. #. -#: build/trans_presets.java:2741 +#: build/trans_presets.java:2753 msgid "Point Number" msgstr "رقم النقطة" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2742 +#: build/trans_presets.java:2754 msgid "Point Name" msgstr "إسم النقطة" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2756 msgid "Phone Number" msgstr "رقم الهاتف" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2757 msgid "(Use international code, like +12-345-67890)" msgstr "إستعمل رمز دولي مثل 12-345-67890" @@ -20670,5 +20828,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2760 msgid "Veterinary" msgstr "بيطري" @@ -20677,59 +20835,59 @@ #. -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2763 msgid "Edit Veterinary" msgstr "حرّر بيطري" -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2770 msgid "Geography" msgstr "" #. group "Places" -#: build/trans_presets.java:2760 +#: build/trans_presets.java:2772 msgid "Continent" msgstr "قارة" #. item -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2773 msgid "Edit Continent" msgstr "حرّر قارة" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2766 +#: build/trans_presets.java:2778 msgid "Country" msgstr "وطن" #. item -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2779 msgid "Edit Country" msgstr "حرّر وطن" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2784 msgid "State" msgstr "دولة/ولاية" #. item -#: build/trans_presets.java:2773 +#: build/trans_presets.java:2785 msgid "Edit State" msgstr "حرّر دولة/ولاية" #. item "Places/State" text "Name" -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2790 msgid "Region" msgstr "قطر/منطقة" #. item -#: build/trans_presets.java:2779 +#: build/trans_presets.java:2791 msgid "Edit Region" msgstr "حرّر قطر/منطقة" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2796 msgid "County" msgstr "" #. item -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2797 msgid "Edit County" msgstr "" @@ -20737,15 +20895,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2803 msgid "City" msgstr "مدينة" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2804 msgid "Edit City" msgstr "حرّر مدينة" #. item "Places/City" text "Name" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2809 msgid "Town" msgstr "بلدة" @@ -20753,10 +20911,10 @@ #. item #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2811 msgid "Edit Town" msgstr "حرّر بلدة" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2804 +#: build/trans_presets.java:2816 msgid "Suburb" msgstr "ضاحية" @@ -20764,25 +20922,25 @@ #. item #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2818 msgid "Edit Suburb" msgstr "حرّر ضاحية" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2823 msgid "Village" msgstr "قرية" #. item -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2824 msgid "Edit Village" msgstr "حرّر قرية" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2817 +#: build/trans_presets.java:2829 msgid "Hamlet" msgstr "قرية صغيرة" #. item -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2830 msgid "Edit Hamlet" msgstr "حرّر قرية صغيرة" @@ -20790,5 +20948,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2824 +#: build/trans_presets.java:2836 msgid "Locality" msgstr "محلة" @@ -20796,10 +20954,10 @@ #. item #. -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2838 msgid "Edit Locality" msgstr "حرّر محلة" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2843 msgid "Island" msgstr "جزيرة" @@ -20807,10 +20965,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2845 msgid "Edit Island" msgstr "حرّر جزيرة" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2838 +#: build/trans_presets.java:2850 msgid "Islet" msgstr "" @@ -20818,5 +20976,5 @@ #. item #. -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2852 msgid "Edit Islet" msgstr "" @@ -20824,5 +20982,5 @@ #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2858 msgid "Cave Entrance" msgstr "مدخل كهف" @@ -20830,10 +20988,10 @@ #. item #. -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2860 msgid "Edit Cave Entrance" msgstr "حرّر مدخل كهف" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2864 msgid "Peak" msgstr "قمّة" @@ -20841,10 +20999,10 @@ #. item #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2866 msgid "Edit Peak" msgstr "حرّر قمّة" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2871 msgid "Glacier" msgstr "جليد" @@ -20852,10 +21010,10 @@ #. item #. -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2873 msgid "Edit Glacier" msgstr "حرّر جليد" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2878 msgid "Volcano" msgstr "بركان" @@ -20863,70 +21021,70 @@ #. item #. -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2880 msgid "Edit Volcano" msgstr "حرّر بركان" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2886 msgid "Boundaries" msgstr "الحدود" #. group "Boundaries" -#: build/trans_presets.java:2875 +#: build/trans_presets.java:2887 msgid "National" msgstr "دولية" #. item -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2888 msgid "Edit National Boundary" msgstr "حرّر حدود دولية" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2881 +#: build/trans_presets.java:2893 msgid "Administrative" msgstr "إدارية" #. item -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2894 msgid "Edit Administrative Boundary" msgstr "حرّر حدود إدارية" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2887 +#: build/trans_presets.java:2899 msgid "Civil" msgstr "مدنية" #. item -#: build/trans_presets.java:2888 +#: build/trans_presets.java:2900 msgid "Edit Civil Boundary" msgstr "حرّر حدود إدارية" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2893 +#: build/trans_presets.java:2905 msgid "Political" msgstr "" #. item -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2906 msgid "Edit Political Boundary" msgstr "حرّر الحدود السياسية" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2911 msgid "National park" msgstr "محمية وطنية (بيئية)" #. item -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2912 msgid "Edit National Park Boundary" msgstr "حرّر محمية وطنية (التنوع البيئي)" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2918 msgid "Land use" msgstr "إستعمال الأرض" #. group "Land use" -#: build/trans_presets.java:2907 +#: build/trans_presets.java:2919 msgid "Tree" msgstr "شجرة" @@ -20935,15 +21093,15 @@ #. -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2922 msgid "Edit Tree" msgstr "حرّر شجرة" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2915 +#: build/trans_presets.java:2927 msgid "Botanical Name" msgstr "حرّر اإسم النباتي" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2929 msgid "Wood" msgstr "حرج" @@ -20952,5 +21110,5 @@ #. -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2932 msgid "Edit Wood" msgstr "حرّر حرج" @@ -20958,17 +21116,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "coniferous" msgstr "صنوبري الثمر" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "deciduous" msgstr "" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "mixed" msgstr "مختلط" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2937 msgid "Forest" msgstr "غابة" @@ -20977,14 +21135,14 @@ #. -#: build/trans_presets.java:2928 +#: build/trans_presets.java:2940 msgid "Edit Forest Landuse" msgstr "حرّر غابة" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2946 msgid "Nature Reserve" msgstr "محمية طبيعية" #. item -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2947 msgid "Edit Nature Reserve" msgstr "حرّر محمية طبيعية" @@ -20992,25 +21150,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2952 msgid "Scree" msgstr "حصاة" #. item -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2953 msgid "Edit Scree" msgstr "حرّر حصاة" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2957 msgid "Scrub" msgstr "أشجار منخفضة" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:2958 msgid "Edit Scrub" msgstr "حرّر أشجار منخفضة" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2962 msgid "Fell" msgstr "" @@ -21018,10 +21176,10 @@ #. item #. -#: build/trans_presets.java:2952 +#: build/trans_presets.java:2964 msgid "Edit Fell" msgstr "هوّة" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2968 msgid "Heath" msgstr "" @@ -21029,5 +21187,5 @@ #. item #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2970 msgid "Edit Heath" msgstr "حرّر أرض بور" @@ -21035,5 +21193,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2975 msgid "Farmyard" msgstr "فناء مزرعة" @@ -21042,45 +21200,45 @@ #. -#: build/trans_presets.java:2966 +#: build/trans_presets.java:2978 msgid "Edit Farmyard Landuse" msgstr "حرّر فناء مزرعة" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2983 msgid "Farmland" msgstr "أرض زراعية" #. item -#: build/trans_presets.java:2972 +#: build/trans_presets.java:2984 msgid "Edit Farmland Landuse" msgstr "حرّر أرض زراعية" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2977 +#: build/trans_presets.java:2989 msgid "Meadow" msgstr "مرج" #. item -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2990 msgid "Edit Meadow Landuse" msgstr "حرّر مرج" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:2995 msgid "Vineyard" msgstr "كرم عنب" #. item -#: build/trans_presets.java:2984 +#: build/trans_presets.java:2996 msgid "Edit Vineyard Landuse" msgstr "حرّر كرم عنب" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3001 msgid "Allotments" msgstr "حصص سكنية" #. item -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3002 msgid "Edit Allotments Landuse" msgstr "حرّر حصص سكنية" @@ -21088,25 +21246,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3008 msgid "Garden" msgstr "حديقة" #. item -#: build/trans_presets.java:2997 +#: build/trans_presets.java:3009 msgid "Edit Garden" msgstr "حرّر حديقة" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3013 msgid "Grass" msgstr "عشب" #. item -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3014 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3019 msgid "Village Green" msgstr "" @@ -21114,10 +21272,10 @@ #. item #. -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3021 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3026 msgid "Common" msgstr "شائع" @@ -21125,20 +21283,20 @@ #. item #. -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3028 msgid "Edit Common" msgstr "حرّر شائع" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3032 msgid "Park" msgstr "متنزه" #. item -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3033 msgid "Edit Park" msgstr "حرّر متنزه" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3037 msgid "Recreation Ground" msgstr "ميدان ألعاب" @@ -21146,5 +21304,5 @@ #. item #. -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3039 msgid "Edit Recreation Ground Landuse" msgstr "حرّر ميدان ألعاب" @@ -21152,15 +21310,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3033 +#: build/trans_presets.java:3045 msgid "Residential area" msgstr "منطقة سكنية" #. item -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3046 msgid "Edit Residential Landuse" msgstr "حرّر منطقة سكنية" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3051 msgid "Graveyard" msgstr "مقبرة" @@ -21168,9 +21326,9 @@ #. item #. -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3053 msgid "Edit Graveyard" msgstr "حرّر مقبرة" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3059 msgid "Cemetery" msgstr "مقبرة" @@ -21178,39 +21336,39 @@ #. item #. -#: build/trans_presets.java:3049 +#: build/trans_presets.java:3061 msgid "Edit Cemetery Landuse" msgstr "حرّر إستعمال الأرض كمقبرة" -#: build/trans_presets.java:3056 +#: build/trans_presets.java:3068 msgid "Retail" msgstr "بيع بلمفرق" #. item -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3069 msgid "Edit Retail Landuse" msgstr "حرّر بيع بلمفرق" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3062 +#: build/trans_presets.java:3074 msgid "Commercial" msgstr "تجاري" #. item -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3075 msgid "Edit Commercial Landuse" msgstr "حرّر إستعمال تجاري للأرض" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3068 +#: build/trans_presets.java:3080 msgid "Industrial" msgstr "صناعي" #. item -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3081 msgid "Edit Industrial Landuse" msgstr "حرّر الإستعمال الصناعي" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3086 msgid "Railway land" msgstr "أرض سكة حديد" @@ -21218,15 +21376,15 @@ #. item #. -#: build/trans_presets.java:3076 +#: build/trans_presets.java:3088 msgid "Edit Railway Landuse" msgstr "حرّر أرض سكة حديد" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3081 +#: build/trans_presets.java:3093 msgid "Military" msgstr "عسكري" #. item -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3094 msgid "Edit Military Landuse" msgstr "حرّر الإستخدام العسكري للأرض" @@ -21234,55 +21392,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3100 msgid "Construction area" msgstr "موقع ورشة إعمار" #. item -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3101 msgid "Edit Construction Landuse" msgstr "حرّر موقع ورشة إعمار" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3094 +#: build/trans_presets.java:3106 msgid "Brownfield" msgstr "" #. item -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3107 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3100 +#: build/trans_presets.java:3112 msgid "Greenfield" msgstr "حقل أخضر" #. item -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3113 msgid "Edit Greenfield Landuse" msgstr "حرّر إستعمال الأرض كحقل أخضر" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3118 msgid "Landfill" msgstr "مطمر نفايات" #. item -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3119 msgid "Edit Landfill Landuse" msgstr "حرّر مطمر نفايات" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3124 msgid "Quarry" msgstr "كسّارة، مقلع حجارة" #. item -#: build/trans_presets.java:3113 +#: build/trans_presets.java:3125 msgid "Edit Quarry Landuse" msgstr "حرّر كسّارة / مقلع حجارة" #. group "Relations" -#: build/trans_presets.java:3122 +#: build/trans_presets.java:3134 msgid "Multipolygon" msgstr "متعدد الضلوع" @@ -21292,5 +21450,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:3126 +#: build/trans_presets.java:3138 msgid "Edit Multipolygon" msgstr "حرّر متعدد الضلوع" @@ -21299,10 +21457,10 @@ #. #. -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3144 msgid "outer segment" msgstr "الفلق الخارجي" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3145 msgid "inner segment" msgstr "حرّر الفلق الخارجي" @@ -21310,5 +21468,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3148 msgid "Turn restriction" msgstr "حصر الإنعطاف" @@ -21317,5 +21475,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3151 msgid "Edit Turn Restriction" msgstr "حرّر حصر الإنعطاف" @@ -21323,34 +21481,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "Restriction" msgstr "حصر" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_left_turn" msgstr "إنعطاف_يسار_ممنوع" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_right_turn" msgstr "إنعطاف_يمين_ممنوع" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_straight_on" msgstr "على_الطول_ممنوع" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_u_turn" msgstr "رجوع_ممنوع" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_right_turn" msgstr "إنعطاف_يميني_فقط" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_left_turn" msgstr "إنعطاف_يسار_ممنوع" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_straight_on" msgstr "على_الطول_فقط" @@ -21359,15 +21517,15 @@ #. #. -#: build/trans_presets.java:3146 +#: build/trans_presets.java:3158 msgid "from way" msgstr "من الطريق" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3159 msgid "via node or way" msgstr "مروراً بلعقدة أو الطريق" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3148 +#: build/trans_presets.java:3160 msgid "to way" msgstr "إلى الطريق" @@ -21375,5 +21533,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3151 +#: build/trans_presets.java:3163 msgid "Route" msgstr "الطريق" @@ -21382,5 +21540,5 @@ #. -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3166 msgid "Edit Route" msgstr "حرّر طريق" @@ -21388,5 +21546,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "Route type" msgstr "نوع الطريق" @@ -21458,5 +21616,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:233 +#: build/trans_presets.java:3168 build/trans_style.java:233 #: build/trans_style.java:683 build/trans_style.java:906 #: build/trans_style.java:914 build/trans_style.java:922 @@ -21465,17 +21623,17 @@ msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "bus" msgstr "حافلة (باص)" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "road" msgstr "الطريق" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ferry" msgstr "عبارة بحرية" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ski" msgstr "" @@ -21528,5 +21686,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:247 +#: build/trans_presets.java:3168 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -21535,13 +21693,13 @@ msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "hiking" msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "tram" msgstr "ترام" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "detour" msgstr "" @@ -21555,10 +21713,10 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:1206 +#: build/trans_presets.java:3168 build/trans_style.java:1206 msgid "subway" msgstr "" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3159 +#: build/trans_presets.java:3171 msgid "Symbol description" msgstr "وصف الرمز" @@ -21566,31 +21724,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3174 msgid "Network" msgstr "الشبكة" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "proposed" msgstr "المقترح" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "alternate" msgstr "البديل" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "temporary" msgstr "المؤقت" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "connection" msgstr "الإتصال" -#: build/trans_presets.java:3165 +#: build/trans_presets.java:3177 msgid "Color (hex)" msgstr "اللون (hex)" @@ -21599,30 +21757,30 @@ #. #. -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3180 msgid "route segment" msgstr "فلق الطريق" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3181 msgid "forward segment" msgstr "الفلق الأمامي" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3170 +#: build/trans_presets.java:3182 msgid "backward segment" msgstr "الفلق الخلفي" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3183 msgid "halt point" msgstr "نقطة التوقف" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3172 +#: build/trans_presets.java:3184 msgid "forward halt point" msgstr "نقطة التوقف الأمامية" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3173 +#: build/trans_presets.java:3185 msgid "backward halt point" msgstr "نقطة التوقف الخلفية" @@ -25760,4 +25918,19 @@ msgstr "" +#~ msgid "Combine ways with different memberships?" +#~ msgstr "ادمج الطرقات رغم إختلاف عضويتها ؟" + +#~ msgid "Combine Anyway" +#~ msgstr "على أي حال ادمج" + +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "" +#~ "إن للطرقات المختارة عضويات في علاقات مختلفة. هل تريد دمجها رغم ذلك ؟" + +#~ msgid "Empty member in relation." +#~ msgstr "عضو فارغ في العلاقة." + #~ msgid "Unknown version" #~ msgstr "نسخة مجهولة" Index: /applications/editors/josm/i18n/po/bg.po =================================================================== --- /applications/editors/josm/i18n/po/bg.po (revision 17821) +++ /applications/editors/josm/i18n/po/bg.po (revision 17822) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-22 17:52+0200\n" -"PO-Revision-Date: 2009-09-22 15:19+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-09-28 16:38+0200\n" +"PO-Revision-Date: 2009-09-24 20:31+0000\n" +"Last-Translator: pl71 \n" "Language-Team: Bulgarian \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: 2009-09-22 15:46+0000\n" +"X-Launchpad-Export-Date: 2009-09-28 14:32+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -67,8 +67,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250 @@ -91,9 +91,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -126,6 +126,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -142,7 +142,7 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:172 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 @@ -155,5 +155,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 @@ -338,6 +337,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -347,6 +345,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 @@ -356,5 +354,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -365,5 +363,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180 @@ -372,5 +370,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -465,9 +463,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -499,10 +497,9 @@ msgstr "Моля изберете поне четири точки." -#. FIXME: not sure whether this fits in a dialog #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:85 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -612,5 +609,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 #, java-format msgid "File: {0}" @@ -632,38 +629,22 @@ msgstr "Зареждане на отворени пакети с изменения" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine Way" msgstr "Обедини линии" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 msgid "Combine several ways into one." msgstr "Обединява няколко отделни линии в една." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 -msgid "Combine ways with different memberships?" -msgstr "Обединяване на линии, влизащи в различни релации?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -msgid "Combine Anyway" -msgstr "Комбиниране въпреки всичко" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" -"Избраните пътища имат различни участия в релации. Въпреки това искате ли да " -"ги обеденим?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 msgid "Change directions?" msgstr "Промени посоката?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Reverse and Combine" msgstr "Връщане и Комбиниране" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -673,5 +654,5 @@ "посоката на някои от тях?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -681,10 +662,10 @@ "последователност от възли)." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 #, java-format msgid "Combine {0} ways" msgstr "Обединяване {0} линии" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 msgid "Please select at least two ways to combine." msgstr "Моля, изберете поне две линии за комбиниране." @@ -729,6 +710,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -794,5 +774,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -823,5 +803,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307 #, java-format msgid "There were {0} conflicts during import." @@ -839,5 +818,4 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Duplicate" @@ -869,10 +847,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:209 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Експорт до GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:208 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Експорт на данните до GPX файл." @@ -883,8 +861,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -949,5 +927,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 @@ -990,6 +968,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1081,18 +1058,18 @@ msgstr "Обединява текущия слой в друг слой" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge Nodes" msgstr "Обедини точки" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 msgid "Merge nodes into the oldest one." msgstr "Обедини точките в най-старата от тях." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 msgid "Please select at least two nodes to merge." msgstr "Моля, изберете поне две точки за обединение." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -1100,5 +1077,5 @@ "използва." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 #, java-format msgid "Merge {0} nodes" @@ -1170,5 +1147,4 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350 msgid "New" msgstr "Нов" @@ -1351,10 +1327,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Запазване" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Запазване на текущите данни." @@ -1411,10 +1387,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Запазване като…" #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Записване на текущите данни в нов файл." @@ -1459,5 +1435,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:961 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888 @@ -1709,14 +1685,14 @@ msgstr "Няма нищо избрано." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 msgid "Upload to OSM..." msgstr "Качи на OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload all changes to the OSM server." msgstr "Качване на всички промени на OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 #, java-format msgid "" @@ -1727,23 +1703,23 @@ "html>" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Нищо за качване. Първо създайте някакви данни." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:171 msgid "No changes to upload." msgstr "Няма промени за качване." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223 #, java-format msgid "Synchronize {0} {1} only" msgstr "Синхронизирани само {0} {1}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 msgid "Synchronize entire dataset" msgstr "Синхронизиране на целия набор данни" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:228 #, java-format msgid "" @@ -1765,17 +1741,17 @@ "редактирането.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:283 msgid "Conflict detected" msgstr "Забелязан е конфликт." #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:257 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 #, java-format msgid "Unexpected return value. Got {0}." msgstr "неочаквана върната стойност {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:272 #, java-format msgid "" @@ -1791,5 +1767,5 @@ "
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:306 #, java-format msgid "" @@ -1799,9 +1775,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 msgid "Changeset closed" msgstr "Пакета с изменения е затворен" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" @@ -1810,28 +1786,31 @@ "\"!" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "" -"Началото на съобщението за грешка \"{0}\" не отговаря на очаквания шаблон " -"\"{1}\"" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:425 #, java-format msgid "Uploading failed.
{0}" msgstr "Качването не стана.
{0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:434 msgid "Upload to OSM API failed" msgstr "Качването към OSM API пропадна." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457 msgid "Updating primitive" msgstr "Обновяване на примитива." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:514 #, java-format msgid "Uploading data for layer ''{0}''" msgstr "Качване на данни за слой ''{0}''" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1919,13 +1898,13 @@ msgstr "По-бавно възпроизвеждане" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34 msgid "Downloading GPS data" msgstr "Сваляне на GPS данни" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57 msgid "Downloaded GPX Data" msgstr "Свалени GPX данни" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87 msgid "Raw GPS data" msgstr "Изходни GPS данни" @@ -1941,4 +1920,9 @@ msgstr "" "Игнориране на грешката защото свалянето беше отказано. Грешката бе: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 +#, fuzzy +msgid "No data found in this area." +msgstr "На устройството не са открити данни." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2373,5 +2357,5 @@ #, java-format msgid "Nothing find in selection by searching for ''{0}''" -msgstr "" +msgstr "Нищо не е открито в селекцията чрез търсене на ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2650,9 +2634,9 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 -#, fuzzy, java-format +#, java-format msgid "" "Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitive ''{1}''." -msgstr "вече регистриран конфликт за примитив ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70 @@ -2661,9 +2645,9 @@ msgstr "Добавяне на конфликт за ''{0}''" -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 +#, fuzzy, java-format +msgid "" +"Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" "Невъзможно е връщането на командата ''{0}'', защото слой ''{1}'' не е " @@ -2715,5 +2699,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Delete from relation" msgstr "Изтриване от връзка" @@ -2770,14 +2754,15 @@ msgstr[1] "Преместване {0} възела" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 -msgid "Purging 1 primitive" -msgstr "Изчистване на 1 примитив" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 -#, java-format -msgid "removing reference from way {0}" -msgstr "премахване на справка от път {0}" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 +#, fuzzy, java-format +msgid "Purged object ''{0}''" +msgstr "Преместване обекти {0}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 +#, fuzzy, java-format +msgid "Purged {0} objects" +msgstr "Промяна {0} обект" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 #, java-format msgid "" @@ -2788,7 +2773,7 @@ "стойност - {1}" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203 -#, java-format -msgid "removing reference from relation {0}" +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 +#, fuzzy, java-format +msgid "Removing reference from relation {0}" msgstr "Премахване на отношението от връзката {0}" @@ -2797,4 +2782,11 @@ msgid "Resolve conflicts in member list of relation {0}" msgstr "Разрешаване на конфликтите в списъка с членове на връзката {0}" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +msgstr "" +"Невъзможно е връщането на командата ''{0}'', защото слой ''{1}'' не е " +"наличен вече" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 @@ -2951,4 +2943,6 @@ "isn't a directory." msgstr "" +"Внимание: неуспех при инициализиране на предпочитанията. Директорията за " +"предпочитания ''{0}'' не е директория." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:380 @@ -3143,24 +3137,24 @@ msgstr "С" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Error: {0}" msgstr "Грешка: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Warning: {0}" msgstr "Предупреждение: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3168,5 +3162,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3192,6 +3186,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:244 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3247,120 +3241,113 @@ msgstr "мултиполигонен път ''{0}'' не е затворен." -#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed -#. TODO Remove useless nullcheck when RelationMember.member is encalupsed -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855 -msgid "Empty member in relation." -msgstr "В релацията има празен член." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:850 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "В релацията има член ''{0}'', който е бил изтрит." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:861 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Пътя ''{0}'' е с по-малко от две точки." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 msgid "More than one \"from\" way found." msgstr "Повече от един път \"от\" са намерени." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:607 msgid "More than one \"to\" way found." msgstr "Повече от един път \"до\" са намерени." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:613 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627 msgid "More than one \"via\" found." msgstr "Повече от един \"през\" са открити." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:632 #, java-format msgid "Unknown role ''{0}''." msgstr "Неизвестна роля ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Неизвестен тип членство за ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:641 msgid "No \"from\" way found." msgstr "Не е намерен път \"от\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645 msgid "No \"to\" way found." msgstr "Не е намерен път \"до\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:649 msgid "No \"via\" node or way found." msgstr "Не е открит възел или път \"през\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:658 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "Пътят \"от\" не започва или не завършва във възел \"през\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:662 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "Пътят \"до\" не започва или свършва във възел \"през\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Пътят \"от\" не започва или свършва във възел \"през\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "Пътят \"до\" не започва или свършва в път \"през\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816 #, java-format msgid "Style for restriction {0} not found." msgstr "Стил за ограничение {0} не е намерен." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:870 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Няма подходяща роля ''{0}'' за Път ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:882 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Не-Път ''{0}'' в мултиполигон." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:940 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Липсва външен път за мултиполигон ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1029 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Пресичане между пътища ''{0}'' и ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1041 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Вътрешният път ''{0}'' се намира отвън." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1094 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Стилът за вътрешния път ''{0}'' се равнява на мултиполигон." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1120 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Стилът за външния път ''{0}'' се разминава." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1324 msgid "untagged" msgstr "немаркиран" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1325 msgid "text" msgstr "текст" @@ -3382,5 +3369,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:249 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 @@ -3391,5 +3378,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 @@ -3418,5 +3405,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:169 msgid "background" msgstr "фон" @@ -3516,5 +3503,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "railway" msgstr "железопътна линия" @@ -3570,9 +3557,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +#, fuzzy +msgid "Not Found" +msgstr "Не сте свързан" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 msgid "Unknown host" msgstr "Неизвестен хост" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:247 msgid "Primitive already deleted" msgstr "Примитивът вече е изтрит." @@ -4888,5 +4880,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -5100,43 +5092,43 @@ msgstr "Член на" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 msgid "Add Properties" msgstr "Добавяне на параметри" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 msgid "Add a new key/value pair to all objects" msgstr "Добавяне на нова двойка ключ/стойност за всички обекти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 msgid "Edit Properties" msgstr "Редактиране на параметри" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 msgid "Edit the value of the selected key for all objects" msgstr "Редактиране стойността на избрания ключ за всички обекти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Свойства: {0} / Членство: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 msgid "Properties / Memberships" msgstr "Параметри / Отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 msgid "Change relation" msgstr "Промяна на връзка" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Изваждане на избраните обекти от релация {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:855 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 msgid "Delete the selected key in all objects" msgstr "Изтриване на избрания ключ за всички обекти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 msgid "Delete Properties" msgstr "Изтриване на параметри" @@ -5146,6 +5138,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168 -#: build/trans_presets.java:3121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 +#: build/trans_presets.java:3133 msgid "Relations" msgstr "Връзки" @@ -5155,25 +5147,30 @@ msgstr "Отваряне списъка с всички връзки." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:174 #, java-format msgid "Relations: {0}" msgstr "Връзки: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 msgid "Open an editor for the selected relation" msgstr "Отвори редактор за избраната връзка" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:325 msgid "Delete the selected relation" msgstr "Изтриване на избраната връзка" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:363 msgid "Create a new relation" msgstr "Създаване на нова релация" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:400 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280 msgid "Create a copy of this relation and open it in another editor window" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 +#, fuzzy +msgid "Set the current selection to the list of selected relations" +msgstr "Текушата селекция не може да се използва за разделяне." #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5214,9 +5211,9 @@ msgstr "Избрано: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 msgid "Undock the panel" msgstr "Отсъедини панела" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5225,5 +5222,5 @@ "левия панел." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 msgid "Click to minimize/maximize the panel content" msgstr "Натиснете за да минимизирате/максимизирате съдържанието на панела" @@ -5737,5 +5734,5 @@ #. group "Geography" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2771 msgid "Places" msgstr "Места" @@ -6409,6 +6406,4 @@ #. item "Man Made/Windmill" label "Edit Windmill" #. -#. item "Man Made/Pipeline" label "Edit Pipeline" -#. #. item "Man Made/Wastewater Plant" label "Edit Wastewater Plant" #. @@ -6421,4 +6416,6 @@ #. item "Man Made/Surveillance" label "Edit Surveillance Camera" #. +#. item "Man Made/Power Station" label "Edit Power Station" +#. #. item "Amenities/Fountain" label "Edit Fountain" #. @@ -6743,57 +6740,57 @@ #: build/trans_presets.java:2250 build/trans_presets.java:2258 #: build/trans_presets.java:2290 build/trans_presets.java:2295 -#: build/trans_presets.java:2300 build/trans_presets.java:2305 -#: build/trans_presets.java:2311 build/trans_presets.java:2317 -#: build/trans_presets.java:2323 build/trans_presets.java:2331 -#: build/trans_presets.java:2337 build/trans_presets.java:2343 -#: build/trans_presets.java:2349 build/trans_presets.java:2355 -#: build/trans_presets.java:2365 build/trans_presets.java:2462 -#: build/trans_presets.java:2469 build/trans_presets.java:2483 -#: build/trans_presets.java:2489 build/trans_presets.java:2496 -#: build/trans_presets.java:2503 build/trans_presets.java:2509 -#: build/trans_presets.java:2515 build/trans_presets.java:2537 -#: build/trans_presets.java:2544 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2305 build/trans_presets.java:2310 +#: build/trans_presets.java:2316 build/trans_presets.java:2322 +#: build/trans_presets.java:2339 build/trans_presets.java:2345 +#: build/trans_presets.java:2351 build/trans_presets.java:2357 +#: build/trans_presets.java:2363 build/trans_presets.java:2373 +#: build/trans_presets.java:2380 build/trans_presets.java:2474 +#: build/trans_presets.java:2481 build/trans_presets.java:2495 +#: build/trans_presets.java:2501 build/trans_presets.java:2508 +#: build/trans_presets.java:2515 build/trans_presets.java:2521 +#: build/trans_presets.java:2527 build/trans_presets.java:2549 +#: build/trans_presets.java:2556 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2576 #: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2594 build/trans_presets.java:2601 -#: build/trans_presets.java:2608 build/trans_presets.java:2615 -#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2594 build/trans_presets.java:2600 +#: build/trans_presets.java:2606 build/trans_presets.java:2613 +#: build/trans_presets.java:2620 build/trans_presets.java:2627 #: build/trans_presets.java:2633 build/trans_presets.java:2639 -#: build/trans_presets.java:2645 build/trans_presets.java:2652 -#: build/trans_presets.java:2659 build/trans_presets.java:2666 -#: build/trans_presets.java:2672 build/trans_presets.java:2678 -#: build/trans_presets.java:2688 build/trans_presets.java:2697 -#: build/trans_presets.java:2712 build/trans_presets.java:2718 -#: build/trans_presets.java:2726 build/trans_presets.java:2733 -#: build/trans_presets.java:2753 build/trans_presets.java:2764 -#: build/trans_presets.java:2770 build/trans_presets.java:2776 +#: build/trans_presets.java:2645 build/trans_presets.java:2651 +#: build/trans_presets.java:2657 build/trans_presets.java:2664 +#: build/trans_presets.java:2671 build/trans_presets.java:2678 +#: build/trans_presets.java:2684 build/trans_presets.java:2690 +#: build/trans_presets.java:2700 build/trans_presets.java:2709 +#: build/trans_presets.java:2724 build/trans_presets.java:2730 +#: build/trans_presets.java:2738 build/trans_presets.java:2745 +#: build/trans_presets.java:2765 build/trans_presets.java:2776 #: build/trans_presets.java:2782 build/trans_presets.java:2788 -#: build/trans_presets.java:2795 build/trans_presets.java:2802 -#: build/trans_presets.java:2809 build/trans_presets.java:2815 -#: build/trans_presets.java:2821 build/trans_presets.java:2829 -#: build/trans_presets.java:2836 build/trans_presets.java:2843 -#: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2879 build/trans_presets.java:2885 +#: build/trans_presets.java:2794 build/trans_presets.java:2800 +#: build/trans_presets.java:2807 build/trans_presets.java:2814 +#: build/trans_presets.java:2821 build/trans_presets.java:2827 +#: build/trans_presets.java:2833 build/trans_presets.java:2841 +#: build/trans_presets.java:2848 build/trans_presets.java:2855 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2875 build/trans_presets.java:2882 #: build/trans_presets.java:2891 build/trans_presets.java:2897 -#: build/trans_presets.java:2903 build/trans_presets.java:2912 -#: build/trans_presets.java:2922 build/trans_presets.java:2931 -#: build/trans_presets.java:2937 build/trans_presets.java:2943 -#: build/trans_presets.java:2948 build/trans_presets.java:2954 -#: build/trans_presets.java:2960 build/trans_presets.java:2969 -#: build/trans_presets.java:2975 build/trans_presets.java:2981 +#: build/trans_presets.java:2903 build/trans_presets.java:2909 +#: build/trans_presets.java:2915 build/trans_presets.java:2924 +#: build/trans_presets.java:2934 build/trans_presets.java:2943 +#: build/trans_presets.java:2949 build/trans_presets.java:2955 +#: build/trans_presets.java:2960 build/trans_presets.java:2966 +#: build/trans_presets.java:2972 build/trans_presets.java:2981 #: build/trans_presets.java:2987 build/trans_presets.java:2993 #: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3012 build/trans_presets.java:3018 -#: build/trans_presets.java:3023 build/trans_presets.java:3030 -#: build/trans_presets.java:3037 build/trans_presets.java:3043 -#: build/trans_presets.java:3052 build/trans_presets.java:3060 -#: build/trans_presets.java:3066 build/trans_presets.java:3072 -#: build/trans_presets.java:3079 build/trans_presets.java:3085 -#: build/trans_presets.java:3092 build/trans_presets.java:3098 +#: build/trans_presets.java:3011 build/trans_presets.java:3017 +#: build/trans_presets.java:3024 build/trans_presets.java:3030 +#: build/trans_presets.java:3035 build/trans_presets.java:3042 +#: build/trans_presets.java:3049 build/trans_presets.java:3055 +#: build/trans_presets.java:3064 build/trans_presets.java:3072 +#: build/trans_presets.java:3078 build/trans_presets.java:3084 +#: build/trans_presets.java:3091 build/trans_presets.java:3097 #: build/trans_presets.java:3104 build/trans_presets.java:3110 -#: build/trans_presets.java:3116 build/trans_presets.java:3129 -#: build/trans_presets.java:3143 build/trans_presets.java:3157 +#: build/trans_presets.java:3116 build/trans_presets.java:3122 +#: build/trans_presets.java:3128 build/trans_presets.java:3141 +#: build/trans_presets.java:3155 build/trans_presets.java:3169 msgid "Name" msgstr "Име" @@ -6856,5 +6853,4 @@ msgstr "" -#. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 msgid "Close the selected open changesets" @@ -6882,25 +6878,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "Yes" msgstr "Да" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "No" msgstr "Не" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47 #, java-format msgid "Layer ''{0}'' has modifications which should be uploaded to the server." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49 #, java-format msgid "Layer ''{0}'' has no modifications to be uploaded." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60 #, java-format msgid "" @@ -6909,29 +6905,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62 #, java-format msgid "Layer ''{0}'' has no modifications to be saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80 msgid "No file associated with this layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:83 msgid "Please select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:86 #, java-format msgid "Layer ''{0}'' is not backed by a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:101 #, java-format msgid "File ''{0}'' is not writable. Please enter another file name." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:115 #, java-format msgid "Select to upload layer ''{0}'' to the server ''{1}''" @@ -7024,5 +7020,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -msgid "Save and Exit" +#, fuzzy +msgid "Save/Upload and Exit" msgstr "Запис и Изход" @@ -7032,5 +7029,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -msgid "Save and Delete" +#, fuzzy +msgid "Save/Upload and Delete" msgstr "Запис и изтриване" @@ -7047,5 +7045,5 @@ msgid "" "An upload and/or save operation of one layer with modifications
was " -"cancelled or has been failed." +"cancelled or has failed." msgstr "" @@ -7131,6 +7129,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:891 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:921 msgid "Tags of new changeset" msgstr "" @@ -7229,7 +7227,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:909 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:933 #, java-format msgid "Tags of changeset {0}" @@ -7237,48 +7234,48 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:949 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:963 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1011 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106 msgid "Preparing primitives to upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Изображения за {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "Прочитане GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Не е указано време за точка {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Невъзможно да се прочете времето \"{0}\" от точка {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325 msgid "No images with readable timestamps found." msgstr "Не е намерено изображение с информация за времето." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format @@ -7286,29 +7283,29 @@ msgstr "Четене {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:402 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246 msgid "Geotagged Images" msgstr "Изображения с данни за местоположение" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:587 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "GPS start: {0}" msgstr "GPS Начало: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 #, java-format msgid "GPS end: {0}" msgstr "GPS Край: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594 #, java-format msgid "current delta: {0}s" msgstr "текуща разлика: {0} с." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595 msgid "timezone difference: " msgstr "разлика в часови пояси: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284 msgid "image" @@ -7317,14 +7314,14 @@ msgstr[1] "изображения" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #, java-format msgid "{0} within the track." msgstr "{0} в пределите на следата" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680 msgid "Sync clock" msgstr "Синхронизация часовник" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7332,32 +7329,32 @@ msgstr "Изображения JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:734 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Невъзможно е да се прочете датата от файла \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Липсва EXIF време във файла \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 msgid "Image" msgstr "Изображение" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:752 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Въведете указаната дата (мм/дд/гггг ЧЧ:ММ:СС)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759 msgid "GPS unit timezone (difference to photo)" msgstr "Часова зона на GPS устойството (разлика със снимките)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:767 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771 msgid "Synchronize Time with GPS Unit" msgstr "Синхронизиране времето с GPS приемника" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:790 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 msgid "Time entered could not be parsed." msgstr "Въведенето време не може да бъде използвано." @@ -7441,5 +7438,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 #, java-format msgid "Name: {0}" @@ -7462,5 +7459,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3160 +#: build/trans_presets.java:3172 msgid "Description" msgstr "Описание" @@ -7516,5 +7513,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:587 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 @@ -7581,42 +7578,65 @@ "смислено да се предположи тяхното време, бяха пропуснати." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:105 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:107 #, java-format msgid "Data Layer {0}" msgstr "Слой Данни {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 msgid "outside downloaded area" msgstr "извън областта за сваляне" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:252 #, java-format msgid "version {0}" msgstr "версия {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:289 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:290 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 +#, fuzzy, java-format +msgid "There was {0} conflict detected." +msgid_plural "There were {0} conflicts detected." +msgstr[0] "{0} конфликт(а) при въвеждането" +msgstr[1] "{0} конфликт(а) при въвеждането" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 +#, java-format +msgid "" +"{0} object has been purged from the local dataset because it is deleted on " +"the server." +msgid_plural "" +"{0} objects have been purged from the local dataset because they are deleted " +"on the server." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 +#, fuzzy +msgid "Conflicts detected" +msgstr "Забелязан е конфликт." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 #, java-format msgid "{0} consists of:" msgstr "{0} се състои от:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:476 #, java-format msgid " ({0} deleted.)" msgstr " ({0} изтрити.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 msgid "unset" msgstr "неустановена" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 #, java-format msgid "API version: {0}" msgstr "API версия: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:501 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:584 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" @@ -7988,5 +8008,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:412 #: ../plugins/terracer/src/terracer/TerracerAction.java:430 @@ -8760,5 +8780,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261 msgid "More information about this feature" msgstr "Повече информация за тази възможност" @@ -8807,5 +8827,5 @@ msgstr "Елементи от тип {0} се поддържат." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:700 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -8815,18 +8835,18 @@ msgstr[1] "Промяна {0} обекта" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Нищо не е избрано!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 msgid "Selection unsuitable!" msgstr "Селекцията е неподходяща!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 msgid "Apply Preset" msgstr "Прилагане шаблон" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788 msgid "Change Properties" msgstr "Промяна параметри" @@ -9114,44 +9134,44 @@ msgstr "Затваряне на списък промени по версии..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "Няма съществуващ набор промени за качване на разлики" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 msgid "Preparing..." msgstr "Подготвяне…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 msgid "Uploading..." msgstr "Качване..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 msgid "Waiting 10 seconds ... " msgstr "Изчакване 10 секунди " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 msgid "OK - trying again." msgstr "ОК - нов опит" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9382,5 +9402,5 @@ msgid "" "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}''," -"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." +"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." msgstr "" @@ -9497,6 +9517,6 @@ #, java-format msgid "" -"Relation with external id ''{0}'' refers to missing primitive with external " -"id ''{1}''." +"Relation with external id ''{0}'' refers to a missing primitive with " +"external id ''{1}''." msgstr "" @@ -9592,32 +9612,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:73 msgid "Starting to upload with one request per primitive ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Starting to upload in one request ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 +#, fuzzy, java-format +msgid "Parameter ''{0}'' must not be null" +msgstr "Параметърът {0} не трябва да е празен" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 msgid "Uploading data ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 msgid "" "WARNING: no API version defined for data to upload. Falling back to version " @@ -9625,5 +9650,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:153 #, java-format msgid "" @@ -9850,5 +9875,5 @@ #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:202 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:324 build/trans_presets.java:325 @@ -9870,6 +9895,6 @@ #: build/trans_presets.java:789 build/trans_presets.java:1333 #: build/trans_presets.java:1400 build/trans_presets.java:1401 -#: build/trans_presets.java:1402 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 +#: build/trans_presets.java:1402 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 msgid "unknown" msgstr "неизвестно" @@ -10019,5 +10044,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:192 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:182 +#, java-format +msgid "" +"The OSM server ''{0}'' doesn't know about an object
you tried to read, " +"update, or delete. Either the respective object
doesn''t exist on the " +"server or you''re using an invalid URL to access
it. Please carefully " +"check the servers address ''{1}'' for typos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:209 #, java-format msgid "" @@ -10027,5 +10061,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:262 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:279 #, java-format msgid "" @@ -10291,17 +10325,15 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35 msgid "Define Address Interpolation" msgstr "" -#. Whether to re-trigger data changed for relation #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "Нечетни" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:413 #: ../plugins/terracer/src/terracer/TerracerAction.java:437 @@ -10309,99 +10341,99 @@ msgstr "Четни" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 msgid "Alphabetic" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161 #, java-format msgid "Relation: {0}" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173 msgid "Associate with street using:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184 msgid "Numbering Scheme:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 msgid "Starting #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188 msgid "Ending #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 #, java-format msgid "Will associate {0} additional house number nodes" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 msgid "Starting address number must be less than ending address number" msgstr "" @@ -11158,4 +11190,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52 +#: build/trans_presets.java:2331 msgid "Location" msgstr "Местоположение" @@ -11706,4 +11739,5 @@ msgstr "югоизток" +#. item "Man Made/Pipeline" combo "Type" #. color highway_track #. @@ -11749,7 +11783,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:990 build/trans_style.java:1007 -#: build/trans_style.java:1023 build/trans_style.java:3400 -#: build/trans_style.java:3408 +#: build/trans_presets.java:2330 build/trans_style.java:990 +#: build/trans_style.java:1007 build/trans_style.java:1023 +#: build/trans_style.java:3400 build/trans_style.java:3408 msgid "water" msgstr "вода" @@ -14388,9 +14422,11 @@ #. item "Public Transport/Airport" text "Name" #. +#. item "Man Made/Power Station" text "Operator" #. item "Relations/Route" text "Name" #: build/trans_presets.java:65 build/trans_presets.java:101 #: build/trans_presets.java:121 build/trans_presets.java:141 #: build/trans_presets.java:178 build/trans_presets.java:198 -#: build/trans_presets.java:1560 build/trans_presets.java:3158 +#: build/trans_presets.java:1560 build/trans_presets.java:2382 +#: build/trans_presets.java:3170 msgid "Reference" msgstr "Означение" @@ -14952,5 +14988,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 msgid "metal" msgstr "метал" @@ -14970,5 +15006,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 #: build/trans_style.java:3375 msgid "wood" @@ -15257,7 +15293,7 @@ #: build/trans_presets.java:1401 build/trans_presets.java:1402 #: build/trans_presets.java:1767 build/trans_presets.java:1777 -#: build/trans_presets.java:2408 build/trans_presets.java:2444 -#: build/trans_presets.java:2453 build/trans_presets.java:2454 -#: build/trans_presets.java:2455 build/trans_presets.java:2725 +#: build/trans_presets.java:2420 build/trans_presets.java:2456 +#: build/trans_presets.java:2465 build/trans_presets.java:2466 +#: build/trans_presets.java:2467 build/trans_presets.java:2737 msgid "yes" msgstr "да" @@ -15406,8 +15442,8 @@ #: build/trans_presets.java:1400 build/trans_presets.java:1401 #: build/trans_presets.java:1402 build/trans_presets.java:1767 -#: build/trans_presets.java:1777 build/trans_presets.java:2408 -#: build/trans_presets.java:2444 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 -#: build/trans_presets.java:2725 +#: build/trans_presets.java:1777 build/trans_presets.java:2420 +#: build/trans_presets.java:2456 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 +#: build/trans_presets.java:2737 msgid "no" msgstr "не" @@ -15545,6 +15581,8 @@ #. item "Water/Wetland" text "Name" #. item "Car/Parking" text "Reference number" +#. item "Man Made/Pipeline" text "Operator" #. item "Man Made/Power Generator" label "Edit Power Generator" #. +#. item "Man Made/Power Tower" label "Edit Power Tower" #. item "Land use/Tree" text "Name" #. item "Land use/Wood" text "Name" @@ -15552,7 +15590,8 @@ #: build/trans_presets.java:350 build/trans_presets.java:649 #: build/trans_presets.java:789 build/trans_presets.java:1137 -#: build/trans_presets.java:1395 build/trans_presets.java:2364 -#: build/trans_presets.java:2913 build/trans_presets.java:2923 -#: build/trans_presets.java:2932 +#: build/trans_presets.java:1395 build/trans_presets.java:2330 +#: build/trans_presets.java:2372 build/trans_presets.java:2398 +#: build/trans_presets.java:2925 build/trans_presets.java:2935 +#: build/trans_presets.java:2944 msgid "Type" msgstr "Тип" @@ -16102,10 +16141,10 @@ #. item "Tourism/Information Terminal" text "Closer description" #. item "Tourism/Audioguide" text "Closer description" -#. item "Man Made/Power Station" label "Edit Power Station" -#. +#. item "Man Made/Tower" text "Height (meters)" +#. item "Man Made/Pipeline" label "Edit Pipeline" +#. +#. item "Man Made/Power Station" text "Name" #. item "Man Made/Power Sub Station" label "Edit Power Sub Station" #. -#. item "Man Made/Power Line" label "Edit Power Line" -#. #. item #. #: build/trans_presets.java:1535 build/trans_presets.java:1789 -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2465 msgid "Shelter" msgstr "Навес" @@ -17797,5 +17838,5 @@ #: build/trans_presets.java:1567 msgid "Travel" -msgstr "" +msgstr "Пътуване" #. group "Travel" @@ -18419,10 +18460,10 @@ #: build/trans_presets.java:1852 msgid "Boundary Stone" -msgstr "" +msgstr "Пограничен камък" #. item #: build/trans_presets.java:1853 msgid "Edit Boundary Stone" -msgstr "" +msgstr "редактиране на: Пограничен камък" #. item "Historic Places/Boundary Stone" text "Name" @@ -18463,5 +18504,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1877 build/trans_presets.java:2669 +#: build/trans_presets.java:1877 build/trans_presets.java:2681 msgid "Sports" msgstr "Спортни стоки" @@ -19249,5 +19290,5 @@ #: build/trans_presets.java:2131 build/trans_presets.java:2137 msgid "track" -msgstr "" +msgstr "следа" #: build/trans_presets.java:1935 @@ -19601,5 +19642,5 @@ #: build/trans_presets.java:2141 msgid "Man-Made" -msgstr "" +msgstr "Изкуствени" #. group "Man-Made" @@ -19814,6 +19855,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "Religion" msgstr "Религия" @@ -19822,66 +19863,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "bahai" msgstr "Бахаи" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "buddhist" msgstr "Будизъм" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "christian" msgstr "Християнство" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "hindu" msgstr "Индуизъм" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jain" msgstr "Джайнизъм" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jewish" msgstr "Юдаизъм" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "muslim" msgstr "Мусулманство" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "sikh" msgstr "Сикхизъм" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "spiritualist" msgstr "Спиритуализъм" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "taoist" msgstr "Даосизъм" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "unitarian" msgstr "Унитаристи" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "zoroastrian" msgstr "Зороастризъм" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "Denomination" msgstr "Конфесия" @@ -19890,76 +19931,76 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "anglican" msgstr "Англиканска" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "baptist" msgstr "Баптизъм" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "catholic" msgstr "Католическо" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "evangelical" msgstr "Евангелска" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "jehovahs_witness" msgstr "Свидетели на Йехова" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "lutheran" msgstr "Лютеранство" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "methodist" msgstr "Методизъм" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "mormon" msgstr "Мормони" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "orthodox" msgstr "Православие" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "pentecostal" msgstr "Петдесетници" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "presbyterian" msgstr "Пресвитериани" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "protestant" msgstr "Протестантизъм" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "quaker" msgstr "Кваркери" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "shia" msgstr "Шийти" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "sunni" msgstr "Сунити" @@ -20055,25 +20096,49 @@ #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2296 +#, fuzzy +msgid "Tower type" +msgstr "Тип маршрут" + +#. item "Man Made/Tower" combo "Tower type" +#: build/trans_presets.java:2296 +#, fuzzy +msgid "communication" +msgstr "връзка" + +#: build/trans_presets.java:2296 +#, fuzzy +msgid "observation" +msgstr "Надморска височина" + +#. +#: build/trans_presets.java:2298 +#, fuzzy +msgid "Height (meters)" +msgstr "Макс.височина (метри)" + +#. item "Man Made/Tower" text "Operator" +#. +#: build/trans_presets.java:2302 msgid "Water Tower" msgstr "Водонапорна кула" #. item -#: build/trans_presets.java:2298 +#: build/trans_presets.java:2303 msgid "Edit Water Tower" msgstr "Редактирай водонапорна кула" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2307 msgid "Gasometer" msgstr "Газохранилище" #. item -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2308 msgid "Edit Gasometer" msgstr "Редактирай газохранилище" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2307 +#: build/trans_presets.java:2312 msgid "Lighthouse" msgstr "Маяк / Светлинен фар" @@ -20081,10 +20146,10 @@ #. item #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2314 msgid "Edit Lighthouse" msgstr "Редактирай маяк / светлинен фар" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2318 msgid "Windmill" msgstr "Мелница" @@ -20092,21 +20157,55 @@ #. item #. -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2320 msgid "Edit Windmill" msgstr "Редактирай мелница" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2319 +#: build/trans_presets.java:2324 msgid "Pipeline" msgstr "Тръбопровод" #. item -#. -#: build/trans_presets.java:2321 +#. +#: build/trans_presets.java:2327 msgid "Edit Pipeline" msgstr "Редактирай газопровод" -#. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2330 +#, fuzzy +msgid "oil" +msgstr "енергия от изкопаеми горива" + +#: build/trans_presets.java:2330 build/trans_presets.java:2372 +msgid "gas" +msgstr "газ" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "sewage" +msgstr "използване" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "heat" +msgstr "пустош" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "any substance" +msgstr "A по разстояние" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "underwater" +msgstr "вода" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "overground" +msgstr "подземен" + +#: build/trans_presets.java:2333 msgid "Wastewater Plant" msgstr "Пречиствателна станция" @@ -20116,10 +20215,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:2329 +#: build/trans_presets.java:2337 msgid "Edit Wastewater Plant" msgstr "Редактирай пречиствателна станция" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2333 +#: build/trans_presets.java:2341 msgid "Crane" msgstr "Кран" @@ -20127,10 +20226,10 @@ #. item #. -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2343 msgid "Edit Crane" msgstr "Редактирай кран" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2347 msgid "Beacon" msgstr "Маяк / Радиопредавател" @@ -20138,10 +20237,10 @@ #. item #. -#: build/trans_presets.java:2341 +#: build/trans_presets.java:2349 msgid "Edit Beacon" msgstr "Редактирай маяк / радиопредавател" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2353 msgid "Survey Point" msgstr "Точка на наблюдение" @@ -20149,10 +20248,10 @@ #. item #. -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2355 msgid "Edit Survey Point" msgstr "Редактирай точка на наблюдение" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2359 msgid "Surveillance" msgstr "Видеонаблюдение" @@ -20160,5 +20259,5 @@ #. item #. -#: build/trans_presets.java:2353 +#: build/trans_presets.java:2361 msgid "Edit Surveillance Camera" msgstr "Редактирай видеонаблюдение" @@ -20166,5 +20265,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2366 msgid "Power Generator" msgstr "Електроцентрала" @@ -20174,39 +20273,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:2362 +#: build/trans_presets.java:2370 msgid "Edit Power Generator" msgstr "Редактирай електрогенератор" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "wind" msgstr "вятърна енергия" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "hydro" msgstr "водна енергия" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "fossil" msgstr "енергия от изкопаеми горива" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "nuclear" msgstr "атомна" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "coal" msgstr "въглища" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "photovoltaic" msgstr "слънчева енергия" -#: build/trans_presets.java:2364 -msgid "gas" -msgstr "газ" - #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2375 msgid "Power Station" msgstr "Електростанция" @@ -20215,10 +20310,10 @@ #. -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2378 msgid "Edit Power Station" msgstr "Редактирай електростанция" -#. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2374 +#. item "Man Made/Power Station" text "Reference" +#: build/trans_presets.java:2384 msgid "Power Sub Station" msgstr "Електроподстанция" @@ -20227,5 +20322,5 @@ #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2387 msgid "Edit Power Sub Station" msgstr "Редактирай електроподстанция" @@ -20233,10 +20328,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2380 build/trans_presets.java:2396 +#: build/trans_presets.java:2390 build/trans_presets.java:2407 msgid "Line reference" msgstr "Номер линия" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2382 +#: build/trans_presets.java:2392 msgid "Power Tower" msgstr "Електрически стълб от ЕПМ" @@ -20247,11 +20342,26 @@ #. 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:2387 +#: build/trans_presets.java:2397 msgid "Edit Power Tower" msgstr "Редактирай стълб от ЕПМ" -#. item "Man Made/Power Tower" label "Edit Power Tower" -#. -#: build/trans_presets.java:2390 +#. item "Man Made/Power Tower" combo "Type" +#: build/trans_presets.java:2398 +#, fuzzy +msgid "tower" +msgstr "Кула" + +#: build/trans_presets.java:2398 +#, fuzzy +msgid "pole" +msgstr "Роля" + +#: build/trans_presets.java:2399 +#, fuzzy +msgid "Tower reference" +msgstr "Номер линия" + +#. item "Man Made/Power Tower" text "Tower reference" +#: build/trans_presets.java:2401 msgid "Power Line" msgstr "Линия за електропренос" @@ -20260,40 +20370,83 @@ #. -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2404 msgid "Edit Power Line" msgstr "Редактирай линия за електропренос" +#. item "Man Made/Power Line" label "Edit Power Line" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "Line type" +msgstr "Тип писта" + +#. item "Man Made/Power Line" combo "Line type" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "line" +msgstr "Наклон" + +#: build/trans_presets.java:2405 +#, fuzzy +msgid "minor_line" +msgstr "Автомагистрална връзка" + #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2408 msgid "Voltage" msgstr "Волтаж" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2398 -msgid "Amount of Wires" +#: build/trans_presets.java:2409 +#, fuzzy +msgid "Amount of Cables" msgstr "Брой жици" -#. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2401 +#. item "Man Made/Power Line" text "Amount of Cables" +#: build/trans_presets.java:2410 +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:2410 +#, fuzzy +msgid "single" +msgstr "Ъгъл" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "double" +msgstr "Буле (игра с мет.топчета)" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "triple" +msgstr "Стълби за преминаване през ограда" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "quad" +msgstr "Кваркери" + +#: build/trans_presets.java:2413 msgid "Amenities" msgstr "Обществени удобства" #. group "Amenities" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2414 msgid "Toilets" msgstr "Тоалетни" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2409 build/trans_presets.java:2525 +#: build/trans_presets.java:2421 build/trans_presets.java:2537 msgid "Note" msgstr "Забележка" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2411 +#: build/trans_presets.java:2423 msgid "Post Box" msgstr "Пощенска кутия" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2428 msgid "Telephone" msgstr "Телефон" @@ -20302,5 +20455,5 @@ #. -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2431 msgid "Edit Telephone" msgstr "Редактирай телефон" @@ -20308,5 +20461,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2422 build/trans_presets.java:2526 +#: build/trans_presets.java:2434 build/trans_presets.java:2538 msgid "Coins" msgstr "Монети" @@ -20314,5 +20467,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2423 build/trans_presets.java:2527 +#: build/trans_presets.java:2435 build/trans_presets.java:2539 msgid "Notes" msgstr "Банкноти" @@ -20320,5 +20473,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2424 build/trans_presets.java:2528 +#: build/trans_presets.java:2436 build/trans_presets.java:2540 msgid "Electronic purses and Charge cards" msgstr "Електрони средства за разплата" @@ -20326,5 +20479,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2425 build/trans_presets.java:2529 +#: build/trans_presets.java:2437 build/trans_presets.java:2541 msgid "Debit cards" msgstr "Дебитни карти" @@ -20332,15 +20485,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2426 build/trans_presets.java:2530 +#: build/trans_presets.java:2438 build/trans_presets.java:2542 msgid "Credit cards" msgstr "Кредитни карти" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2439 msgid "Telephone cards" msgstr "Телефонни карти" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2429 +#: build/trans_presets.java:2441 msgid "Recycling" msgstr "Рециклиране" @@ -20349,5 +20502,5 @@ #. -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2444 msgid "Edit Recycling station" msgstr "Редактиране на станция за рециклиране" @@ -20355,35 +20508,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2446 msgid "Batteries" msgstr "Батерии" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2435 +#: build/trans_presets.java:2447 msgid "Cans" msgstr "Консервни кутии" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2448 msgid "Clothes" msgstr "Дрехи" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2437 +#: build/trans_presets.java:2449 msgid "Glass" msgstr "Стъкло" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2450 msgid "Paper" msgstr "Хартия" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2451 msgid "Scrap Metal" msgstr "Вторични суровини" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2453 msgid "Bench" msgstr "Скамейка" @@ -20392,33 +20545,33 @@ #. #. -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2456 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "Material" -msgstr "" +msgstr "Материал" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "stone" -msgstr "" - -#: build/trans_presets.java:2445 +msgstr "камък" + +#: build/trans_presets.java:2457 msgid "plastic" -msgstr "" - -#: build/trans_presets.java:2446 +msgstr "пластмаса" + +#: build/trans_presets.java:2458 msgid "Colour" -msgstr "" +msgstr "Цвят" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "black" -msgstr "" - -#: build/trans_presets.java:2446 +msgstr "черно" + +#: build/trans_presets.java:2458 msgid "brown" -msgstr "" +msgstr "кафяво" #. color historic @@ -20487,5 +20640,5 @@ #. #. -#: build/trans_presets.java:2446 build/trans_style.java:3063 +#: build/trans_presets.java:2458 build/trans_style.java:3063 #: build/trans_style.java:3071 build/trans_style.java:3079 #: build/trans_style.java:3087 build/trans_style.java:3135 @@ -20495,27 +20648,27 @@ msgstr "зеленина" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "red" -msgstr "" - -#: build/trans_presets.java:2446 +msgstr "червено" + +#: build/trans_presets.java:2458 msgid "blue" -msgstr "" - -#: build/trans_presets.java:2446 +msgstr "синьо" + +#: build/trans_presets.java:2458 msgid "white" -msgstr "" - -#: build/trans_presets.java:2447 +msgstr "бяло" + +#: build/trans_presets.java:2459 msgid "Amount of Seats" -msgstr "" +msgstr "Брой седящи места" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2461 msgid "Hunting Stand" msgstr "Ловно скривалище" #. item -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2462 msgid "Edit Hunting Stand" msgstr "Редактирай ловно скривалище" @@ -20524,30 +20677,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2452 build/trans_presets.java:2914 +#: build/trans_presets.java:2464 build/trans_presets.java:2926 msgid "Height" msgstr "Височина" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "low" msgstr "нисък" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "half" msgstr "среден" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "full" msgstr "пълен" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2466 msgid "Hide" msgstr "Скривалище" -#: build/trans_presets.java:2455 +#: build/trans_presets.java:2467 msgid "Lock" msgstr "Заключване" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2469 msgid "Fountain" msgstr "Фонтан" @@ -20556,10 +20709,10 @@ #. -#: build/trans_presets.java:2460 +#: build/trans_presets.java:2472 msgid "Edit Fountain" msgstr "Редактирай фонтан" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2476 msgid "Drinking Water" msgstr "Питейна вода" @@ -20568,10 +20721,10 @@ #. -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2479 msgid "Edit Drinking Water" msgstr "Редактирай питейна вода" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2471 +#: build/trans_presets.java:2483 msgid "Baby Hatch" msgstr "Дестка ясла" @@ -20579,33 +20732,33 @@ #. item #. -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2485 msgid "Edit Baby Hatch" msgstr "Редактирай детска ясла" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2491 msgid "Shops" msgstr "Магазини" #. group "Shops" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2492 msgid "Supermarket" msgstr "Супермаркет" #. item -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2493 msgid "Edit Supermarket" msgstr "Редактирай супермаркет" -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2498 msgid "Chemist" msgstr "Аптека" #. item -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2499 msgid "Edit Chemist" msgstr "Редактиране на: аптека" -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2504 msgid "Convenience Store" msgstr "Бакалия" @@ -20613,9 +20766,9 @@ #. item #. -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2506 msgid "Edit Convenience Store" msgstr "Редактирай бакалия" -#: build/trans_presets.java:2499 +#: build/trans_presets.java:2511 msgid "Kiosk" msgstr "Будка" @@ -20623,27 +20776,27 @@ #. item #. -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2513 msgid "Edit Kiosk" msgstr "Редактирай будка" -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2518 msgid "Book Store" msgstr "Книжарница" #. item -#: build/trans_presets.java:2507 +#: build/trans_presets.java:2519 msgid "Edit Book Store" msgstr "Редактиране на книжарница" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2524 msgid "Travel Agency" msgstr "Туристическа агенция" #. item -#: build/trans_presets.java:2513 +#: build/trans_presets.java:2525 msgid "Edit Travel Agency" msgstr "Редактиране на туристическа агенция" -#: build/trans_presets.java:2518 +#: build/trans_presets.java:2530 msgid "Vending machine" msgstr "Автомат за стоки" @@ -20651,5 +20804,5 @@ #. item #. -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2532 msgid "Edit Vending machine" msgstr "Редактирай автомат за стоки" @@ -20657,88 +20810,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "Vending products" msgstr "Продукти за автоматична продажба" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_tickets" msgstr "билети за обществен транспорт" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_plans" msgstr "карта на обществен транспорт" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "parking_tickets" msgstr "билети за паркиране" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "food" msgstr "храна" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "drinks" msgstr "напитки" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "sweets" msgstr "сладки" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "cigarettes" msgstr "цигари" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "photos" msgstr "фотографии" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "animal_food" msgstr "храна за животни" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "news_papers" msgstr "вестници" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "toys" msgstr "играчки" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "stamps" msgstr "пощенски марки" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "SIM-cards" msgstr "SIM-карти" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "telephone_vouchers" msgstr "телефонни ваучери" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "vouchers" msgstr "ваучери" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "condoms" msgstr "презервативи" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "tampons" msgstr "тампони" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "excrement_bags" msgstr "торби за екскременти" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2543 msgid "Account or loyalty cards" msgstr "клиентски карти" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2545 msgid "Butcher" msgstr "Месарница" @@ -20746,9 +20899,9 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2547 msgid "Edit Butcher" msgstr "Редактирай месарница" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2552 msgid "Baker" msgstr "Фурна" @@ -20756,9 +20909,9 @@ #. item #. -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2554 msgid "Edit Baker" msgstr "Редактирай фурна" -#: build/trans_presets.java:2547 +#: build/trans_presets.java:2559 msgid "Florist" msgstr "Цветарски магазин" @@ -20766,18 +20919,18 @@ #. item #. -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2561 msgid "Edit Florist" msgstr "Редактирай цветарски магазин" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2566 msgid "Organic" msgstr "Био магазин" #. item -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2567 msgid "Edit Organic Shop" msgstr "Редактирай био магазин" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2572 msgid "Alcohol" msgstr "Алкохол" @@ -20785,54 +20938,54 @@ #. item #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2574 msgid "Edit Alcohol Shop" msgstr "Редактиране магазин за алкохол" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2579 msgid "Beverages" msgstr "Напитки" #. item -#: build/trans_presets.java:2568 +#: build/trans_presets.java:2580 msgid "Edit Beverages Shop" msgstr "Редактиране магазин за безалкохолни" -#: build/trans_presets.java:2573 +#: build/trans_presets.java:2585 msgid "Computer" msgstr "Компютри" #. item -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2586 msgid "Edit Computer Shop" msgstr "Редактирай компютърен магазин" -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2591 msgid "Electronics" msgstr "Електроника" #. item -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2592 msgid "Edit Electronics Shop" msgstr "Редактирай магазин за електроника" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2597 msgid "Hifi" msgstr "Аудио HiFi" #. item -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2598 msgid "Edit Hifi Shop" msgstr "Редактирай магазин за Аудио HiFi" -#: build/trans_presets.java:2591 +#: build/trans_presets.java:2603 msgid "Furniture" msgstr "Мебелен магазин" #. item -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2604 msgid "Edit Furniture Shop" msgstr "Редактирай мебелен магазин" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2609 msgid "Garden Centre" msgstr "Градински център" @@ -20840,9 +20993,9 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2611 msgid "Edit Garden Centre" msgstr "Редактирай градински център" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2616 msgid "Hardware" msgstr "Железария" @@ -20850,9 +21003,9 @@ #. item #. -#: build/trans_presets.java:2606 +#: build/trans_presets.java:2618 msgid "Edit Hardware Store" msgstr "Редактирай железария" -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2623 msgid "Do-it-yourself-store" msgstr "Магазин \"Направи си сам\"" @@ -20860,54 +21013,54 @@ #. item #. -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2625 msgid "Edit Do-it-yourself-store" msgstr "Редактирай магазин \"Направи си сам\"" -#: build/trans_presets.java:2618 +#: build/trans_presets.java:2630 msgid "Stationery" msgstr "Книжарница" #. item -#: build/trans_presets.java:2619 +#: build/trans_presets.java:2631 msgid "Edit Stationery Shop" msgstr "Редактирай книжарница" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2636 msgid "Hairdresser" msgstr "Фризьорски салон / козметика" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2637 msgid "Edit Hairdresser" msgstr "Редактирай фризьорски салон / козметика" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2642 msgid "Shoes" msgstr "Обувки" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2643 msgid "Edit Shoe Shop" msgstr "Редактирай магазин за обувки" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2648 msgid "Toys" msgstr "Играчки" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2649 msgid "Edit Toy Shop" msgstr "Редактирай магазин за играчки" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2654 msgid "Video" msgstr "Видео" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2655 msgid "Edit Video Shop" msgstr "Редактирай Видео-магазин" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2660 msgid "Dry Cleaning" msgstr "Химическо чистене" @@ -20915,9 +21068,9 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2662 msgid "Edit Dry Cleaning" msgstr "Редактирай химическо чистене" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2667 msgid "Laundry" msgstr "Пералня" @@ -20925,9 +21078,9 @@ #. item #. -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2669 msgid "Edit Laundry" msgstr "Редактирай пералня" -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2674 msgid "Outdoor" msgstr "Туристически стоки (за активен отдих)" @@ -20935,28 +21088,28 @@ #. item #. -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2676 msgid "Edit Outdoor Shop" msgstr "Редактирай мазизин за туристически стоки" #. item -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2682 msgid "Edit Sports Shop" msgstr "Редактирай магазин за спортни стоки" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2687 msgid "Optician" msgstr "Оптика" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2688 msgid "Edit Optician" msgstr "Редактирай оптика" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2695 msgid "Cash" msgstr "Пари" #. group "Cash" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2696 msgid "Bank" msgstr "Банка" @@ -20964,14 +21117,14 @@ #. item #. -#: build/trans_presets.java:2686 +#: build/trans_presets.java:2698 msgid "Edit Bank" msgstr "Редактирай банка" -#: build/trans_presets.java:2691 build/trans_presets.java:2700 +#: build/trans_presets.java:2703 build/trans_presets.java:2712 msgid "Automated Teller Machine" msgstr "Банкомат" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2705 msgid "Money Exchange" msgstr "Обмяна на валута" @@ -20979,5 +21132,5 @@ #. item #. -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2707 msgid "Edit Money Exchange" msgstr "Редактирай обмяна на валута" @@ -20985,15 +21138,15 @@ #. item #. -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2714 msgid "Edit Automated Teller Machine" msgstr "Редактирай банкомат" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2719 msgid "Health" msgstr "Здраве" #. group "Health" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2720 msgid "Doctors" msgstr "Доктори" @@ -21001,18 +21154,18 @@ #. item #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2722 msgid "Edit Doctors" msgstr "Редактирай доктори" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2727 msgid "Dentist" msgstr "Стоматолог" #. item -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2728 msgid "Edit Dentist" msgstr "Редактирай стоматолигия" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2733 msgid "Pharmacy" msgstr "Аптека" @@ -21020,5 +21173,5 @@ #. item #. -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2735 msgid "Edit Pharmacy" msgstr "Редактирай аптека" @@ -21026,9 +21179,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2737 msgid "Dispensing" msgstr "Приготвят лекарства по рецепти" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2741 msgid "Hospital" msgstr "Болница" @@ -21036,10 +21189,10 @@ #. item #. -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2743 msgid "Edit Hospital" msgstr "Редактирай болница" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2747 msgid "Emergency Access Point" msgstr "Пункт за връзка със спешна помощ" @@ -21048,5 +21201,5 @@ #. -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2750 msgid "Edit Emergency Access Point" msgstr "Редактирай пункт за връзка със спешна помощ" @@ -21055,20 +21208,20 @@ #. #. -#: build/trans_presets.java:2741 +#: build/trans_presets.java:2753 msgid "Point Number" msgstr "Номер на пункта" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2742 +#: build/trans_presets.java:2754 msgid "Point Name" msgstr "Име на пункта" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2756 msgid "Phone Number" msgstr "Телефонен номер" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2757 msgid "(Use international code, like +12-345-67890)" msgstr "(Използвайте международен код, като например +12-345-67890)" @@ -21076,5 +21229,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2760 msgid "Veterinary" msgstr "Ветеринар" @@ -21083,59 +21236,59 @@ #. -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2763 msgid "Edit Veterinary" msgstr "Редактирай ветеринар" -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2770 msgid "Geography" -msgstr "" +msgstr "География" #. group "Places" -#: build/trans_presets.java:2760 +#: build/trans_presets.java:2772 msgid "Continent" msgstr "Континент" #. item -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2773 msgid "Edit Continent" msgstr "Редактирай континент" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2766 +#: build/trans_presets.java:2778 msgid "Country" msgstr "Държава" #. item -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2779 msgid "Edit Country" msgstr "Редактирай държава" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2784 msgid "State" msgstr "Област/Щат" #. item -#: build/trans_presets.java:2773 +#: build/trans_presets.java:2785 msgid "Edit State" msgstr "Редактирай област/щат" #. item "Places/State" text "Name" -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2790 msgid "Region" msgstr "Област" #. item -#: build/trans_presets.java:2779 +#: build/trans_presets.java:2791 msgid "Edit Region" msgstr "Редактирай област" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2796 msgid "County" msgstr "Графство" #. item -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2797 msgid "Edit County" msgstr "Редактирай графство" @@ -21143,15 +21296,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2803 msgid "City" msgstr "Град (над 100 000)" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2804 msgid "Edit City" msgstr "Редактирай голям град" #. item "Places/City" text "Name" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2809 msgid "Town" msgstr "Град (под 100 000)" @@ -21159,10 +21312,10 @@ #. item #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2811 msgid "Edit Town" msgstr "Редактирай град" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2804 +#: build/trans_presets.java:2816 msgid "Suburb" msgstr "Квартал/предградие" @@ -21170,25 +21323,25 @@ #. item #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2818 msgid "Edit Suburb" msgstr "Редактирай квартал" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2823 msgid "Village" msgstr "Село" #. item -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2824 msgid "Edit Village" msgstr "Редактирай село" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2817 +#: build/trans_presets.java:2829 msgid "Hamlet" msgstr "Махала" #. item -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2830 msgid "Edit Hamlet" msgstr "Редактирай махала" @@ -21196,5 +21349,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2824 +#: build/trans_presets.java:2836 msgid "Locality" msgstr "Местност" @@ -21202,10 +21355,10 @@ #. item #. -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2838 msgid "Edit Locality" msgstr "Редактирай местност" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2843 msgid "Island" msgstr "Остров" @@ -21213,10 +21366,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2845 msgid "Edit Island" msgstr "Редактирай остров" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2838 +#: build/trans_presets.java:2850 msgid "Islet" msgstr "Скала" @@ -21224,5 +21377,5 @@ #. item #. -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2852 msgid "Edit Islet" msgstr "Редактиране на: скала" @@ -21230,5 +21383,5 @@ #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2858 msgid "Cave Entrance" msgstr "Пещерен вход" @@ -21236,10 +21389,10 @@ #. item #. -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2860 msgid "Edit Cave Entrance" msgstr "Редактиране пещерен вход" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2864 msgid "Peak" msgstr "Връх" @@ -21247,10 +21400,10 @@ #. item #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2866 msgid "Edit Peak" msgstr "Редактиране връх" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2871 msgid "Glacier" msgstr "Ледник" @@ -21258,10 +21411,10 @@ #. item #. -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2873 msgid "Edit Glacier" msgstr "Редактиране ледник" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2878 msgid "Volcano" msgstr "Вулкан" @@ -21269,70 +21422,70 @@ #. item #. -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2880 msgid "Edit Volcano" msgstr "Редактиране вулкан" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2886 msgid "Boundaries" msgstr "Граници" #. group "Boundaries" -#: build/trans_presets.java:2875 +#: build/trans_presets.java:2887 msgid "National" msgstr "Национална" #. item -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2888 msgid "Edit National Boundary" msgstr "Редактирай национална граница" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2881 +#: build/trans_presets.java:2893 msgid "Administrative" msgstr "Административна" #. item -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2894 msgid "Edit Administrative Boundary" msgstr "Редактирай административна граница" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2887 +#: build/trans_presets.java:2899 msgid "Civil" msgstr "Гражданска" #. item -#: build/trans_presets.java:2888 +#: build/trans_presets.java:2900 msgid "Edit Civil Boundary" msgstr "Редактирай гражданска граница" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2893 +#: build/trans_presets.java:2905 msgid "Political" msgstr "Политическа" #. item -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2906 msgid "Edit Political Boundary" msgstr "Редактирай политическа граница" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2911 msgid "National park" msgstr "Национален парк" #. item -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2912 msgid "Edit National Park Boundary" msgstr "Редактирай граница национален парк" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2918 msgid "Land use" msgstr "Земеползване" #. group "Land use" -#: build/trans_presets.java:2907 +#: build/trans_presets.java:2919 msgid "Tree" msgstr "Дърво" @@ -21341,15 +21494,15 @@ #. -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2922 msgid "Edit Tree" msgstr "Редактирай дърво" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2915 +#: build/trans_presets.java:2927 msgid "Botanical Name" msgstr "Ботаническо название" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2929 msgid "Wood" msgstr "Гора" @@ -21358,5 +21511,5 @@ #. -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2932 msgid "Edit Wood" msgstr "Редактирай гората" @@ -21364,17 +21517,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "coniferous" msgstr "иглолистен" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "deciduous" msgstr "широколистен" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "mixed" msgstr "смесен" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2937 msgid "Forest" msgstr "Гора" @@ -21383,14 +21536,14 @@ #. -#: build/trans_presets.java:2928 +#: build/trans_presets.java:2940 msgid "Edit Forest Landuse" msgstr "Редактирай гора" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2946 msgid "Nature Reserve" msgstr "Природен резерват" #. item -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2947 msgid "Edit Nature Reserve" msgstr "Редактирай природен резерват" @@ -21398,25 +21551,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2952 msgid "Scree" msgstr "Сипей" #. item -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2953 msgid "Edit Scree" msgstr "Редактирай сипей" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2957 msgid "Scrub" msgstr "Шубрак" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:2958 msgid "Edit Scrub" msgstr "Редактирай шубрака" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2962 msgid "Fell" msgstr "Скалист склон" @@ -21424,10 +21577,10 @@ #. item #. -#: build/trans_presets.java:2952 +#: build/trans_presets.java:2964 msgid "Edit Fell" msgstr "Редактирай скалист склон" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2968 msgid "Heath" msgstr "Пустош" @@ -21435,5 +21588,5 @@ #. item #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2970 msgid "Edit Heath" msgstr "Редактиране пустош" @@ -21441,5 +21594,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2975 msgid "Farmyard" msgstr "Двор ферма" @@ -21448,71 +21601,71 @@ #. -#: build/trans_presets.java:2966 +#: build/trans_presets.java:2978 msgid "Edit Farmyard Landuse" msgstr "Редактирай двор ферма" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2983 msgid "Farmland" msgstr "Обработваема земя" #. item -#: build/trans_presets.java:2972 +#: build/trans_presets.java:2984 msgid "Edit Farmland Landuse" msgstr "Редактирай обработваема земя" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2977 +#: build/trans_presets.java:2989 msgid "Meadow" msgstr "Поляна" #. item -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2990 msgid "Edit Meadow Landuse" msgstr "Редактиране поляна" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:2995 msgid "Vineyard" msgstr "Лозе" #. item -#: build/trans_presets.java:2984 +#: build/trans_presets.java:2996 msgid "Edit Vineyard Landuse" msgstr "Редактирай лозе" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3001 msgid "Allotments" -msgstr "Общинска земя" - -#. item -#: build/trans_presets.java:2990 +msgstr "Земя за лично ползване" + +#. item +#: build/trans_presets.java:3002 msgid "Edit Allotments Landuse" -msgstr "Редактирай общинска земя" +msgstr "Редактиране на: Земя за лично ползване" #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3008 msgid "Garden" msgstr "Градина" #. item -#: build/trans_presets.java:2997 +#: build/trans_presets.java:3009 msgid "Edit Garden" msgstr "Редактирай градина" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3013 msgid "Grass" msgstr "Трева" #. item -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3014 msgid "Edit Grass Landuse" msgstr "Редактирай трева" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3019 msgid "Village Green" msgstr "Зелено село" @@ -21520,10 +21673,10 @@ #. item #. -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3021 msgid "Edit Village Green Landuse" msgstr "Редактирай зелено селище" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3026 msgid "Common" msgstr "Общи" @@ -21531,20 +21684,20 @@ #. item #. -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3028 msgid "Edit Common" msgstr "Редактирай общи" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3032 msgid "Park" msgstr "Парк" #. item -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3033 msgid "Edit Park" msgstr "Редактирай парк" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3037 msgid "Recreation Ground" msgstr "Спортна площадка" @@ -21552,5 +21705,5 @@ #. item #. -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3039 msgid "Edit Recreation Ground Landuse" msgstr "Редактирай спортна площадка" @@ -21558,15 +21711,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3033 +#: build/trans_presets.java:3045 msgid "Residential area" msgstr "Жилищна зона" #. item -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3046 msgid "Edit Residential Landuse" msgstr "Редактирай жилищна зона" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3051 msgid "Graveyard" msgstr "Църковно гробище" @@ -21574,9 +21727,9 @@ #. item #. -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3053 msgid "Edit Graveyard" msgstr "Редактирай църковно гробище" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3059 msgid "Cemetery" msgstr "Гробище" @@ -21584,39 +21737,39 @@ #. item #. -#: build/trans_presets.java:3049 +#: build/trans_presets.java:3061 msgid "Edit Cemetery Landuse" msgstr "Редактирай гробище" -#: build/trans_presets.java:3056 +#: build/trans_presets.java:3068 msgid "Retail" msgstr "Търговия на дребно" #. item -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3069 msgid "Edit Retail Landuse" msgstr "Редактирай търговия на дребно" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3062 +#: build/trans_presets.java:3074 msgid "Commercial" msgstr "Търговия" #. item -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3075 msgid "Edit Commercial Landuse" msgstr "Редактирай търговия" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3068 +#: build/trans_presets.java:3080 msgid "Industrial" msgstr "Промишленост" #. item -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3081 msgid "Edit Industrial Landuse" msgstr "Редактирай промишленост" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3086 msgid "Railway land" msgstr "Железопътен път" @@ -21624,15 +21777,15 @@ #. item #. -#: build/trans_presets.java:3076 +#: build/trans_presets.java:3088 msgid "Edit Railway Landuse" msgstr "Редактирай ЖП" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3081 +#: build/trans_presets.java:3093 msgid "Military" msgstr "Военен" #. item -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3094 msgid "Edit Military Landuse" msgstr "Редакирай военна земя" @@ -21640,55 +21793,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3100 msgid "Construction area" msgstr "Строителна площадка" #. item -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3101 msgid "Edit Construction Landuse" msgstr "Редактирай строителна площадка" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3094 +#: build/trans_presets.java:3106 msgid "Brownfield" msgstr "Индустриални развалини" #. item -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3107 msgid "Edit Brownfield Landuse" msgstr "Редактирай ундустриални развалини" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3100 +#: build/trans_presets.java:3112 msgid "Greenfield" msgstr "Зелени площи" #. item -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3113 msgid "Edit Greenfield Landuse" msgstr "Редактирай зелени площи" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3118 msgid "Landfill" msgstr "Сметище" #. item -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3119 msgid "Edit Landfill Landuse" msgstr "Редактирай сметище" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3124 msgid "Quarry" msgstr "Кариера" #. item -#: build/trans_presets.java:3113 +#: build/trans_presets.java:3125 msgid "Edit Quarry Landuse" msgstr "Редактирай кариера" #. group "Relations" -#: build/trans_presets.java:3122 +#: build/trans_presets.java:3134 msgid "Multipolygon" msgstr "Мултиполигон" @@ -21698,5 +21851,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:3126 +#: build/trans_presets.java:3138 msgid "Edit Multipolygon" msgstr "Редактиране мултиполигон" @@ -21705,10 +21858,10 @@ #. #. -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3144 msgid "outer segment" msgstr "външен сегмент" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3145 msgid "inner segment" msgstr "вътрешен сегмент" @@ -21716,5 +21869,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3148 msgid "Turn restriction" msgstr "Ограничения при завиване" @@ -21723,5 +21876,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3151 msgid "Edit Turn Restriction" msgstr "Редактиране на ограничения при завиване" @@ -21729,34 +21882,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "Restriction" msgstr "Ограничения" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_left_turn" msgstr "забранен ляв завой" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_right_turn" msgstr "забранен десен завой" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_straight_on" msgstr "забранено напред" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_u_turn" msgstr "забранен обратен завой" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_right_turn" msgstr "само десен завой" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_left_turn" msgstr "само ляв завой" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_straight_on" msgstr "само направо" @@ -21765,15 +21918,15 @@ #. #. -#: build/trans_presets.java:3146 +#: build/trans_presets.java:3158 msgid "from way" msgstr "от път" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3159 msgid "via node or way" msgstr "през точка или път" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3148 +#: build/trans_presets.java:3160 msgid "to way" msgstr "до път" @@ -21781,5 +21934,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3151 +#: build/trans_presets.java:3163 msgid "Route" msgstr "Маршрут" @@ -21788,5 +21941,5 @@ #. -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3166 msgid "Edit Route" msgstr "Редактиране маршрут" @@ -21794,5 +21947,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "Route type" msgstr "Тип маршрут" @@ -21864,5 +22017,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:233 +#: build/trans_presets.java:3168 build/trans_style.java:233 #: build/trans_style.java:683 build/trans_style.java:906 #: build/trans_style.java:914 build/trans_style.java:922 @@ -21871,17 +22024,17 @@ msgstr "велосипед" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "bus" msgstr "автобус" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "road" msgstr "път" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ferry" msgstr "ферибот" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ski" msgstr "ски" @@ -21934,5 +22087,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:247 +#: build/trans_presets.java:3168 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -21941,13 +22094,13 @@ msgstr "пеш" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "hiking" msgstr "туристически маршрут" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "tram" msgstr "трамваен маршрут" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "detour" msgstr "обиколка" @@ -21961,10 +22114,10 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:1206 +#: build/trans_presets.java:3168 build/trans_style.java:1206 msgid "subway" msgstr "метро" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3159 +#: build/trans_presets.java:3171 msgid "Symbol description" msgstr "Описание на символ" @@ -21972,31 +22125,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3174 msgid "Network" msgstr "Мрежа" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "proposed" msgstr "предложен" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "alternate" msgstr "алтернативен" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "temporary" msgstr "временен" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "connection" msgstr "връзка" -#: build/trans_presets.java:3165 +#: build/trans_presets.java:3177 msgid "Color (hex)" msgstr "Цвят (hex)" @@ -22005,30 +22158,30 @@ #. #. -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3180 msgid "route segment" msgstr "сегмент от маршрут" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3181 msgid "forward segment" msgstr "сегмент напред" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3170 +#: build/trans_presets.java:3182 msgid "backward segment" msgstr "сегмент назад" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3183 msgid "halt point" msgstr "точка за спиране" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3172 +#: build/trans_presets.java:3184 msgid "forward halt point" msgstr "точка за спиране напред" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3173 +#: build/trans_presets.java:3185 msgid "backward halt point" msgstr "точка за спиране назад" @@ -25200,5 +25353,5 @@ #: build/trans_style.java:3095 msgid "quarry" -msgstr "кариер" +msgstr "кариера" #. color quarry @@ -26159,10 +26312,37 @@ #: build/trans_wms.java:25 msgid "Czech CUZK:KM" -msgstr "" +msgstr "Czech CUZK:KM" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& #: build/trans_wms.java:26 msgid "Czech UHUL:ORTOFOTO" -msgstr "" +msgstr "Czech UHUL:ORTOFOTO" + +#~ msgid "Combine ways with different memberships?" +#~ msgstr "Обединяване на линии, влизащи в различни релации?" + +#~ msgid "Combine Anyway" +#~ msgstr "Комбиниране въпреки всичко" + +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "" +#~ "Избраните пътища имат различни участия в релации. Въпреки това искате ли " +#~ "да ги обеденим?" + +#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +#~ msgstr "" +#~ "Началото на съобщението за грешка \"{0}\" не отговаря на очаквания шаблон " +#~ "\"{1}\"" + +#~ msgid "Purging 1 primitive" +#~ msgstr "Изчистване на 1 примитив" + +#~ msgid "removing reference from way {0}" +#~ msgstr "премахване на справка от път {0}" + +#~ msgid "Empty member in relation." +#~ msgstr "В релацията има празен член." #~ msgid "{0} Plugin successfully updated. Please restart JOSM." Index: /applications/editors/josm/i18n/po/cs.po =================================================================== --- /applications/editors/josm/i18n/po/cs.po (revision 17821) +++ /applications/editors/josm/i18n/po/cs.po (revision 17822) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-22 17:52+0200\n" -"PO-Revision-Date: 2009-09-22 15:13+0000\n" -"Last-Translator: Martin Petricek \n" +"POT-Creation-Date: 2009-09-28 16:38+0200\n" +"PO-Revision-Date: 2009-09-27 08:46+0000\n" +"Last-Translator: Jezevec \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: 2009-09-22 15:46+0000\n" +"X-Launchpad-Export-Date: 2009-09-28 14:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -66,8 +66,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250 @@ -90,9 +90,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -141,7 +141,7 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:172 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 @@ -154,5 +154,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 @@ -331,6 +330,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -340,6 +338,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 @@ -349,5 +347,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -358,5 +356,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180 @@ -365,5 +363,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -458,9 +456,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -492,10 +490,9 @@ msgstr "Vyberte minimálně 4 uzly" -#. FIXME: not sure whether this fits in a dialog #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:85 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -605,5 +602,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 #, java-format msgid "File: {0}" @@ -625,36 +622,22 @@ msgstr "Stahování otevřených sad změn..." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine Way" msgstr "Spojit cesty" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 msgid "Combine several ways into one." msgstr "Spojit více cest do jedné" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 -msgid "Combine ways with different memberships?" -msgstr "Spojit cesty patřící do jiné relace?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -msgid "Combine Anyway" -msgstr "Přesto zkombinovat" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "Vybrané cesty patří do jiné relace. Opravdu je chcete spojit?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 msgid "Change directions?" msgstr "Změnit směr ?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Reverse and Combine" msgstr "Otočit a zkombinovat" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -664,5 +647,5 @@ "orientaci?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -670,10 +653,10 @@ msgstr "Nemohu spojit cesty (Nemohou být spojeny do jednoho řetězce bodů)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 #, java-format msgid "Combine {0} ways" msgstr "Kombinovat {0} cesty" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 msgid "Please select at least two ways to combine." msgstr "Prosím zvolte minimálně dvě cesty ke spojení" @@ -719,6 +702,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -783,5 +765,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -812,5 +794,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307 #, java-format msgid "There were {0} conflicts during import." @@ -828,5 +809,4 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Duplicate" @@ -857,10 +837,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:209 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Exportovat do GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:208 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Exportovat data do GPX souboru." @@ -871,8 +851,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -937,5 +917,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 @@ -980,6 +960,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1069,22 +1048,22 @@ msgstr "Sloučit aktuální vrstvu do jiné vrstvy" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge Nodes" msgstr "Spojit uzly" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 msgid "Merge nodes into the oldest one." msgstr "Spoj uzly do nejstaršího" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 msgid "Please select at least two nodes to merge." msgstr "Zvolte minimálně dva uzly ke spojení" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "Nemohu spojit uzly: Smazala by se tak cesta, která je stále používána." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 #, java-format msgid "Merge {0} nodes" @@ -1156,5 +1135,4 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350 msgid "New" msgstr "Nový" @@ -1334,10 +1312,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Uložit" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Uložit aktuální data." @@ -1394,10 +1372,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Uložit jako..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Uložit aktuální data do nového souboru" @@ -1442,5 +1420,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:961 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888 @@ -1685,14 +1663,14 @@ msgstr "Prázdný výběr" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 msgid "Upload to OSM..." msgstr "Nahrát do OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload all changes to the OSM server." msgstr "Nahrát všechy změny na OSM server." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 #, java-format msgid "" @@ -1701,23 +1679,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Není nic k nahrání. Nejprve musíte mít nějaká data." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:171 msgid "No changes to upload." msgstr "Žádné změny k nahrání." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223 #, java-format msgid "Synchronize {0} {1} only" msgstr "Synchronizovat pouze {0} {1}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 msgid "Synchronize entire dataset" msgstr "Synchronizovat celý dataset" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:228 #, java-format msgid "" @@ -1738,17 +1716,17 @@ "pro přerušení a pokračování editace.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:283 msgid "Conflict detected" msgstr "Detekován konflikt" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:257 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 #, java-format msgid "Unexpected return value. Got {0}." msgstr "Neočekávaná návratová hodnota. Navráceno {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:272 #, java-format msgid "" @@ -1764,5 +1742,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:306 #, java-format msgid "" @@ -1772,35 +1750,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 msgid "Changeset closed" msgstr "Sada změn byla uzavřena" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "Varování: chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "Chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:425 #, java-format msgid "Uploading failed.
{0}" msgstr "Aktualizace selhala.
{0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:434 msgid "Upload to OSM API failed" msgstr "Nahrándí do OSM API selhalo" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457 msgid "Updating primitive" msgstr "Aktualizuji prvky" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:514 #, java-format msgid "Uploading data for layer ''{0}''" msgstr "Nahrávám na server data pro vrstvu ''{0}''" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1888,13 +1871,13 @@ msgstr "Zpomalené přehrávání" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34 msgid "Downloading GPS data" msgstr "Stahuji GPS data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57 msgid "Downloaded GPX Data" msgstr "Stažená GPX data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87 msgid "Raw GPS data" msgstr "Surová GPS data" @@ -1910,4 +1893,9 @@ msgstr "" "ignoruji vyjímku, protože stahování bylo stornování. Vyjímka byla : {0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 +#, fuzzy +msgid "No data found in this area." +msgstr "Nenalezena žádná data na zařízení." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2628,9 +2616,9 @@ msgstr "Přidání konfliktu pro ''{0}''" -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 +#, fuzzy, java-format +msgid "" +"Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "Nelze zrušit příkaz ''{0}'' protože vrstva ''{1}'' již není dostupná" @@ -2683,5 +2671,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Delete from relation" msgstr "Odstranit z relace" @@ -2738,14 +2726,15 @@ msgstr[2] "Přesunout uzly {0}" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 -msgid "Purging 1 primitive" -msgstr "Odstraňuji 1 prvek" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 -#, java-format -msgid "removing reference from way {0}" -msgstr "odstraňování reference z cesty {0}" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 +#, fuzzy, java-format +msgid "Purged object ''{0}''" +msgstr "Přesunout objekty {0}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 +#, fuzzy, java-format +msgid "Purged {0} objects" +msgstr "Změnit {0} objekt" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 #, java-format msgid "" @@ -2756,8 +2745,8 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203 -#, java-format -msgid "removing reference from relation {0}" -msgstr "" +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 +#, fuzzy, java-format +msgid "Removing reference from relation {0}" +msgstr "odstraňování reference z cesty {0}" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 @@ -2765,4 +2754,9 @@ msgid "Resolve conflicts in member list of relation {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +msgstr "Nelze zrušit příkaz ''{0}'' protože vrstva ''{1}'' již není dostupná" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 @@ -3106,24 +3100,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Error: {0}" msgstr "Chyba: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Warning: {0}" msgstr "Varování: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "očekáváno id >= 0. Nalezeno {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 msgid "A primitive with ID = 0 can't be invisible." msgstr "objekt s id=0 nemůže být neviditelný" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3131,5 +3125,5 @@ msgstr "očekáváno id > 0. Nalezeno {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3155,6 +3149,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:244 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3210,120 +3204,113 @@ msgstr "Cesta v multipolygonu ''{0}'' není uzavřena." -#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed -#. TODO Remove useless nullcheck when RelationMember.member is encalupsed -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855 -msgid "Empty member in relation." -msgstr "Prázdný prvek v relaci." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:850 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Odstraněn prvek ''{0}'' z relace." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:861 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Cesta ''{0}'' s méně, než dvěmi body." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 msgid "More than one \"from\" way found." msgstr "Nalezena více než jedna \"from\" cesta." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:607 msgid "More than one \"to\" way found." msgstr "Nalezeno více cílových \"to\" cest." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:613 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627 msgid "More than one \"via\" found." msgstr "Nalezen více než jeden \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:632 #, java-format msgid "Unknown role ''{0}''." msgstr "Neznámá role ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Neznámý typ prvku pro ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:641 msgid "No \"from\" way found." msgstr "Nenazezena příchozí cesta \"from\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645 msgid "No \"to\" way found." msgstr "Nenalezena odchozí cesta \"to\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:649 msgid "No \"via\" node or way found." msgstr "Nenalezen \"via\" uzel nebo cesta." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:658 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "Cesta \"from\" nezačíná, ani nekončí v uzlu \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:662 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "Cesta \"to\" nezačíná nebo nekončí v uzlu \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Cesta \"from\" nezačíná nebo nekončí v uzlu \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "Cesta \"to\" nezačíná nebo nekončí na cestě \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816 #, java-format msgid "Style for restriction {0} not found." msgstr "Styl pro omezení {0} nenalezen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:870 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Žádná použitelná role ''{0}'' pro cestu ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:882 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Ne-cesta ''{0}'' v multipolygonu." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:940 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Multipolygon ''{0}'' nemá žádnou vnější cestu." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1029 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Cesty ''{0}'' a ''{1}'' se protínají." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1041 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Vnitřní cesta ''{0}'' je venku." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1094 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Styl pro vnitřní cestu ''{0}'' odpovídá multipolygonu." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1120 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Styl pro vnější cestu ''{0}'' nesedí." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1324 msgid "untagged" msgstr "nepopsaný" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1325 msgid "text" msgstr "text" @@ -3348,5 +3335,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:249 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 @@ -3358,5 +3345,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 @@ -3387,5 +3374,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:169 msgid "background" msgstr "pozadí" @@ -3483,5 +3470,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "railway" msgstr "železnice" @@ -3539,9 +3526,14 @@ msgstr "Špatný požadavek" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +#, fuzzy +msgid "Not Found" +msgstr "Nepřipojeno" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 msgid "Unknown host" msgstr "Neznámé jméno počítače" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:247 msgid "Primitive already deleted" msgstr "Prvek byl již smazán" @@ -4874,5 +4866,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -5088,43 +5080,43 @@ msgstr "Člen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 msgid "Add Properties" msgstr "Přidat vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 msgid "Add a new key/value pair to all objects" msgstr "Přidat nový pár klíč/hodnota ke všem objektům" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 msgid "Edit Properties" msgstr "Upravit vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 msgid "Edit the value of the selected key for all objects" msgstr "Změnit hodnotu zvoleného klíče pro všechny objekty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Vlastnosti: {0} / Členství: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 msgid "Properties / Memberships" msgstr "Vlastnosti / Členství" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 msgid "Change relation" msgstr "Změnit relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Opravdu smazat výběr z relace {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:855 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 msgid "Delete the selected key in all objects" msgstr "Smaže zvolený klíč ve všech objektech" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 msgid "Delete Properties" msgstr "Smazat vlastnosti" @@ -5134,6 +5126,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168 -#: build/trans_presets.java:3121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 +#: build/trans_presets.java:3133 msgid "Relations" msgstr "Relace" @@ -5143,25 +5135,30 @@ msgstr "Otevřít seznam všech relací" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:174 #, java-format msgid "Relations: {0}" msgstr "Relace: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 msgid "Open an editor for the selected relation" msgstr "Otevřít editor pro zvolenou relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:325 msgid "Delete the selected relation" msgstr "Smazat vybrané relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:363 msgid "Create a new relation" msgstr "Vytvořit novou relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:400 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280 msgid "Create a copy of this relation and open it in another editor window" msgstr "Vytvořit kopii relace a otevřít ji v novém okně" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 +#, fuzzy +msgid "Set the current selection to the list of selected relations" +msgstr "Upravit vybranou relaci" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5202,9 +5199,9 @@ msgstr "Výběr: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 msgid "Undock the panel" msgstr "Vytrhnout panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5213,5 +5210,5 @@ "nástrojů." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 msgid "Click to minimize/maximize the panel content" msgstr "Minimalizovat nebo maximalizovat obsah panelu" @@ -5738,5 +5735,5 @@ #. group "Geography" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2771 msgid "Places" msgstr "Místa" @@ -6410,6 +6407,4 @@ #. item "Man Made/Windmill" label "Edit Windmill" #. -#. item "Man Made/Pipeline" label "Edit Pipeline" -#. #. item "Man Made/Wastewater Plant" label "Edit Wastewater Plant" #. @@ -6422,4 +6417,6 @@ #. item "Man Made/Surveillance" label "Edit Surveillance Camera" #. +#. item "Man Made/Power Station" label "Edit Power Station" +#. #. item "Amenities/Fountain" label "Edit Fountain" #. @@ -6744,57 +6741,57 @@ #: build/trans_presets.java:2250 build/trans_presets.java:2258 #: build/trans_presets.java:2290 build/trans_presets.java:2295 -#: build/trans_presets.java:2300 build/trans_presets.java:2305 -#: build/trans_presets.java:2311 build/trans_presets.java:2317 -#: build/trans_presets.java:2323 build/trans_presets.java:2331 -#: build/trans_presets.java:2337 build/trans_presets.java:2343 -#: build/trans_presets.java:2349 build/trans_presets.java:2355 -#: build/trans_presets.java:2365 build/trans_presets.java:2462 -#: build/trans_presets.java:2469 build/trans_presets.java:2483 -#: build/trans_presets.java:2489 build/trans_presets.java:2496 -#: build/trans_presets.java:2503 build/trans_presets.java:2509 -#: build/trans_presets.java:2515 build/trans_presets.java:2537 -#: build/trans_presets.java:2544 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2305 build/trans_presets.java:2310 +#: build/trans_presets.java:2316 build/trans_presets.java:2322 +#: build/trans_presets.java:2339 build/trans_presets.java:2345 +#: build/trans_presets.java:2351 build/trans_presets.java:2357 +#: build/trans_presets.java:2363 build/trans_presets.java:2373 +#: build/trans_presets.java:2380 build/trans_presets.java:2474 +#: build/trans_presets.java:2481 build/trans_presets.java:2495 +#: build/trans_presets.java:2501 build/trans_presets.java:2508 +#: build/trans_presets.java:2515 build/trans_presets.java:2521 +#: build/trans_presets.java:2527 build/trans_presets.java:2549 +#: build/trans_presets.java:2556 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2576 #: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2594 build/trans_presets.java:2601 -#: build/trans_presets.java:2608 build/trans_presets.java:2615 -#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2594 build/trans_presets.java:2600 +#: build/trans_presets.java:2606 build/trans_presets.java:2613 +#: build/trans_presets.java:2620 build/trans_presets.java:2627 #: build/trans_presets.java:2633 build/trans_presets.java:2639 -#: build/trans_presets.java:2645 build/trans_presets.java:2652 -#: build/trans_presets.java:2659 build/trans_presets.java:2666 -#: build/trans_presets.java:2672 build/trans_presets.java:2678 -#: build/trans_presets.java:2688 build/trans_presets.java:2697 -#: build/trans_presets.java:2712 build/trans_presets.java:2718 -#: build/trans_presets.java:2726 build/trans_presets.java:2733 -#: build/trans_presets.java:2753 build/trans_presets.java:2764 -#: build/trans_presets.java:2770 build/trans_presets.java:2776 +#: build/trans_presets.java:2645 build/trans_presets.java:2651 +#: build/trans_presets.java:2657 build/trans_presets.java:2664 +#: build/trans_presets.java:2671 build/trans_presets.java:2678 +#: build/trans_presets.java:2684 build/trans_presets.java:2690 +#: build/trans_presets.java:2700 build/trans_presets.java:2709 +#: build/trans_presets.java:2724 build/trans_presets.java:2730 +#: build/trans_presets.java:2738 build/trans_presets.java:2745 +#: build/trans_presets.java:2765 build/trans_presets.java:2776 #: build/trans_presets.java:2782 build/trans_presets.java:2788 -#: build/trans_presets.java:2795 build/trans_presets.java:2802 -#: build/trans_presets.java:2809 build/trans_presets.java:2815 -#: build/trans_presets.java:2821 build/trans_presets.java:2829 -#: build/trans_presets.java:2836 build/trans_presets.java:2843 -#: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2879 build/trans_presets.java:2885 +#: build/trans_presets.java:2794 build/trans_presets.java:2800 +#: build/trans_presets.java:2807 build/trans_presets.java:2814 +#: build/trans_presets.java:2821 build/trans_presets.java:2827 +#: build/trans_presets.java:2833 build/trans_presets.java:2841 +#: build/trans_presets.java:2848 build/trans_presets.java:2855 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2875 build/trans_presets.java:2882 #: build/trans_presets.java:2891 build/trans_presets.java:2897 -#: build/trans_presets.java:2903 build/trans_presets.java:2912 -#: build/trans_presets.java:2922 build/trans_presets.java:2931 -#: build/trans_presets.java:2937 build/trans_presets.java:2943 -#: build/trans_presets.java:2948 build/trans_presets.java:2954 -#: build/trans_presets.java:2960 build/trans_presets.java:2969 -#: build/trans_presets.java:2975 build/trans_presets.java:2981 +#: build/trans_presets.java:2903 build/trans_presets.java:2909 +#: build/trans_presets.java:2915 build/trans_presets.java:2924 +#: build/trans_presets.java:2934 build/trans_presets.java:2943 +#: build/trans_presets.java:2949 build/trans_presets.java:2955 +#: build/trans_presets.java:2960 build/trans_presets.java:2966 +#: build/trans_presets.java:2972 build/trans_presets.java:2981 #: build/trans_presets.java:2987 build/trans_presets.java:2993 #: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3012 build/trans_presets.java:3018 -#: build/trans_presets.java:3023 build/trans_presets.java:3030 -#: build/trans_presets.java:3037 build/trans_presets.java:3043 -#: build/trans_presets.java:3052 build/trans_presets.java:3060 -#: build/trans_presets.java:3066 build/trans_presets.java:3072 -#: build/trans_presets.java:3079 build/trans_presets.java:3085 -#: build/trans_presets.java:3092 build/trans_presets.java:3098 +#: build/trans_presets.java:3011 build/trans_presets.java:3017 +#: build/trans_presets.java:3024 build/trans_presets.java:3030 +#: build/trans_presets.java:3035 build/trans_presets.java:3042 +#: build/trans_presets.java:3049 build/trans_presets.java:3055 +#: build/trans_presets.java:3064 build/trans_presets.java:3072 +#: build/trans_presets.java:3078 build/trans_presets.java:3084 +#: build/trans_presets.java:3091 build/trans_presets.java:3097 #: build/trans_presets.java:3104 build/trans_presets.java:3110 -#: build/trans_presets.java:3116 build/trans_presets.java:3129 -#: build/trans_presets.java:3143 build/trans_presets.java:3157 +#: build/trans_presets.java:3116 build/trans_presets.java:3122 +#: build/trans_presets.java:3128 build/trans_presets.java:3141 +#: build/trans_presets.java:3155 build/trans_presets.java:3169 msgid "Name" msgstr "Název" @@ -6857,5 +6854,4 @@ msgstr "" -#. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 msgid "Close the selected open changesets" @@ -6883,25 +6879,25 @@ msgstr "Vyberte soubor" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "Yes" msgstr "Ano" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "No" msgstr "Ne" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47 #, java-format msgid "Layer ''{0}'' has modifications which should be uploaded to the server." msgstr "Vrstva ''{0}'' má změny, které by měly být nahrány na server." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49 #, java-format msgid "Layer ''{0}'' has no modifications to be uploaded." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60 #, java-format msgid "" @@ -6910,29 +6906,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62 #, java-format msgid "Layer ''{0}'' has no modifications to be saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80 msgid "No file associated with this layer" msgstr "Žádný soubor patřící k této vrstvě" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:83 msgid "Please select a file" msgstr "Prosím vyberte soubor" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:86 #, java-format msgid "Layer ''{0}'' is not backed by a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:101 #, java-format msgid "File ''{0}'' is not writable. Please enter another file name." msgstr "Do souboru ''{0}'' nelze zapisovat. Prosíme, vyberte jiný soubor." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:115 #, java-format msgid "Select to upload layer ''{0}'' to the server ''{1}''" @@ -7025,5 +7021,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -msgid "Save and Exit" +#, fuzzy +msgid "Save/Upload and Exit" msgstr "Uložit a ukončit" @@ -7035,5 +7032,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -msgid "Save and Delete" +#, fuzzy +msgid "Save/Upload and Delete" msgstr "Uložit a smazat" @@ -7052,5 +7050,5 @@ msgid "" "An upload and/or save operation of one layer with modifications
was " -"cancelled or has been failed." +"cancelled or has failed." msgstr "" @@ -7136,6 +7134,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:891 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:921 msgid "Tags of new changeset" msgstr "Tagy nové sady změn" @@ -7237,7 +7235,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:909 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:933 #, java-format msgid "Tags of changeset {0}" @@ -7245,48 +7242,48 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:949 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:963 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1011 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106 msgid "Preparing primitives to upload ..." msgstr "Připravuji objekty k nahrání na server ..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Obrázky pro {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "Číst GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Žádný čas pro bod {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Nelze přečíst čas \"{0}\" z bodu {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325 msgid "No images with readable timestamps found." msgstr "Nebyli nalezeny žádné obrázky s čitelnou časovou značkou." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format @@ -7294,29 +7291,29 @@ msgstr "Čtu {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:402 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246 msgid "Geotagged Images" msgstr "Obrázky s GPS souřadnicemi" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:587 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "GPS start: {0}" msgstr "Start GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 #, java-format msgid "GPS end: {0}" msgstr "Konec GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594 #, java-format msgid "current delta: {0}s" msgstr "nynější odchylka: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595 msgid "timezone difference: " msgstr "rozdíl časových pásem: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284 msgid "image" @@ -7326,14 +7323,14 @@ msgstr[2] "obrázky" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #, java-format msgid "{0} within the track." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680 msgid "Sync clock" msgstr "Synchronizovat hodiny" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7341,32 +7338,32 @@ msgstr "JPEG obrázky (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:734 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Data v souboru \"{0}\" nemohla být parsována." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "V souboru \"{0}\" není časová značka EXIF" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 msgid "Image" msgstr "Obrázek" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:752 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Zadejte datum ve tvaru (mm/dd/rrrr HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759 msgid "GPS unit timezone (difference to photo)" msgstr "časové pásmo GPS jednotky (rozdíl oproti forografii)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:767 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771 msgid "Synchronize Time with GPS Unit" msgstr "Synchronizace času s GPS přijímačem" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:790 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 msgid "Time entered could not be parsed." msgstr "Zadaný čas nemůže být rozparsován" @@ -7450,5 +7447,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 #, java-format msgid "Name: {0}" @@ -7471,5 +7468,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3160 +#: build/trans_presets.java:3172 msgid "Description" msgstr "Popis" @@ -7527,5 +7524,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:587 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 @@ -7590,42 +7587,67 @@ "byly vynechány." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:105 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:107 #, java-format msgid "Data Layer {0}" msgstr "Datová vrstva {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 msgid "outside downloaded area" msgstr "mimo stažený areál" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:252 #, java-format msgid "version {0}" msgstr "verze {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:289 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:290 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:389 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 +#, fuzzy, java-format +msgid "There was {0} conflict detected." +msgid_plural "There were {0} conflicts detected." +msgstr[0] "Došlo k {0} konfliktům během importu." +msgstr[1] "Došlo k {0} konfliktům během importu." +msgstr[2] "Došlo k {0} konfliktům během importu." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 +#, java-format +msgid "" +"{0} object has been purged from the local dataset because it is deleted on " +"the server." +msgid_plural "" +"{0} objects have been purged from the local dataset because they are deleted " +"on the server." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 +#, fuzzy +msgid "Conflicts detected" +msgstr "Detekován konflikt" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 #, java-format msgid "{0} consists of:" msgstr "{0} se skládá z:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:476 #, java-format msgid " ({0} deleted.)" msgstr " ({0} smazáno.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 msgid "unset" msgstr "nenastaveno" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 #, java-format msgid "API version: {0}" msgstr "Verze API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:501 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:584 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" @@ -7978,5 +8000,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:412 #: ../plugins/terracer/src/terracer/TerracerAction.java:430 @@ -8712,8 +8734,8 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 msgid "Delete the selection in the tag table" -msgstr "" +msgstr "Smazat vybrané prvky v seznamu tagů" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261 msgid "More information about this feature" msgstr "Více informací o tomto přednastavení" @@ -8762,5 +8784,5 @@ msgstr "Objekty typu {0} nejsou podporovány." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:700 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -8771,18 +8793,18 @@ msgstr[2] "Změnit {0} objektů" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Nic není zvoleno!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 msgid "Selection unsuitable!" msgstr "Vybrány nevhodné objekty!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 msgid "Apply Preset" msgstr "Aplikovat přednastavení" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788 msgid "Change Properties" msgstr "Změnit vlastnosti" @@ -9074,44 +9096,44 @@ msgstr "Zavírám sadu změn..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "Není k dizpozici sada změn pro rozdílový upload" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 msgid "Preparing..." msgstr "Připravuji..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 msgid "Uploading..." msgstr "Nahrávám..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 msgid "Waiting 10 seconds ... " msgstr "Čekám 10 sekund ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Zkusím nový pokus, {0} z {1}, během {2} sekund ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 msgid "OK - trying again." msgstr "OK - další pokus." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 #, java-format msgid "Starting retry {0} of {1}." msgstr "Zahajuji pokus {0} z {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9351,5 +9373,5 @@ msgid "" "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}''," -"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." +"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." msgstr "" @@ -9469,6 +9491,6 @@ #, java-format msgid "" -"Relation with external id ''{0}'' refers to missing primitive with external " -"id ''{1}''." +"Relation with external id ''{0}'' refers to a missing primitive with " +"external id ''{1}''." msgstr "" @@ -9565,32 +9587,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:73 msgid "Starting to upload with one request per primitive ..." msgstr "Začínám nahrávat s jedním požadavkem na objekt ..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})" msgstr "{0}% ({1}/{2}), {3} zbývát. Nahrávám uzel ''{4}'' (id: {5})" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" msgstr "{0}% ({1}/{2}), {3} zbývát. Nahrávám cestu ''{4}'' (id: {5})" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" msgstr "{0}% ({1}/{2}), {3} zbývát. Nahrávám relaci ''{4}'' (id: {5})" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Starting to upload in one request ..." msgstr "Začínám nahrávat vše v jednom požadavku ..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 +#, fuzzy, java-format +msgid "Parameter ''{0}'' must not be null" +msgstr "parametr ''{0}'' nesmí být null" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 msgid "Uploading data ..." msgstr "Nahrávám data na serevr ..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 msgid "" "WARNING: no API version defined for data to upload. Falling back to version " @@ -9598,5 +9625,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:153 #, java-format msgid "" @@ -9822,5 +9849,5 @@ #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:202 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:324 build/trans_presets.java:325 @@ -9842,6 +9869,6 @@ #: build/trans_presets.java:789 build/trans_presets.java:1333 #: build/trans_presets.java:1400 build/trans_presets.java:1401 -#: build/trans_presets.java:1402 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 +#: build/trans_presets.java:1402 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 msgid "unknown" msgstr "neznámý" @@ -9992,5 +10019,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:192 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:182 +#, java-format +msgid "" +"The OSM server ''{0}'' doesn't know about an object
you tried to read, " +"update, or delete. Either the respective object
doesn''t exist on the " +"server or you''re using an invalid URL to access
it. Please carefully " +"check the servers address ''{1}'' for typos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:209 #, java-format msgid "" @@ -10003,5 +10039,5 @@ "vaše internetové připojení." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:262 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:279 #, java-format msgid "" @@ -10262,17 +10298,15 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35 msgid "Define Address Interpolation" msgstr "" -#. Whether to re-trigger data changed for relation #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "Liché" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:413 #: ../plugins/terracer/src/terracer/TerracerAction.java:437 @@ -10280,99 +10314,99 @@ msgstr "Sudé" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 msgid "Alphabetic" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161 #, java-format msgid "Relation: {0}" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173 msgid "Associate with street using:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184 msgid "Numbering Scheme:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 msgid "Starting #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188 msgid "Ending #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 #, java-format msgid "Will associate {0} additional house number nodes" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 msgid "Starting address number must be less than ending address number" msgstr "" @@ -11125,4 +11159,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52 +#: build/trans_presets.java:2331 msgid "Location" msgstr "Umístění" @@ -11675,4 +11710,5 @@ msgstr "jihovýchod" +#. item "Man Made/Pipeline" combo "Type" #. color highway_track #. @@ -11718,7 +11754,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:990 build/trans_style.java:1007 -#: build/trans_style.java:1023 build/trans_style.java:3400 -#: build/trans_style.java:3408 +#: build/trans_presets.java:2330 build/trans_style.java:990 +#: build/trans_style.java:1007 build/trans_style.java:1023 +#: build/trans_style.java:3400 build/trans_style.java:3408 msgid "water" msgstr "voda" @@ -14349,9 +14385,11 @@ #. item "Public Transport/Airport" text "Name" #. +#. item "Man Made/Power Station" text "Operator" #. item "Relations/Route" text "Name" #: build/trans_presets.java:65 build/trans_presets.java:101 #: build/trans_presets.java:121 build/trans_presets.java:141 #: build/trans_presets.java:178 build/trans_presets.java:198 -#: build/trans_presets.java:1560 build/trans_presets.java:3158 +#: build/trans_presets.java:1560 build/trans_presets.java:2382 +#: build/trans_presets.java:3170 msgid "Reference" msgstr "Číslo" @@ -14913,5 +14951,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 msgid "metal" msgstr "kov" @@ -14931,5 +14969,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 #: build/trans_style.java:3375 msgid "wood" @@ -15218,7 +15256,7 @@ #: build/trans_presets.java:1401 build/trans_presets.java:1402 #: build/trans_presets.java:1767 build/trans_presets.java:1777 -#: build/trans_presets.java:2408 build/trans_presets.java:2444 -#: build/trans_presets.java:2453 build/trans_presets.java:2454 -#: build/trans_presets.java:2455 build/trans_presets.java:2725 +#: build/trans_presets.java:2420 build/trans_presets.java:2456 +#: build/trans_presets.java:2465 build/trans_presets.java:2466 +#: build/trans_presets.java:2467 build/trans_presets.java:2737 msgid "yes" msgstr "ano" @@ -15367,8 +15405,8 @@ #: build/trans_presets.java:1400 build/trans_presets.java:1401 #: build/trans_presets.java:1402 build/trans_presets.java:1767 -#: build/trans_presets.java:1777 build/trans_presets.java:2408 -#: build/trans_presets.java:2444 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 -#: build/trans_presets.java:2725 +#: build/trans_presets.java:1777 build/trans_presets.java:2420 +#: build/trans_presets.java:2456 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 +#: build/trans_presets.java:2737 msgid "no" msgstr "ne" @@ -15506,6 +15544,8 @@ #. item "Water/Wetland" text "Name" #. item "Car/Parking" text "Reference number" +#. item "Man Made/Pipeline" text "Operator" #. item "Man Made/Power Generator" label "Edit Power Generator" #. +#. item "Man Made/Power Tower" label "Edit Power Tower" #. item "Land use/Tree" text "Name" #. item "Land use/Wood" text "Name" @@ -15513,7 +15553,8 @@ #: build/trans_presets.java:350 build/trans_presets.java:649 #: build/trans_presets.java:789 build/trans_presets.java:1137 -#: build/trans_presets.java:1395 build/trans_presets.java:2364 -#: build/trans_presets.java:2913 build/trans_presets.java:2923 -#: build/trans_presets.java:2932 +#: build/trans_presets.java:1395 build/trans_presets.java:2330 +#: build/trans_presets.java:2372 build/trans_presets.java:2398 +#: build/trans_presets.java:2925 build/trans_presets.java:2935 +#: build/trans_presets.java:2944 msgid "Type" msgstr "Typ" @@ -16063,10 +16104,10 @@ #. item "Tourism/Information Terminal" text "Closer description" #. item "Tourism/Audioguide" text "Closer description" -#. item "Man Made/Power Station" label "Edit Power Station" -#. +#. item "Man Made/Tower" text "Height (meters)" +#. item "Man Made/Pipeline" label "Edit Pipeline" +#. +#. item "Man Made/Power Station" text "Name" #. item "Man Made/Power Sub Station" label "Edit Power Sub Station" #. -#. item "Man Made/Power Line" label "Edit Power Line" -#. #. item #. #: build/trans_presets.java:1535 build/trans_presets.java:1789 -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2465 msgid "Shelter" msgstr "Přístřešek" @@ -18424,5 +18467,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1877 build/trans_presets.java:2669 +#: build/trans_presets.java:1877 build/trans_presets.java:2681 msgid "Sports" msgstr "Sportovní potřeby" @@ -19775,6 +19818,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "Religion" msgstr "Náboženství" @@ -19783,66 +19826,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "bahai" msgstr "bahá'í" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "buddhist" msgstr "budhistické" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "christian" msgstr "křesťanské" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "hindu" msgstr "hindské" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jain" msgstr "džinistické" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jewish" msgstr "židovské" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "muslim" msgstr "muslimské" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "sikh" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "spiritualist" msgstr "spiritualistické" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "taoist" msgstr "taoistické" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "unitarian" msgstr "Unitářské" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "zoroastrian" msgstr "zoroastristické" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "Denomination" msgstr "Vyznání" @@ -19851,76 +19894,76 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "anglican" msgstr "anglikánské" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "baptist" msgstr "baptistické" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "catholic" msgstr "katolické" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "evangelical" msgstr "evangelické" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "jehovahs_witness" msgstr "svědkové Jehovovi" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "lutheran" msgstr "luteránské" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "methodist" msgstr "metodistické" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "mormon" msgstr "mormonské" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "orthodox" msgstr "pravoslavné" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "pentecostal" msgstr "pentekostalistické" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "presbyterian" msgstr "presbyteriánské" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "protestant" msgstr "protestantské" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "quaker" msgstr "kvakerské" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "shia" msgstr "ší'itské" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "sunni" msgstr "sunnitské" @@ -20016,25 +20059,49 @@ #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2296 +#, fuzzy +msgid "Tower type" +msgstr "Typ trasy" + +#. item "Man Made/Tower" combo "Tower type" +#: build/trans_presets.java:2296 +#, fuzzy +msgid "communication" +msgstr "spojení" + +#: build/trans_presets.java:2296 +#, fuzzy +msgid "observation" +msgstr "Nadmořská výška" + +#. +#: build/trans_presets.java:2298 +#, fuzzy +msgid "Height (meters)" +msgstr "Max. výška (metrů)" + +#. item "Man Made/Tower" text "Operator" +#. +#: build/trans_presets.java:2302 msgid "Water Tower" msgstr "Vodojem" #. item -#: build/trans_presets.java:2298 +#: build/trans_presets.java:2303 msgid "Edit Water Tower" msgstr "Upravit vodojem" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2307 msgid "Gasometer" msgstr "Plynojem" #. item -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2308 msgid "Edit Gasometer" msgstr "Upravit plynojem" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2307 +#: build/trans_presets.java:2312 msgid "Lighthouse" msgstr "Maják" @@ -20042,10 +20109,10 @@ #. item #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2314 msgid "Edit Lighthouse" msgstr "Upravit maják" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2318 msgid "Windmill" msgstr "Větrný mlýn" @@ -20053,21 +20120,55 @@ #. item #. -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2320 msgid "Edit Windmill" msgstr "Upravit větrný mlýn" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2319 +#: build/trans_presets.java:2324 msgid "Pipeline" msgstr "Potrubí" #. item -#. -#: build/trans_presets.java:2321 +#. +#: build/trans_presets.java:2327 msgid "Edit Pipeline" msgstr "Upravit potrubí" -#. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2330 +#, fuzzy +msgid "oil" +msgstr "fosilní paliva" + +#: build/trans_presets.java:2330 build/trans_presets.java:2372 +msgid "gas" +msgstr "plynová" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "sewage" +msgstr "použití" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "heat" +msgstr "vřesoviště" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "any substance" +msgstr "A Podle vzdálenosti" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "underwater" +msgstr "voda" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "overground" +msgstr "podzemní" + +#: build/trans_presets.java:2333 msgid "Wastewater Plant" msgstr "Čistička odpadních vod" @@ -20077,10 +20178,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:2329 +#: build/trans_presets.java:2337 msgid "Edit Wastewater Plant" msgstr "Upravit čističku odpadních vod" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2333 +#: build/trans_presets.java:2341 msgid "Crane" msgstr "Jeřáb" @@ -20088,10 +20189,10 @@ #. item #. -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2343 msgid "Edit Crane" msgstr "Upravit jeřáb" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2347 msgid "Beacon" msgstr "Vodní bój" @@ -20099,10 +20200,10 @@ #. item #. -#: build/trans_presets.java:2341 +#: build/trans_presets.java:2349 msgid "Edit Beacon" msgstr "Editovat vodní bój" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2353 msgid "Survey Point" msgstr "Triangulační bod" @@ -20110,10 +20211,10 @@ #. item #. -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2355 msgid "Edit Survey Point" msgstr "Upravit triangulační bod" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2359 msgid "Surveillance" msgstr "Sledovací kamera" @@ -20121,5 +20222,5 @@ #. item #. -#: build/trans_presets.java:2353 +#: build/trans_presets.java:2361 msgid "Edit Surveillance Camera" msgstr "Upravit sledovací kameru" @@ -20127,5 +20228,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2366 msgid "Power Generator" msgstr "Elektrárna" @@ -20135,39 +20236,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:2362 +#: build/trans_presets.java:2370 msgid "Edit Power Generator" msgstr "Upravit elektrárnu" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "wind" msgstr "větrná" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "hydro" msgstr "vodní" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "fossil" msgstr "fosilní paliva" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "nuclear" msgstr "jaderná" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "coal" msgstr "uhelná" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "photovoltaic" msgstr "sluneční" -#: build/trans_presets.java:2364 -msgid "gas" -msgstr "plynová" - #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2375 msgid "Power Station" msgstr "Rozvodna" @@ -20176,10 +20273,10 @@ #. -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2378 msgid "Edit Power Station" msgstr "Upravit rozvodnu" -#. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2374 +#. item "Man Made/Power Station" text "Reference" +#: build/trans_presets.java:2384 msgid "Power Sub Station" msgstr "Trafostanice" @@ -20188,5 +20285,5 @@ #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2387 msgid "Edit Power Sub Station" msgstr "Upravit trafostanici" @@ -20194,10 +20291,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2380 build/trans_presets.java:2396 +#: build/trans_presets.java:2390 build/trans_presets.java:2407 msgid "Line reference" msgstr "Číslo vedení" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2382 +#: build/trans_presets.java:2392 msgid "Power Tower" msgstr "Stožár elektrického vedení" @@ -20208,11 +20305,26 @@ #. 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:2387 +#: build/trans_presets.java:2397 msgid "Edit Power Tower" msgstr "Upravit stožár elektrického vedení" -#. item "Man Made/Power Tower" label "Edit Power Tower" -#. -#: build/trans_presets.java:2390 +#. item "Man Made/Power Tower" combo "Type" +#: build/trans_presets.java:2398 +#, fuzzy +msgid "tower" +msgstr "Věž" + +#: build/trans_presets.java:2398 +#, fuzzy +msgid "pole" +msgstr "Role" + +#: build/trans_presets.java:2399 +#, fuzzy +msgid "Tower reference" +msgstr "Číslo vedení" + +#. item "Man Made/Power Tower" text "Tower reference" +#: build/trans_presets.java:2401 msgid "Power Line" msgstr "Dráty elektrického vedení" @@ -20221,40 +20333,83 @@ #. -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2404 msgid "Edit Power Line" msgstr "Upravit dráty elektrického vedení" +#. item "Man Made/Power Line" label "Edit Power Line" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "Line type" +msgstr "Typ sjezdovky" + +#. item "Man Made/Power Line" combo "Line type" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "line" +msgstr "Stoupání" + +#: build/trans_presets.java:2405 +#, fuzzy +msgid "minor_line" +msgstr "Dálnice - nájezd" + #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2408 msgid "Voltage" msgstr "Napětí" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2398 -msgid "Amount of Wires" +#: build/trans_presets.java:2409 +#, fuzzy +msgid "Amount of Cables" msgstr "Počet drátů tvořících vodič" -#. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2401 +#. item "Man Made/Power Line" text "Amount of Cables" +#: build/trans_presets.java:2410 +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:2410 +#, fuzzy +msgid "single" +msgstr "Úhel" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "double" +msgstr "Hry s koulemi (např. pétanque)" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "triple" +msgstr "Schůdky přes ohrazení" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "quad" +msgstr "kvakerské" + +#: build/trans_presets.java:2413 msgid "Amenities" msgstr "Občanská vybavenost" #. group "Amenities" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2414 msgid "Toilets" msgstr "Záchody" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2409 build/trans_presets.java:2525 +#: build/trans_presets.java:2421 build/trans_presets.java:2537 msgid "Note" msgstr "Poznámka" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2411 +#: build/trans_presets.java:2423 msgid "Post Box" msgstr "Poštovní schránka" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2428 msgid "Telephone" msgstr "Telefon" @@ -20263,5 +20418,5 @@ #. -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2431 msgid "Edit Telephone" msgstr "Upravit telefon" @@ -20269,5 +20424,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2422 build/trans_presets.java:2526 +#: build/trans_presets.java:2434 build/trans_presets.java:2538 msgid "Coins" msgstr "Mince" @@ -20275,5 +20430,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2423 build/trans_presets.java:2527 +#: build/trans_presets.java:2435 build/trans_presets.java:2539 msgid "Notes" msgstr "Bankovky" @@ -20281,5 +20436,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2424 build/trans_presets.java:2528 +#: build/trans_presets.java:2436 build/trans_presets.java:2540 msgid "Electronic purses and Charge cards" msgstr "Elektronické peněženky nebo kreditní karty." @@ -20287,5 +20442,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2425 build/trans_presets.java:2529 +#: build/trans_presets.java:2437 build/trans_presets.java:2541 msgid "Debit cards" msgstr "Debetní karty" @@ -20293,15 +20448,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2426 build/trans_presets.java:2530 +#: build/trans_presets.java:2438 build/trans_presets.java:2542 msgid "Credit cards" msgstr "Kreditní karty" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2439 msgid "Telephone cards" msgstr "Telefonní karty" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2429 +#: build/trans_presets.java:2441 msgid "Recycling" msgstr "Recyklační stanoviště" @@ -20310,5 +20465,5 @@ #. -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2444 msgid "Edit Recycling station" msgstr "Upravit recyklační stanoviště" @@ -20316,35 +20471,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2446 msgid "Batteries" msgstr "Baterie" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2435 +#: build/trans_presets.java:2447 msgid "Cans" msgstr "Plechovky" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2448 msgid "Clothes" msgstr "Oblečení" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2437 +#: build/trans_presets.java:2449 msgid "Glass" msgstr "Sklo" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2450 msgid "Paper" msgstr "Papír" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2451 msgid "Scrap Metal" msgstr "Kovový šrot" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2453 msgid "Bench" msgstr "Lavička" @@ -20353,31 +20508,31 @@ #. #. -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2456 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "Material" msgstr "Materiál" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "stone" msgstr "kámen" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "plastic" msgstr "plast" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "Colour" msgstr "Barva" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "black" msgstr "černá" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "brown" msgstr "hnědá" @@ -20448,5 +20603,5 @@ #. #. -#: build/trans_presets.java:2446 build/trans_style.java:3063 +#: build/trans_presets.java:2458 build/trans_style.java:3063 #: build/trans_style.java:3071 build/trans_style.java:3079 #: build/trans_style.java:3087 build/trans_style.java:3135 @@ -20456,27 +20611,27 @@ msgstr "zeleň" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "red" msgstr "červená" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "blue" msgstr "modrá" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "white" msgstr "bílá" -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2459 msgid "Amount of Seats" msgstr "Počet sedadel" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2461 msgid "Hunting Stand" msgstr "Posed" #. item -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2462 msgid "Edit Hunting Stand" msgstr "Upravit posed" @@ -20485,30 +20640,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2452 build/trans_presets.java:2914 +#: build/trans_presets.java:2464 build/trans_presets.java:2926 msgid "Height" msgstr "Výška" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "low" msgstr "nízká" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "half" msgstr "střední" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "full" msgstr "plná" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2466 msgid "Hide" msgstr "Úkryt" -#: build/trans_presets.java:2455 +#: build/trans_presets.java:2467 msgid "Lock" msgstr "Uzamknutelný" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2469 msgid "Fountain" msgstr "Fontána" @@ -20517,10 +20672,10 @@ #. -#: build/trans_presets.java:2460 +#: build/trans_presets.java:2472 msgid "Edit Fountain" msgstr "Upravit fontánu" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2476 msgid "Drinking Water" msgstr "Pitná voda" @@ -20529,10 +20684,10 @@ #. -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2479 msgid "Edit Drinking Water" msgstr "Upravit pitnou vodu" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2471 +#: build/trans_presets.java:2483 msgid "Baby Hatch" msgstr "Babybox" @@ -20540,33 +20695,33 @@ #. item #. -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2485 msgid "Edit Baby Hatch" msgstr "Upravit babybox" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2491 msgid "Shops" msgstr "Obchody" #. group "Shops" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2492 msgid "Supermarket" msgstr "Supermarket" #. item -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2493 msgid "Edit Supermarket" msgstr "Upravit supermarket" -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2498 msgid "Chemist" msgstr "Drogerie" #. item -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2499 msgid "Edit Chemist" msgstr "Upravit drogerii" -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2504 msgid "Convenience Store" msgstr "Samoobsluha, smíšenka, večerka" @@ -20574,9 +20729,9 @@ #. item #. -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2506 msgid "Edit Convenience Store" msgstr "Upravit večerku" -#: build/trans_presets.java:2499 +#: build/trans_presets.java:2511 msgid "Kiosk" msgstr "Kiosek" @@ -20584,27 +20739,27 @@ #. item #. -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2513 msgid "Edit Kiosk" msgstr "Upravit kiosek" -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2518 msgid "Book Store" msgstr "Knihkupectví" #. item -#: build/trans_presets.java:2507 +#: build/trans_presets.java:2519 msgid "Edit Book Store" msgstr "Upravit knihkupectví" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2524 msgid "Travel Agency" msgstr "Cestovní kancelář" #. item -#: build/trans_presets.java:2513 +#: build/trans_presets.java:2525 msgid "Edit Travel Agency" msgstr "Upravit cestovní kancelář" -#: build/trans_presets.java:2518 +#: build/trans_presets.java:2530 msgid "Vending machine" msgstr "Prodejní automat" @@ -20612,5 +20767,5 @@ #. item #. -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2532 msgid "Edit Vending machine" msgstr "Upravit prodejní automat" @@ -20618,88 +20773,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "Vending products" msgstr "Prodávané produkty" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_tickets" msgstr "lístky na městskou hromadnou dopravu" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_plans" msgstr "plány městské hromadné dopravy" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "parking_tickets" msgstr "parkovací lístky" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "food" msgstr "jídlo" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "drinks" msgstr "pití" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "sweets" msgstr "sladkosti" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "cigarettes" msgstr "cigarety" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "photos" msgstr "fotografie" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "animal_food" msgstr "krmivo pro zvířata" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "news_papers" msgstr "noviny" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "toys" msgstr "hračky" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "stamps" msgstr "známky" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "SIM-cards" msgstr "SIM-karty" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "telephone_vouchers" msgstr "telefonní karty" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "vouchers" msgstr "poukazy" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "condoms" msgstr "kondomy" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "tampons" msgstr "tampóny" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "excrement_bags" msgstr "sáčky na výkaly" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2543 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:2533 +#: build/trans_presets.java:2545 msgid "Butcher" msgstr "Řeznictví" @@ -20707,9 +20862,9 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2547 msgid "Edit Butcher" msgstr "Upravit řeznictví" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2552 msgid "Baker" msgstr "Pekařství" @@ -20717,9 +20872,9 @@ #. item #. -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2554 msgid "Edit Baker" msgstr "Upravit pekařství" -#: build/trans_presets.java:2547 +#: build/trans_presets.java:2559 msgid "Florist" msgstr "Květinářství" @@ -20727,18 +20882,18 @@ #. item #. -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2561 msgid "Edit Florist" msgstr "Upravit květinářství" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2566 msgid "Organic" msgstr "Obchod se zdravou výživou" #. item -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2567 msgid "Edit Organic Shop" msgstr "Upravit obchod se zdravou výživou" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2572 msgid "Alcohol" msgstr "Alkohol" @@ -20746,54 +20901,54 @@ #. item #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2574 msgid "Edit Alcohol Shop" msgstr "Upravit obchod s alkoholem" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2579 msgid "Beverages" msgstr "Nápoje" #. item -#: build/trans_presets.java:2568 +#: build/trans_presets.java:2580 msgid "Edit Beverages Shop" msgstr "Upravit obchod s nápoji" -#: build/trans_presets.java:2573 +#: build/trans_presets.java:2585 msgid "Computer" msgstr "Počítače" #. item -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2586 msgid "Edit Computer Shop" msgstr "Upravit obchod s počítači" -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2591 msgid "Electronics" msgstr "Elektronika" #. item -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2592 msgid "Edit Electronics Shop" msgstr "Upravit obchod s elektronikou" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2597 msgid "Hifi" msgstr "Hifi" #. item -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2598 msgid "Edit Hifi Shop" msgstr "Upravit obchod s hifi" -#: build/trans_presets.java:2591 +#: build/trans_presets.java:2603 msgid "Furniture" msgstr "Nábytek" #. item -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2604 msgid "Edit Furniture Shop" msgstr "Upravit obchod s nábytkem" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2609 msgid "Garden Centre" msgstr "Zahradnické centrum" @@ -20801,9 +20956,9 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2611 msgid "Edit Garden Centre" msgstr "Upravit zahradnické centrum" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2616 msgid "Hardware" msgstr "Železářství" @@ -20811,9 +20966,9 @@ #. item #. -#: build/trans_presets.java:2606 +#: build/trans_presets.java:2618 msgid "Edit Hardware Store" msgstr "Upravit železářství" -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2623 msgid "Do-it-yourself-store" msgstr "Zboží pro kutily" @@ -20821,54 +20976,54 @@ #. item #. -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2625 msgid "Edit Do-it-yourself-store" msgstr "Upravit obchod se zbožím pro kutily" -#: build/trans_presets.java:2618 +#: build/trans_presets.java:2630 msgid "Stationery" msgstr "Papírnictví" #. item -#: build/trans_presets.java:2619 +#: build/trans_presets.java:2631 msgid "Edit Stationery Shop" msgstr "Upravit papírnictví" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2636 msgid "Hairdresser" msgstr "Kadeřnictví" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2637 msgid "Edit Hairdresser" msgstr "Upravit Kadeřnictví" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2642 msgid "Shoes" msgstr "Obuv" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2643 msgid "Edit Shoe Shop" msgstr "Upravit obchod s obuví" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2648 msgid "Toys" msgstr "Hračky" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2649 msgid "Edit Toy Shop" msgstr "Upravit obchod s hračkami" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2654 msgid "Video" msgstr "Videopůjčovna/prodejna" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2655 msgid "Edit Video Shop" msgstr "Upravit videopůjčovnu/prodejnu" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2660 msgid "Dry Cleaning" msgstr "Čistírna" @@ -20876,9 +21031,9 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2662 msgid "Edit Dry Cleaning" msgstr "Upravit čistírnu" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2667 msgid "Laundry" msgstr "Prádelna" @@ -20886,9 +21041,9 @@ #. item #. -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2669 msgid "Edit Laundry" msgstr "Upravit prádelnu" -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2674 msgid "Outdoor" msgstr "Vybavení do přírody" @@ -20896,28 +21051,28 @@ #. item #. -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2676 msgid "Edit Outdoor Shop" msgstr "Obchod s vybavením do přírody" #. item -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2682 msgid "Edit Sports Shop" msgstr "Upravit obchod se sportovními pořebami" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2687 msgid "Optician" msgstr "Oční optik" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2688 msgid "Edit Optician" msgstr "Upravit oční optiku" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2695 msgid "Cash" msgstr "Finance" #. group "Cash" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2696 msgid "Bank" msgstr "Banka" @@ -20925,14 +21080,14 @@ #. item #. -#: build/trans_presets.java:2686 +#: build/trans_presets.java:2698 msgid "Edit Bank" msgstr "Upravit banku" -#: build/trans_presets.java:2691 build/trans_presets.java:2700 +#: build/trans_presets.java:2703 build/trans_presets.java:2712 msgid "Automated Teller Machine" msgstr "Bankomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2705 msgid "Money Exchange" msgstr "Směnárna" @@ -20940,5 +21095,5 @@ #. item #. -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2707 msgid "Edit Money Exchange" msgstr "Upravit směnárnu" @@ -20946,15 +21101,15 @@ #. item #. -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2714 msgid "Edit Automated Teller Machine" msgstr "Upravit bankomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2719 msgid "Health" msgstr "Zdraví" #. group "Health" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2720 msgid "Doctors" msgstr "Středisko" @@ -20962,18 +21117,18 @@ #. item #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2722 msgid "Edit Doctors" msgstr "Upravit středisko" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2727 msgid "Dentist" msgstr "Zubař" #. item -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2728 msgid "Edit Dentist" msgstr "Upravit zubařskou ordinaci" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2733 msgid "Pharmacy" msgstr "Lékárna" @@ -20981,5 +21136,5 @@ #. item #. -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2735 msgid "Edit Pharmacy" msgstr "Upravit lékárnu" @@ -20987,9 +21142,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2737 msgid "Dispensing" msgstr "Vydává léky na předpis" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2741 msgid "Hospital" msgstr "Nemocnice" @@ -20997,10 +21152,10 @@ #. item #. -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2743 msgid "Edit Hospital" msgstr "Upravit nemocnici" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2747 msgid "Emergency Access Point" msgstr "Místo pro kontaktování záchranářů" @@ -21009,5 +21164,5 @@ #. -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2750 msgid "Edit Emergency Access Point" msgstr "Upravit místo pro kontaktování záchranářů" @@ -21016,20 +21171,20 @@ #. #. -#: build/trans_presets.java:2741 +#: build/trans_presets.java:2753 msgid "Point Number" msgstr "Číslo místa" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2742 +#: build/trans_presets.java:2754 msgid "Point Name" msgstr "Jméno místa" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2756 msgid "Phone Number" msgstr "Telefonní číslo" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2757 msgid "(Use international code, like +12-345-67890)" msgstr "(Použijte mezinárodní zápis, např. +420123456789)" @@ -21037,5 +21192,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2760 msgid "Veterinary" msgstr "Veterinář" @@ -21044,59 +21199,59 @@ #. -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2763 msgid "Edit Veterinary" msgstr "Upravit veterinární ordinaci" -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2770 msgid "Geography" msgstr "" #. group "Places" -#: build/trans_presets.java:2760 +#: build/trans_presets.java:2772 msgid "Continent" msgstr "Kontinent" #. item -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2773 msgid "Edit Continent" msgstr "Upravit kontinent" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2766 +#: build/trans_presets.java:2778 msgid "Country" msgstr "Stát" #. item -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2779 msgid "Edit Country" msgstr "Upravit stát" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2784 msgid "State" msgstr "Země" #. item -#: build/trans_presets.java:2773 +#: build/trans_presets.java:2785 msgid "Edit State" msgstr "Upravit zemi" #. item "Places/State" text "Name" -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2790 msgid "Region" msgstr "Kraj" #. item -#: build/trans_presets.java:2779 +#: build/trans_presets.java:2791 msgid "Edit Region" msgstr "Upravit kraj" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2796 msgid "County" msgstr "Okres" #. item -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2797 msgid "Edit County" msgstr "Upravit okres" @@ -21104,15 +21259,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2803 msgid "City" msgstr "Velkoměsto" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2804 msgid "Edit City" msgstr "Upravit velkoměsto" #. item "Places/City" text "Name" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2809 msgid "Town" msgstr "Město" @@ -21120,10 +21275,10 @@ #. item #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2811 msgid "Edit Town" msgstr "Upravit město" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2804 +#: build/trans_presets.java:2816 msgid "Suburb" msgstr "Městský obvod, nebo městská část" @@ -21131,25 +21286,25 @@ #. item #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2818 msgid "Edit Suburb" msgstr "Upravit městský obvod, nebo městská část" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2823 msgid "Village" msgstr "Obec" #. item -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2824 msgid "Edit Village" msgstr "Upravit obci" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2817 +#: build/trans_presets.java:2829 msgid "Hamlet" msgstr "Samota" #. item -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2830 msgid "Edit Hamlet" msgstr "Upravit samotu" @@ -21157,5 +21312,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2824 +#: build/trans_presets.java:2836 msgid "Locality" msgstr "Místní název" @@ -21163,10 +21318,10 @@ #. item #. -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2838 msgid "Edit Locality" msgstr "Editovat místní název" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2843 msgid "Island" msgstr "Ostrov" @@ -21174,10 +21329,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2845 msgid "Edit Island" msgstr "Upravit ostrov" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2838 +#: build/trans_presets.java:2850 msgid "Islet" msgstr "" @@ -21185,5 +21340,5 @@ #. item #. -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2852 msgid "Edit Islet" msgstr "" @@ -21191,5 +21346,5 @@ #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2858 msgid "Cave Entrance" msgstr "Vstup do jeskyně" @@ -21197,10 +21352,10 @@ #. item #. -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2860 msgid "Edit Cave Entrance" msgstr "Upravit vstup do jeskyně" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2864 msgid "Peak" msgstr "Vrchol" @@ -21208,10 +21363,10 @@ #. item #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2866 msgid "Edit Peak" msgstr "Upravit vrchol" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2871 msgid "Glacier" msgstr "Ledovec" @@ -21219,10 +21374,10 @@ #. item #. -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2873 msgid "Edit Glacier" msgstr "Upravit ledovec" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2878 msgid "Volcano" msgstr "Sopka" @@ -21230,70 +21385,70 @@ #. item #. -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2880 msgid "Edit Volcano" msgstr "Upravit sopku" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2886 msgid "Boundaries" msgstr "Hranice" #. group "Boundaries" -#: build/trans_presets.java:2875 +#: build/trans_presets.java:2887 msgid "National" msgstr "Národní" #. item -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2888 msgid "Edit National Boundary" msgstr "Upravit národní hranici" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2881 +#: build/trans_presets.java:2893 msgid "Administrative" msgstr "Administrativní" #. item -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2894 msgid "Edit Administrative Boundary" msgstr "Upravit administrativní hranici" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2887 +#: build/trans_presets.java:2899 msgid "Civil" msgstr "" #. item -#: build/trans_presets.java:2888 +#: build/trans_presets.java:2900 msgid "Edit Civil Boundary" msgstr "" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2893 +#: build/trans_presets.java:2905 msgid "Political" msgstr "Volební obvod" #. item -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2906 msgid "Edit Political Boundary" msgstr "Upravit volební obvod" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2911 msgid "National park" msgstr "Národní park" #. item -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2912 msgid "Edit National Park Boundary" msgstr "Upravit hranice národního parku" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2918 msgid "Land use" msgstr "Využití krajiny" #. group "Land use" -#: build/trans_presets.java:2907 +#: build/trans_presets.java:2919 msgid "Tree" msgstr "Strom" @@ -21302,15 +21457,15 @@ #. -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2922 msgid "Edit Tree" msgstr "Upravit strom" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2915 +#: build/trans_presets.java:2927 msgid "Botanical Name" msgstr "Botanické jméno" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2929 msgid "Wood" msgstr "Prales" @@ -21319,5 +21474,5 @@ #. -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2932 msgid "Edit Wood" msgstr "Editovat Prales" @@ -21325,17 +21480,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "coniferous" msgstr "jehličnatý" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "deciduous" msgstr "listnatý" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "mixed" msgstr "smíšený" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2937 msgid "Forest" msgstr "Les" @@ -21344,14 +21499,14 @@ #. -#: build/trans_presets.java:2928 +#: build/trans_presets.java:2940 msgid "Edit Forest Landuse" msgstr "Upravit lesní plochu" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2946 msgid "Nature Reserve" msgstr "Přírodní rezervace" #. item -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2947 msgid "Edit Nature Reserve" msgstr "Upravit přírodní rezervaci" @@ -21359,25 +21514,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2952 msgid "Scree" msgstr "Suťoviště" #. item -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2953 msgid "Edit Scree" msgstr "Upravit suťoviště" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2957 msgid "Scrub" msgstr "Podrost" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:2958 msgid "Edit Scrub" msgstr "Upravit podrost" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2962 msgid "Fell" msgstr "Travnatá pahorkatina" @@ -21385,10 +21540,10 @@ #. item #. -#: build/trans_presets.java:2952 +#: build/trans_presets.java:2964 msgid "Edit Fell" msgstr "Upravit travnatou pahorkatinu" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2968 msgid "Heath" msgstr "Vřesoviště" @@ -21396,5 +21551,5 @@ #. item #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2970 msgid "Edit Heath" msgstr "Upravit vřesoviště" @@ -21402,5 +21557,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2975 msgid "Farmyard" msgstr "Farma" @@ -21409,45 +21564,45 @@ #. -#: build/trans_presets.java:2966 +#: build/trans_presets.java:2978 msgid "Edit Farmyard Landuse" msgstr "Upravit farmu" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2983 msgid "Farmland" msgstr "Zemědělská půda" #. item -#: build/trans_presets.java:2972 +#: build/trans_presets.java:2984 msgid "Edit Farmland Landuse" msgstr "Upravit zemědělskou půdu" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2977 +#: build/trans_presets.java:2989 msgid "Meadow" msgstr "Louka" #. item -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2990 msgid "Edit Meadow Landuse" msgstr "Upravit louku" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:2995 msgid "Vineyard" msgstr "Vinice" #. item -#: build/trans_presets.java:2984 +#: build/trans_presets.java:2996 msgid "Edit Vineyard Landuse" msgstr "Upravit vinici" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3001 msgid "Allotments" msgstr "Zahrádkářská kolonie" #. item -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3002 msgid "Edit Allotments Landuse" msgstr "Upravit zahrádkářskou kolonii" @@ -21455,25 +21610,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3008 msgid "Garden" msgstr "Zahrada" #. item -#: build/trans_presets.java:2997 +#: build/trans_presets.java:3009 msgid "Edit Garden" msgstr "Upravit zahradu" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3013 msgid "Grass" msgstr "Tráva" #. item -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3014 msgid "Edit Grass Landuse" msgstr "Upravit travnatou plochu" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3019 msgid "Village Green" msgstr "Zelená plocha" @@ -21481,10 +21636,10 @@ #. item #. -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3021 msgid "Edit Village Green Landuse" msgstr "Upravit zelenou plochu" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3026 msgid "Common" msgstr "veřejná zeleň (mimo parky)" @@ -21492,20 +21647,20 @@ #. item #. -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3028 msgid "Edit Common" msgstr "Upravit veřejnou zeleň" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3032 msgid "Park" msgstr "Park" #. item -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3033 msgid "Edit Park" msgstr "Upravit park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3037 msgid "Recreation Ground" msgstr "Rekreační plocha" @@ -21513,5 +21668,5 @@ #. item #. -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3039 msgid "Edit Recreation Ground Landuse" msgstr "Upravit rekreační plochu" @@ -21519,15 +21674,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3033 +#: build/trans_presets.java:3045 msgid "Residential area" msgstr "Obytná plocha" #. item -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3046 msgid "Edit Residential Landuse" msgstr "Upravit obytnou plochu" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3051 msgid "Graveyard" msgstr "Malý hřbitov" @@ -21535,9 +21690,9 @@ #. item #. -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3053 msgid "Edit Graveyard" msgstr "Upravit malý hřbitov" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3059 msgid "Cemetery" msgstr "Hřbitov" @@ -21545,39 +21700,39 @@ #. item #. -#: build/trans_presets.java:3049 +#: build/trans_presets.java:3061 msgid "Edit Cemetery Landuse" msgstr "Upravit hřbitov" -#: build/trans_presets.java:3056 +#: build/trans_presets.java:3068 msgid "Retail" msgstr "Obchody" #. item -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3069 msgid "Edit Retail Landuse" msgstr "Upravit plochu s obchody" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3062 +#: build/trans_presets.java:3074 msgid "Commercial" msgstr "Kanceláře" #. item -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3075 msgid "Edit Commercial Landuse" msgstr "Upravit kancelářskou plochu" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3068 +#: build/trans_presets.java:3080 msgid "Industrial" msgstr "Průmysl" #. item -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3081 msgid "Edit Industrial Landuse" msgstr "Upravit průmyslovou plochu" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3086 msgid "Railway land" msgstr "Železniční plocha" @@ -21585,15 +21740,15 @@ #. item #. -#: build/trans_presets.java:3076 +#: build/trans_presets.java:3088 msgid "Edit Railway Landuse" msgstr "Upravit železniční plochu" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3081 +#: build/trans_presets.java:3093 msgid "Military" msgstr "Vojenský prostor" #. item -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3094 msgid "Edit Military Landuse" msgstr "Upravit vojenský prostor" @@ -21601,55 +21756,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3100 msgid "Construction area" msgstr "Probíhající výstavba" #. item -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3101 msgid "Edit Construction Landuse" msgstr "Upravit výstavbu" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3094 +#: build/trans_presets.java:3106 msgid "Brownfield" msgstr "Stará zátěž, městské ruiny (Brownfield)" #. item -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3107 msgid "Edit Brownfield Landuse" msgstr "Upravit starou zátěž (Brownfield)" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3100 +#: build/trans_presets.java:3112 msgid "Greenfield" msgstr "Zastavitelné území (Greenfield)" #. item -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3113 msgid "Edit Greenfield Landuse" msgstr "Upravit zastavitelné území (Greenfield)" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3118 msgid "Landfill" msgstr "skládka odpadu" #. item -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3119 msgid "Edit Landfill Landuse" msgstr "Upravit skládku odpadu" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3124 msgid "Quarry" msgstr "Lom" #. item -#: build/trans_presets.java:3113 +#: build/trans_presets.java:3125 msgid "Edit Quarry Landuse" msgstr "Upravit lom" #. group "Relations" -#: build/trans_presets.java:3122 +#: build/trans_presets.java:3134 msgid "Multipolygon" msgstr "Multipolygon" @@ -21659,5 +21814,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:3126 +#: build/trans_presets.java:3138 msgid "Edit Multipolygon" msgstr "Upravit multipolygon" @@ -21666,10 +21821,10 @@ #. #. -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3144 msgid "outer segment" msgstr "vnější část" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3145 msgid "inner segment" msgstr "vnitřní část" @@ -21677,5 +21832,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3148 msgid "Turn restriction" msgstr "Zákaz odbočení" @@ -21684,5 +21839,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3151 msgid "Edit Turn Restriction" msgstr "Upravit zákaz odbočení" @@ -21690,34 +21845,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "Restriction" msgstr "Omezení" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_left_turn" msgstr "zákaz odbočení vlevo" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_right_turn" msgstr "zákaz odbočení vpravo" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_straight_on" msgstr "zákaz jízdy rovně" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_u_turn" msgstr "zákaz otáčení" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_right_turn" msgstr "pouze odbočení vpravo" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_left_turn" msgstr "pouze odbočení vlevo" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_straight_on" msgstr "pouze jízda rovně" @@ -21726,15 +21881,15 @@ #. #. -#: build/trans_presets.java:3146 +#: build/trans_presets.java:3158 msgid "from way" msgstr "z cesty" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3159 msgid "via node or way" msgstr "přes uzel nebo cestu" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3148 +#: build/trans_presets.java:3160 msgid "to way" msgstr "na cestu" @@ -21742,5 +21897,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3151 +#: build/trans_presets.java:3163 msgid "Route" msgstr "Trasa" @@ -21749,5 +21904,5 @@ #. -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3166 msgid "Edit Route" msgstr "Upravit trasu" @@ -21755,5 +21910,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "Route type" msgstr "Typ trasy" @@ -21825,5 +21980,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:233 +#: build/trans_presets.java:3168 build/trans_style.java:233 #: build/trans_style.java:683 build/trans_style.java:906 #: build/trans_style.java:914 build/trans_style.java:922 @@ -21832,17 +21987,17 @@ msgstr "bicykl" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "bus" msgstr "autobus" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "road" msgstr "silnice" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ferry" msgstr "trajekt" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ski" msgstr "lyžařská" @@ -21895,5 +22050,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:247 +#: build/trans_presets.java:3168 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -21902,13 +22057,13 @@ msgstr "pěší" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "hiking" msgstr "turistická" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "tram" msgstr "tramvajová" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "detour" msgstr "objízdná" @@ -21922,10 +22077,10 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:1206 +#: build/trans_presets.java:3168 build/trans_style.java:1206 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3159 +#: build/trans_presets.java:3171 msgid "Symbol description" msgstr "Popis symbolu" @@ -21933,31 +22088,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3174 msgid "Network" msgstr "Síť" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "proposed" msgstr "navrhovaná" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "alternate" msgstr "alternativní" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "temporary" msgstr "dočasná" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "connection" msgstr "spojení" -#: build/trans_presets.java:3165 +#: build/trans_presets.java:3177 msgid "Color (hex)" msgstr "Barva (hex)" @@ -21966,30 +22121,30 @@ #. #. -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3180 msgid "route segment" msgstr "segment trasy" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3181 msgid "forward segment" msgstr "dopředný segment" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3170 +#: build/trans_presets.java:3182 msgid "backward segment" msgstr "zpětný segment" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3183 msgid "halt point" msgstr "zastávka" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3172 +#: build/trans_presets.java:3184 msgid "forward halt point" msgstr "dopředná zastávka" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3173 +#: build/trans_presets.java:3185 msgid "backward halt point" msgstr "zpětná zastávka" @@ -26127,4 +26282,24 @@ msgstr "Český UHUL:ORTOFOTO" +#~ msgid "Combine ways with different memberships?" +#~ msgstr "Spojit cesty patřící do jiné relace?" + +#~ msgid "Combine Anyway" +#~ msgstr "Přesto zkombinovat" + +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "Vybrané cesty patří do jiné relace. Opravdu je chcete spojit?" + +#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +#~ msgstr "Chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\"" + +#~ msgid "Purging 1 primitive" +#~ msgstr "Odstraňuji 1 prvek" + +#~ msgid "Empty member in relation." +#~ msgstr "Prázdný prvek v relaci." + #~ msgid "Email" #~ msgstr "E-mail" Index: /applications/editors/josm/i18n/po/da.po =================================================================== --- /applications/editors/josm/i18n/po/da.po (revision 17821) +++ /applications/editors/josm/i18n/po/da.po (revision 17822) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-22 17:52+0200\n" -"PO-Revision-Date: 2009-09-22 15:09+0000\n" +"POT-Creation-Date: 2009-09-28 16:38+0200\n" +"PO-Revision-Date: 2009-09-22 18:31+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Danish \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-22 15:46+0000\n" +"X-Launchpad-Export-Date: 2009-09-28 14:34+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -66,8 +66,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250 @@ -90,9 +90,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -141,7 +141,7 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:172 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 @@ -154,5 +154,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 @@ -329,6 +328,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -338,6 +336,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 @@ -347,5 +345,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -356,5 +354,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180 @@ -363,5 +361,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -456,9 +454,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -490,10 +488,9 @@ msgstr "Vælg mindst fire punkter." -#. FIXME: not sure whether this fits in a dialog #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:85 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -603,5 +600,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 #, java-format msgid "File: {0}" @@ -623,38 +620,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine Way" msgstr "Sammensæt vej" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 msgid "Combine several ways into one." msgstr "Sammensæt adskillige veje til én" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 -msgid "Combine ways with different memberships?" -msgstr "Sammensæt veje med forskellige tilhørsforhold?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -msgid "Combine Anyway" -msgstr "Sammensæt alligevel" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" -"De valgte veje hører til forskellige relationer. Vil du stadigvæk " -"sammensætte dem?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 msgid "Change directions?" msgstr "Skift retninger?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Reverse and Combine" msgstr "Vend om og sammensæt" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -664,5 +645,5 @@ "nogle af dem om?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -672,10 +653,10 @@ "af punkter)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 #, java-format msgid "Combine {0} ways" msgstr "Sammensæt {0} veje" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 msgid "Please select at least two ways to combine." msgstr "Vælg mindst to veje at sammensætte." @@ -722,6 +703,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -786,5 +766,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -815,5 +795,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307 #, java-format msgid "There were {0} conflicts during import." @@ -831,5 +810,4 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Duplicate" @@ -860,10 +838,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:209 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Eksporter til GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:208 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Eksporter dataet til GPS-fil." @@ -874,8 +852,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -940,5 +918,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 @@ -981,6 +959,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1070,18 +1047,18 @@ msgstr "Flet det nuværende lag sammen med et andet lag" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge Nodes" msgstr "Foren punkter" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 msgid "Merge nodes into the oldest one." msgstr "Foren punkter til den ældste." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 msgid "Please select at least two nodes to merge." msgstr "Vælg mindst to punkter, der skal forenes." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -1089,5 +1066,5 @@ "er i brug." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 #, java-format msgid "Merge {0} nodes" @@ -1159,5 +1136,4 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350 msgid "New" msgstr "Ny" @@ -1335,10 +1311,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Gem" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Gem nuværende data." @@ -1395,10 +1371,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Gem som..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Gem det nuværende data i en ny fil." @@ -1441,5 +1417,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:961 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888 @@ -1679,14 +1655,14 @@ msgstr "Intet er valgt" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 msgid "Upload to OSM..." msgstr "Send til OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload all changes to the OSM server." msgstr "Send alle ændringer til OSM-serveren." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 #, java-format msgid "" @@ -1695,23 +1671,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Intet at sende. Skab først noget data." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:171 msgid "No changes to upload." msgstr "Ingen ændringer at sende." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223 #, java-format msgid "Synchronize {0} {1} only" msgstr "Synkronisér kun {0} {1}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 msgid "Synchronize entire dataset" msgstr "Synkronisér hele datasættet" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:228 #, java-format msgid "" @@ -1725,17 +1701,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:283 msgid "Conflict detected" msgstr "Der er opdaget en konflikt" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:257 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 #, java-format msgid "Unexpected return value. Got {0}." msgstr "uventet svar. Modtog {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:272 #, java-format msgid "" @@ -1746,5 +1722,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:306 #, java-format msgid "" @@ -1754,34 +1730,39 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 msgid "Changeset closed" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:425 #, java-format msgid "Uploading failed.
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:434 msgid "Upload to OSM API failed" msgstr "Upload til OSM-API'et fejlede" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457 msgid "Updating primitive" msgstr "Opdaterer primitiv" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:514 #, java-format msgid "Uploading data for layer ''{0}''" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." msgstr "" @@ -1870,13 +1851,13 @@ msgstr "Langsommere fremad" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34 msgid "Downloading GPS data" msgstr "Henter GPS-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57 msgid "Downloaded GPX Data" msgstr "Hent GPX-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87 msgid "Raw GPS data" msgstr "Rå GPS-data" @@ -1891,4 +1872,9 @@ "Ignoring exception because download has been cancelled. Exception was: {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 +#, fuzzy +msgid "No data found in this area." +msgstr "Intet data fundet på enheden." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2588,9 +2574,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 +#, java-format +msgid "" +"Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -2639,5 +2625,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Delete from relation" msgstr "Slet fra relation" @@ -2690,14 +2676,15 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 -msgid "Purging 1 primitive" -msgstr "Fjerner 1 primitiv" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 -#, java-format -msgid "removing reference from way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 +#, fuzzy, java-format +msgid "Purged object ''{0}''" +msgstr "Flyt objekterne {0}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 +#, fuzzy, java-format +msgid "Purged {0} objects" +msgstr "Ret {0} objekt" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 #, java-format msgid "" @@ -2706,12 +2693,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203 -#, java-format -msgid "removing reference from relation {0}" -msgstr "" +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 +#, fuzzy, java-format +msgid "Removing reference from relation {0}" +msgstr "Fjernede element fra relationer" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 #, java-format msgid "Resolve conflicts in member list of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -3055,24 +3047,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Error: {0}" msgstr "Fejl: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Warning: {0}" msgstr "Advarsel: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3080,5 +3072,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3104,6 +3096,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:244 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3159,120 +3151,113 @@ msgstr "multipolygon-vej \"{0}\" er ikke lukket." -#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed -#. TODO Remove useless nullcheck when RelationMember.member is encalupsed -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855 -msgid "Empty member in relation." -msgstr "Tomt medlem i relation." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:850 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Slettede medlem \"{0}\" i relation" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:861 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Vej \"{0}\" med mindre end to punkter." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 msgid "More than one \"from\" way found." msgstr "Mere end én \"fra\"-vej blev fundet." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:607 msgid "More than one \"to\" way found." msgstr "Mere end én \"til\"-vej blev fundet." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:613 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627 msgid "More than one \"via\" found." msgstr "Mere end én \"via\" blev fundet." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:632 #, java-format msgid "Unknown role ''{0}''." msgstr "Ukendt rolle \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Ukendt medlemstype for \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:641 msgid "No \"from\" way found." msgstr "Ingen \"fra\"-vej blev fundet." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645 msgid "No \"to\" way found." msgstr "Ingen \"til\"-vej blev fundet." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:649 msgid "No \"via\" node or way found." msgstr "Intet \"via\"-punkt eller vej blev fundet." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:658 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "\"Fra\"-vejen begynder eller slutter ikke ved et \"via\"-punkt." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:662 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "\"Til\"-vejen begynder eller slutter ikke ved et \"via\"-punkt." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "\"Fra\"-vejen begynder eller slutter ikke ved \"via\"-vejen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "\"Til\"-vejen begynder eller slutter ikke ved \"via\"-vejen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:870 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Ingen brugbar rolle \"{0}\" for vej \"{1}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:882 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Ikke-vej \"{0}\" i multipolygon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:940 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Ingen ydre vej for multipolygon \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1029 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Overlap mellem vejene \"{0}\" og \"{1}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1041 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Indre vej \"{0}\" er på ydersiden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1094 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1120 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1324 msgid "untagged" msgstr "utagget" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1325 msgid "text" msgstr "tekst" @@ -3294,5 +3279,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:249 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 @@ -3303,5 +3288,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 @@ -3330,5 +3315,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:169 msgid "background" msgstr "baggrund" @@ -3420,5 +3405,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "railway" msgstr "jernbane" @@ -3474,9 +3459,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +#, fuzzy +msgid "Not Found" +msgstr "Ikke forbundet" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 msgid "Unknown host" msgstr "Ukendt vært" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:247 msgid "Primitive already deleted" msgstr "Primitiven er allerede slettet" @@ -4786,5 +4776,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -4998,43 +4988,43 @@ msgstr "Medlem af" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 msgid "Add Properties" msgstr "Tilføj egenskaber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 msgid "Add a new key/value pair to all objects" msgstr "Tilføj et nyt nøgle/værdi-sæt til alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 msgid "Edit Properties" msgstr "Rediger egenskaber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 msgid "Edit the value of the selected key for all objects" msgstr "Ret værdien for den valgte nøgle for alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Egenskaber: {0} / Medlemskaber: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 msgid "Properties / Memberships" msgstr "Egenskaber / Medlemskaber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 msgid "Change relation" msgstr "Skift relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Slet virkelig det valgte fra relation {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:855 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 msgid "Delete the selected key in all objects" msgstr "Fjern den valgte nøgle i alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 msgid "Delete Properties" msgstr "Fjern egenskaber" @@ -5044,6 +5034,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168 -#: build/trans_presets.java:3121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 +#: build/trans_presets.java:3133 msgid "Relations" msgstr "Relationer" @@ -5053,25 +5043,30 @@ msgstr "Åbn en liste over alle relationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:174 #, java-format msgid "Relations: {0}" msgstr "Relationer: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 msgid "Open an editor for the selected relation" msgstr "Åbn en editor for den valgte relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:325 msgid "Delete the selected relation" msgstr "Slet de nvalgte relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:363 msgid "Create a new relation" msgstr "Opret en ny relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:400 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280 msgid "Create a copy of this relation and open it in another editor window" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 +#, fuzzy +msgid "Set the current selection to the list of selected relations" +msgstr "Det nuværende valgte kan ikke bruges til opdeling" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5112,14 +5107,14 @@ msgstr "Valgt: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 msgid "Undock the panel" msgstr "Frigør panelet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "Luk panelet. Du kan genåbne det med knapperne i venstre menubar." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 msgid "Click to minimize/maximize the panel content" msgstr "Klik for at minimere/maksimere panelet" @@ -5631,5 +5626,5 @@ #. group "Geography" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2771 msgid "Places" msgstr "Steder" @@ -6303,6 +6298,4 @@ #. item "Man Made/Windmill" label "Edit Windmill" #. -#. item "Man Made/Pipeline" label "Edit Pipeline" -#. #. item "Man Made/Wastewater Plant" label "Edit Wastewater Plant" #. @@ -6315,4 +6308,6 @@ #. item "Man Made/Surveillance" label "Edit Surveillance Camera" #. +#. item "Man Made/Power Station" label "Edit Power Station" +#. #. item "Amenities/Fountain" label "Edit Fountain" #. @@ -6637,57 +6632,57 @@ #: build/trans_presets.java:2250 build/trans_presets.java:2258 #: build/trans_presets.java:2290 build/trans_presets.java:2295 -#: build/trans_presets.java:2300 build/trans_presets.java:2305 -#: build/trans_presets.java:2311 build/trans_presets.java:2317 -#: build/trans_presets.java:2323 build/trans_presets.java:2331 -#: build/trans_presets.java:2337 build/trans_presets.java:2343 -#: build/trans_presets.java:2349 build/trans_presets.java:2355 -#: build/trans_presets.java:2365 build/trans_presets.java:2462 -#: build/trans_presets.java:2469 build/trans_presets.java:2483 -#: build/trans_presets.java:2489 build/trans_presets.java:2496 -#: build/trans_presets.java:2503 build/trans_presets.java:2509 -#: build/trans_presets.java:2515 build/trans_presets.java:2537 -#: build/trans_presets.java:2544 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2305 build/trans_presets.java:2310 +#: build/trans_presets.java:2316 build/trans_presets.java:2322 +#: build/trans_presets.java:2339 build/trans_presets.java:2345 +#: build/trans_presets.java:2351 build/trans_presets.java:2357 +#: build/trans_presets.java:2363 build/trans_presets.java:2373 +#: build/trans_presets.java:2380 build/trans_presets.java:2474 +#: build/trans_presets.java:2481 build/trans_presets.java:2495 +#: build/trans_presets.java:2501 build/trans_presets.java:2508 +#: build/trans_presets.java:2515 build/trans_presets.java:2521 +#: build/trans_presets.java:2527 build/trans_presets.java:2549 +#: build/trans_presets.java:2556 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2576 #: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2594 build/trans_presets.java:2601 -#: build/trans_presets.java:2608 build/trans_presets.java:2615 -#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2594 build/trans_presets.java:2600 +#: build/trans_presets.java:2606 build/trans_presets.java:2613 +#: build/trans_presets.java:2620 build/trans_presets.java:2627 #: build/trans_presets.java:2633 build/trans_presets.java:2639 -#: build/trans_presets.java:2645 build/trans_presets.java:2652 -#: build/trans_presets.java:2659 build/trans_presets.java:2666 -#: build/trans_presets.java:2672 build/trans_presets.java:2678 -#: build/trans_presets.java:2688 build/trans_presets.java:2697 -#: build/trans_presets.java:2712 build/trans_presets.java:2718 -#: build/trans_presets.java:2726 build/trans_presets.java:2733 -#: build/trans_presets.java:2753 build/trans_presets.java:2764 -#: build/trans_presets.java:2770 build/trans_presets.java:2776 +#: build/trans_presets.java:2645 build/trans_presets.java:2651 +#: build/trans_presets.java:2657 build/trans_presets.java:2664 +#: build/trans_presets.java:2671 build/trans_presets.java:2678 +#: build/trans_presets.java:2684 build/trans_presets.java:2690 +#: build/trans_presets.java:2700 build/trans_presets.java:2709 +#: build/trans_presets.java:2724 build/trans_presets.java:2730 +#: build/trans_presets.java:2738 build/trans_presets.java:2745 +#: build/trans_presets.java:2765 build/trans_presets.java:2776 #: build/trans_presets.java:2782 build/trans_presets.java:2788 -#: build/trans_presets.java:2795 build/trans_presets.java:2802 -#: build/trans_presets.java:2809 build/trans_presets.java:2815 -#: build/trans_presets.java:2821 build/trans_presets.java:2829 -#: build/trans_presets.java:2836 build/trans_presets.java:2843 -#: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2879 build/trans_presets.java:2885 +#: build/trans_presets.java:2794 build/trans_presets.java:2800 +#: build/trans_presets.java:2807 build/trans_presets.java:2814 +#: build/trans_presets.java:2821 build/trans_presets.java:2827 +#: build/trans_presets.java:2833 build/trans_presets.java:2841 +#: build/trans_presets.java:2848 build/trans_presets.java:2855 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2875 build/trans_presets.java:2882 #: build/trans_presets.java:2891 build/trans_presets.java:2897 -#: build/trans_presets.java:2903 build/trans_presets.java:2912 -#: build/trans_presets.java:2922 build/trans_presets.java:2931 -#: build/trans_presets.java:2937 build/trans_presets.java:2943 -#: build/trans_presets.java:2948 build/trans_presets.java:2954 -#: build/trans_presets.java:2960 build/trans_presets.java:2969 -#: build/trans_presets.java:2975 build/trans_presets.java:2981 +#: build/trans_presets.java:2903 build/trans_presets.java:2909 +#: build/trans_presets.java:2915 build/trans_presets.java:2924 +#: build/trans_presets.java:2934 build/trans_presets.java:2943 +#: build/trans_presets.java:2949 build/trans_presets.java:2955 +#: build/trans_presets.java:2960 build/trans_presets.java:2966 +#: build/trans_presets.java:2972 build/trans_presets.java:2981 #: build/trans_presets.java:2987 build/trans_presets.java:2993 #: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3012 build/trans_presets.java:3018 -#: build/trans_presets.java:3023 build/trans_presets.java:3030 -#: build/trans_presets.java:3037 build/trans_presets.java:3043 -#: build/trans_presets.java:3052 build/trans_presets.java:3060 -#: build/trans_presets.java:3066 build/trans_presets.java:3072 -#: build/trans_presets.java:3079 build/trans_presets.java:3085 -#: build/trans_presets.java:3092 build/trans_presets.java:3098 +#: build/trans_presets.java:3011 build/trans_presets.java:3017 +#: build/trans_presets.java:3024 build/trans_presets.java:3030 +#: build/trans_presets.java:3035 build/trans_presets.java:3042 +#: build/trans_presets.java:3049 build/trans_presets.java:3055 +#: build/trans_presets.java:3064 build/trans_presets.java:3072 +#: build/trans_presets.java:3078 build/trans_presets.java:3084 +#: build/trans_presets.java:3091 build/trans_presets.java:3097 #: build/trans_presets.java:3104 build/trans_presets.java:3110 -#: build/trans_presets.java:3116 build/trans_presets.java:3129 -#: build/trans_presets.java:3143 build/trans_presets.java:3157 +#: build/trans_presets.java:3116 build/trans_presets.java:3122 +#: build/trans_presets.java:3128 build/trans_presets.java:3141 +#: build/trans_presets.java:3155 build/trans_presets.java:3169 msgid "Name" msgstr "Navn" @@ -6750,5 +6745,4 @@ msgstr "" -#. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 msgid "Close the selected open changesets" @@ -6776,25 +6770,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "Yes" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "No" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47 #, java-format msgid "Layer ''{0}'' has modifications which should be uploaded to the server." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49 #, java-format msgid "Layer ''{0}'' has no modifications to be uploaded." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60 #, java-format msgid "" @@ -6803,29 +6797,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62 #, java-format msgid "Layer ''{0}'' has no modifications to be saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80 msgid "No file associated with this layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:83 msgid "Please select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:86 #, java-format msgid "Layer ''{0}'' is not backed by a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:101 #, java-format msgid "File ''{0}'' is not writable. Please enter another file name." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:115 #, java-format msgid "Select to upload layer ''{0}'' to the server ''{1}''" @@ -6918,5 +6912,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -msgid "Save and Exit" +#, fuzzy +msgid "Save/Upload and Exit" msgstr "Gem og afslut" @@ -6926,6 +6921,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -msgid "Save and Delete" -msgstr "" +#, fuzzy +msgid "Save/Upload and Delete" +msgstr "Opdatering afbrudt" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 @@ -6941,5 +6937,5 @@ msgid "" "An upload and/or save operation of one layer with modifications
was " -"cancelled or has been failed." +"cancelled or has failed." msgstr "" @@ -7025,6 +7021,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:891 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:921 msgid "Tags of new changeset" msgstr "" @@ -7121,7 +7117,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:909 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:933 #, java-format msgid "Tags of changeset {0}" @@ -7129,48 +7124,48 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:949 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:963 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1011 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106 msgid "Preparing primitives to upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Billeder for {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "Indlæs GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Intet tidspunkt for punkt {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Kan ikke læse tidspunkt \"{0}\" for punkt {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325 msgid "No images with readable timestamps found." msgstr "Ingen billeder med læsbare tidsstempler fundet" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format @@ -7178,29 +7173,29 @@ msgstr "Indlæser {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:402 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246 msgid "Geotagged Images" msgstr "Geotaggede billeder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:587 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "GPS start: {0}" msgstr "GPS-start: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 #, java-format msgid "GPS end: {0}" msgstr "GPS-slut: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594 #, java-format msgid "current delta: {0}s" msgstr "nuværende forskel: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595 msgid "timezone difference: " msgstr "tidszone-forskel: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284 msgid "image" @@ -7209,14 +7204,14 @@ msgstr[1] "billeder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #, java-format msgid "{0} within the track." msgstr "{0} inden for sporet." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680 msgid "Sync clock" msgstr "Synkronisér ur" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7224,32 +7219,32 @@ msgstr "JPEG-billeder (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:734 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Datoen i filen \"{0}\" kunne ikke forstås." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Der er intet EXIF-tidspunkt i filen \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 msgid "Image" msgstr "Billede" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:752 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Indtast den viste dato (mm/dd/åååå TT:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759 msgid "GPS unit timezone (difference to photo)" msgstr "GPS-enhedens tidszone (forskel fra foto)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:767 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771 msgid "Synchronize Time with GPS Unit" msgstr "Synkronisér tidspunkt med GPS-enhed" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:790 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 msgid "Time entered could not be parsed." msgstr "Den indtastede tid kunne ikke forstås." @@ -7333,5 +7328,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 #, java-format msgid "Name: {0}" @@ -7354,5 +7349,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3160 +#: build/trans_presets.java:3172 msgid "Description" msgstr "Beskrivelse" @@ -7408,5 +7403,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:587 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 @@ -7470,42 +7465,65 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:105 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:107 #, java-format msgid "Data Layer {0}" msgstr "Datalag {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 msgid "outside downloaded area" msgstr "uden for det hentede område" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:252 #, java-format msgid "version {0}" msgstr "version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:289 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:290 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 +#, fuzzy, java-format +msgid "There was {0} conflict detected." +msgid_plural "There were {0} conflicts detected." +msgstr[0] "Der var {0} konflikter under import." +msgstr[1] "Der var {0} konflikter under import." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 +#, java-format +msgid "" +"{0} object has been purged from the local dataset because it is deleted on " +"the server." +msgid_plural "" +"{0} objects have been purged from the local dataset because they are deleted " +"on the server." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 +#, fuzzy +msgid "Conflicts detected" +msgstr "Der er opdaget en konflikt" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 #, java-format msgid "{0} consists of:" msgstr "{0} består af:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:476 #, java-format msgid " ({0} deleted.)" msgstr " ({0} slettet.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 #, java-format msgid "API version: {0}" msgstr "API-version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:501 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:584 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" @@ -7855,5 +7873,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:412 #: ../plugins/terracer/src/terracer/TerracerAction.java:430 @@ -8600,5 +8618,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261 msgid "More information about this feature" msgstr "Mere information om denne feature" @@ -8647,5 +8665,5 @@ msgstr "Elementer af typen {0} er understøttet." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:700 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -8655,18 +8673,18 @@ msgstr[1] "Ret {0} objekter" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Intet er valgt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 msgid "Selection unsuitable!" msgstr "Udvælgelse uegnet!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 msgid "Apply Preset" msgstr "Anvend Preset" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788 msgid "Change Properties" msgstr "Ret egenskaber" @@ -8952,44 +8970,44 @@ msgstr "Lukker rettesæt..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 msgid "Preparing..." msgstr "Forbereder..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 msgid "Uploading..." msgstr "Uploader..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9220,5 +9238,5 @@ msgid "" "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}''," -"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." +"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." msgstr "" @@ -9335,6 +9353,6 @@ #, java-format msgid "" -"Relation with external id ''{0}'' refers to missing primitive with external " -"id ''{1}''." +"Relation with external id ''{0}'' refers to a missing primitive with " +"external id ''{1}''." msgstr "" @@ -9430,32 +9448,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:73 msgid "Starting to upload with one request per primitive ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Starting to upload in one request ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 +#, fuzzy, java-format +msgid "Parameter ''{0}'' must not be null" +msgstr "parameteren \"{0}\" må ikke være en null-værdi" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 msgid "Uploading data ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 msgid "" "WARNING: no API version defined for data to upload. Falling back to version " @@ -9463,5 +9486,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:153 #, java-format msgid "" @@ -9685,5 +9708,5 @@ #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:202 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:324 build/trans_presets.java:325 @@ -9705,6 +9728,6 @@ #: build/trans_presets.java:789 build/trans_presets.java:1333 #: build/trans_presets.java:1400 build/trans_presets.java:1401 -#: build/trans_presets.java:1402 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 +#: build/trans_presets.java:1402 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 msgid "unknown" msgstr "ukendt" @@ -9850,5 +9873,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:192 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:182 +#, java-format +msgid "" +"The OSM server ''{0}'' doesn't know about an object
you tried to read, " +"update, or delete. Either the respective object
doesn''t exist on the " +"server or you''re using an invalid URL to access
it. Please carefully " +"check the servers address ''{1}'' for typos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:209 #, java-format msgid "" @@ -9858,5 +9890,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:262 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:279 #, java-format msgid "" @@ -10116,17 +10148,15 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35 msgid "Define Address Interpolation" msgstr "" -#. Whether to re-trigger data changed for relation #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "Ulige" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:413 #: ../plugins/terracer/src/terracer/TerracerAction.java:437 @@ -10134,99 +10164,99 @@ msgstr "Lige" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 msgid "Alphabetic" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161 #, java-format msgid "Relation: {0}" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173 msgid "Associate with street using:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184 msgid "Numbering Scheme:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 msgid "Starting #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188 msgid "Ending #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 #, java-format msgid "Will associate {0} additional house number nodes" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 msgid "Starting address number must be less than ending address number" msgstr "" @@ -10969,4 +10999,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52 +#: build/trans_presets.java:2331 msgid "Location" msgstr "" @@ -11506,4 +11537,5 @@ msgstr "sydøst" +#. item "Man Made/Pipeline" combo "Type" #. color highway_track #. @@ -11549,7 +11581,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:990 build/trans_style.java:1007 -#: build/trans_style.java:1023 build/trans_style.java:3400 -#: build/trans_style.java:3408 +#: build/trans_presets.java:2330 build/trans_style.java:990 +#: build/trans_style.java:1007 build/trans_style.java:1023 +#: build/trans_style.java:3400 build/trans_style.java:3408 msgid "water" msgstr "vand" @@ -14109,9 +14141,11 @@ #. item "Public Transport/Airport" text "Name" #. +#. item "Man Made/Power Station" text "Operator" #. item "Relations/Route" text "Name" #: build/trans_presets.java:65 build/trans_presets.java:101 #: build/trans_presets.java:121 build/trans_presets.java:141 #: build/trans_presets.java:178 build/trans_presets.java:198 -#: build/trans_presets.java:1560 build/trans_presets.java:3158 +#: build/trans_presets.java:1560 build/trans_presets.java:2382 +#: build/trans_presets.java:3170 msgid "Reference" msgstr "Reference" @@ -14673,5 +14707,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 msgid "metal" msgstr "" @@ -14691,5 +14725,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 #: build/trans_style.java:3375 msgid "wood" @@ -14978,7 +15012,7 @@ #: build/trans_presets.java:1401 build/trans_presets.java:1402 #: build/trans_presets.java:1767 build/trans_presets.java:1777 -#: build/trans_presets.java:2408 build/trans_presets.java:2444 -#: build/trans_presets.java:2453 build/trans_presets.java:2454 -#: build/trans_presets.java:2455 build/trans_presets.java:2725 +#: build/trans_presets.java:2420 build/trans_presets.java:2456 +#: build/trans_presets.java:2465 build/trans_presets.java:2466 +#: build/trans_presets.java:2467 build/trans_presets.java:2737 msgid "yes" msgstr "ja" @@ -15127,8 +15161,8 @@ #: build/trans_presets.java:1400 build/trans_presets.java:1401 #: build/trans_presets.java:1402 build/trans_presets.java:1767 -#: build/trans_presets.java:1777 build/trans_presets.java:2408 -#: build/trans_presets.java:2444 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 -#: build/trans_presets.java:2725 +#: build/trans_presets.java:1777 build/trans_presets.java:2420 +#: build/trans_presets.java:2456 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 +#: build/trans_presets.java:2737 msgid "no" msgstr "nej" @@ -15266,6 +15300,8 @@ #. item "Water/Wetland" text "Name" #. item "Car/Parking" text "Reference number" +#. item "Man Made/Pipeline" text "Operator" #. item "Man Made/Power Generator" label "Edit Power Generator" #. +#. item "Man Made/Power Tower" label "Edit Power Tower" #. item "Land use/Tree" text "Name" #. item "Land use/Wood" text "Name" @@ -15273,7 +15309,8 @@ #: build/trans_presets.java:350 build/trans_presets.java:649 #: build/trans_presets.java:789 build/trans_presets.java:1137 -#: build/trans_presets.java:1395 build/trans_presets.java:2364 -#: build/trans_presets.java:2913 build/trans_presets.java:2923 -#: build/trans_presets.java:2932 +#: build/trans_presets.java:1395 build/trans_presets.java:2330 +#: build/trans_presets.java:2372 build/trans_presets.java:2398 +#: build/trans_presets.java:2925 build/trans_presets.java:2935 +#: build/trans_presets.java:2944 msgid "Type" msgstr "Type" @@ -15823,10 +15860,10 @@ #. item "Tourism/Information Terminal" text "Closer description" #. item "Tourism/Audioguide" text "Closer description" -#. item "Man Made/Power Station" label "Edit Power Station" -#. +#. item "Man Made/Tower" text "Height (meters)" +#. item "Man Made/Pipeline" label "Edit Pipeline" +#. +#. item "Man Made/Power Station" text "Name" #. item "Man Made/Power Sub Station" label "Edit Power Sub Station" #. -#. item "Man Made/Power Line" label "Edit Power Line" -#. #. item #. #: build/trans_presets.java:1535 build/trans_presets.java:1789 -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2465 msgid "Shelter" msgstr "" @@ -18184,5 +18223,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1877 build/trans_presets.java:2669 +#: build/trans_presets.java:1877 build/trans_presets.java:2681 msgid "Sports" msgstr "Sport" @@ -19535,6 +19574,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "Religion" msgstr "Religion" @@ -19543,66 +19582,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "bahai" msgstr "bahai" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "buddhist" msgstr "buddhistisk" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "christian" msgstr "kristen" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "hindu" msgstr "hinduistisk" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jain" msgstr "jainistisk" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jewish" msgstr "jødisk" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "muslim" msgstr "muslimsk" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "spiritualist" msgstr "spiritistisk" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "taoist" msgstr "taoistisk" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "unitarian" msgstr "unitar" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "zoroastrian" msgstr "zoroastristisk" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "Denomination" msgstr "Trosretning" @@ -19611,76 +19650,76 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "anglican" msgstr "anglikansk" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "baptist" msgstr "baptistisk" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "catholic" msgstr "katolsk" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "evangelical" msgstr "evangelisk" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "jehovahs_witness" msgstr "Jehovas Vidner" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "lutheran" msgstr "luthersk" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "methodist" msgstr "metodistisk" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "mormon" msgstr "mormonsk" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "orthodox" msgstr "ortodoks" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "pentecostal" msgstr "pinsebevægelsen" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "presbyterian" msgstr "prebyteriansk" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "protestant" msgstr "protestantisk" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "quaker" msgstr "kvæker" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "shia" msgstr "shiitisk" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "sunni" msgstr "sunnitisk" @@ -19776,25 +19815,49 @@ #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2296 +#, fuzzy +msgid "Tower type" +msgstr "Tårn" + +#. item "Man Made/Tower" combo "Tower type" +#: build/trans_presets.java:2296 +#, fuzzy +msgid "communication" +msgstr "forbindelse" + +#: build/trans_presets.java:2296 +#, fuzzy +msgid "observation" +msgstr "Højde" + +#. +#: build/trans_presets.java:2298 +#, fuzzy +msgid "Height (meters)" +msgstr "Maks. højde (meter)" + +#. item "Man Made/Tower" text "Operator" +#. +#: build/trans_presets.java:2302 msgid "Water Tower" msgstr "Vandtårn" #. item -#: build/trans_presets.java:2298 +#: build/trans_presets.java:2303 msgid "Edit Water Tower" msgstr "Ret vandtårn" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2307 msgid "Gasometer" msgstr "Gasbeholder" #. item -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2308 msgid "Edit Gasometer" msgstr "Ret gasbeholder" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2307 +#: build/trans_presets.java:2312 msgid "Lighthouse" msgstr "Fyrtårn" @@ -19802,10 +19865,10 @@ #. item #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2314 msgid "Edit Lighthouse" msgstr "Ret fyrtårn" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2318 msgid "Windmill" msgstr "Vejrmølle" @@ -19813,21 +19876,54 @@ #. item #. -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2320 msgid "Edit Windmill" msgstr "Ret vejrmølle" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2319 +#: build/trans_presets.java:2324 msgid "Pipeline" msgstr "Rørledning" #. item -#. -#: build/trans_presets.java:2321 +#. +#: build/trans_presets.java:2327 msgid "Edit Pipeline" msgstr "Ret rørledning" -#. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2330 +#, fuzzy +msgid "oil" +msgstr "fossil" + +#: build/trans_presets.java:2330 build/trans_presets.java:2372 +msgid "gas" +msgstr "gas" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "sewage" +msgstr "brug" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "heat" +msgstr "hede" + +#: build/trans_presets.java:2330 +msgid "any substance" +msgstr "" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "underwater" +msgstr "vand" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "overground" +msgstr "jord" + +#: build/trans_presets.java:2333 msgid "Wastewater Plant" msgstr "Rensningsanlæg" @@ -19837,10 +19933,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:2329 +#: build/trans_presets.java:2337 msgid "Edit Wastewater Plant" msgstr "Ret rensningsanlæg" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2333 +#: build/trans_presets.java:2341 msgid "Crane" msgstr "Kran" @@ -19848,10 +19944,10 @@ #. item #. -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2343 msgid "Edit Crane" msgstr "Ret kran" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2347 msgid "Beacon" msgstr "Pejlemærke" @@ -19859,10 +19955,10 @@ #. item #. -#: build/trans_presets.java:2341 +#: build/trans_presets.java:2349 msgid "Edit Beacon" msgstr "Ret Pejlemærke" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2353 msgid "Survey Point" msgstr "" @@ -19870,10 +19966,10 @@ #. item #. -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2355 msgid "Edit Survey Point" msgstr "" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2359 msgid "Surveillance" msgstr "Overvågning" @@ -19881,5 +19977,5 @@ #. item #. -#: build/trans_presets.java:2353 +#: build/trans_presets.java:2361 msgid "Edit Surveillance Camera" msgstr "Ret overvågningskamera" @@ -19887,5 +19983,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2366 msgid "Power Generator" msgstr "Generator" @@ -19895,39 +19991,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:2362 +#: build/trans_presets.java:2370 msgid "Edit Power Generator" msgstr "Ret generator" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "wind" msgstr "vind" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "hydro" msgstr "vand" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "fossil" msgstr "fossil" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "nuclear" msgstr "arom" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "coal" msgstr "kul" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "photovoltaic" msgstr "sol" -#: build/trans_presets.java:2364 -msgid "gas" -msgstr "gas" - #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2375 msgid "Power Station" msgstr "Kraftværk" @@ -19936,10 +20028,10 @@ #. -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2378 msgid "Edit Power Station" msgstr "Ret kraftværk" -#. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2374 +#. item "Man Made/Power Station" text "Reference" +#: build/trans_presets.java:2384 msgid "Power Sub Station" msgstr "Transformatorstation" @@ -19948,5 +20040,5 @@ #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2387 msgid "Edit Power Sub Station" msgstr "Ret transformatorstation" @@ -19954,10 +20046,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2380 build/trans_presets.java:2396 +#: build/trans_presets.java:2390 build/trans_presets.java:2407 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2382 +#: build/trans_presets.java:2392 msgid "Power Tower" msgstr "Elmast" @@ -19968,11 +20060,26 @@ #. 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:2387 +#: build/trans_presets.java:2397 msgid "Edit Power Tower" msgstr "Ret elmast" -#. item "Man Made/Power Tower" label "Edit Power Tower" -#. -#: build/trans_presets.java:2390 +#. item "Man Made/Power Tower" combo "Type" +#: build/trans_presets.java:2398 +#, fuzzy +msgid "tower" +msgstr "Tårn" + +#: build/trans_presets.java:2398 +#, fuzzy +msgid "pole" +msgstr "Rolle" + +#: build/trans_presets.java:2399 +#, fuzzy +msgid "Tower reference" +msgstr "Indstillinger" + +#. item "Man Made/Power Tower" text "Tower reference" +#: build/trans_presets.java:2401 msgid "Power Line" msgstr "Strømkabel" @@ -19981,40 +20088,83 @@ #. -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2404 msgid "Edit Power Line" msgstr "Ret strømkabel" +#. item "Man Made/Power Line" label "Edit Power Line" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "Line type" +msgstr "type" + +#. item "Man Made/Power Line" combo "Line type" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "line" +msgstr "Rørledning" + +#: build/trans_presets.java:2405 +#, fuzzy +msgid "minor_line" +msgstr "motorvejsforbindelse" + #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2408 msgid "Voltage" msgstr "Spænding" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2398 -msgid "Amount of Wires" +#: build/trans_presets.java:2409 +#, fuzzy +msgid "Amount of Cables" msgstr "Antal kabler" -#. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2401 +#. item "Man Made/Power Line" text "Amount of Cables" +#: build/trans_presets.java:2410 +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:2410 +#, fuzzy +msgid "single" +msgstr "Vinkel" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "double" +msgstr "Petanque" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "triple" +msgstr "Stente" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "quad" +msgstr "kvæker" + +#: build/trans_presets.java:2413 msgid "Amenities" msgstr "Faciliteter" #. group "Amenities" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2414 msgid "Toilets" msgstr "Toiletter" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2409 build/trans_presets.java:2525 +#: build/trans_presets.java:2421 build/trans_presets.java:2537 msgid "Note" msgstr "" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2411 +#: build/trans_presets.java:2423 msgid "Post Box" msgstr "Postkasse" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2428 msgid "Telephone" msgstr "Telefon" @@ -20023,5 +20173,5 @@ #. -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2431 msgid "Edit Telephone" msgstr "Ret telefon" @@ -20029,5 +20179,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2422 build/trans_presets.java:2526 +#: build/trans_presets.java:2434 build/trans_presets.java:2538 msgid "Coins" msgstr "Mønter" @@ -20035,5 +20185,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2423 build/trans_presets.java:2527 +#: build/trans_presets.java:2435 build/trans_presets.java:2539 msgid "Notes" msgstr "Sedler" @@ -20041,5 +20191,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2424 build/trans_presets.java:2528 +#: build/trans_presets.java:2436 build/trans_presets.java:2540 msgid "Electronic purses and Charge cards" msgstr "" @@ -20047,5 +20197,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2425 build/trans_presets.java:2529 +#: build/trans_presets.java:2437 build/trans_presets.java:2541 msgid "Debit cards" msgstr "" @@ -20053,15 +20203,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2426 build/trans_presets.java:2530 +#: build/trans_presets.java:2438 build/trans_presets.java:2542 msgid "Credit cards" msgstr "Kreditkort" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2439 msgid "Telephone cards" msgstr "Telefonkort" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2429 +#: build/trans_presets.java:2441 msgid "Recycling" msgstr "Genbrug" @@ -20070,5 +20220,5 @@ #. -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2444 msgid "Edit Recycling station" msgstr "Ret genbrugsplads" @@ -20076,35 +20226,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2446 msgid "Batteries" msgstr "Batterier" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2435 +#: build/trans_presets.java:2447 msgid "Cans" msgstr "Dåser" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2448 msgid "Clothes" msgstr "Tøj" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2437 +#: build/trans_presets.java:2449 msgid "Glass" msgstr "Glas" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2450 msgid "Paper" msgstr "Papir" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2451 msgid "Scrap Metal" msgstr "Skrotjern" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2453 msgid "Bench" msgstr "Bænk" @@ -20113,31 +20263,31 @@ #. #. -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2456 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "stone" msgstr "" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "plastic" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "black" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "brown" msgstr "" @@ -20208,5 +20358,5 @@ #. #. -#: build/trans_presets.java:2446 build/trans_style.java:3063 +#: build/trans_presets.java:2458 build/trans_style.java:3063 #: build/trans_style.java:3071 build/trans_style.java:3079 #: build/trans_style.java:3087 build/trans_style.java:3135 @@ -20216,27 +20366,27 @@ msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "red" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "blue" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "white" msgstr "" -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2459 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2461 msgid "Hunting Stand" msgstr "Skydetelt" #. item -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2462 msgid "Edit Hunting Stand" msgstr "Ret skydetelt" @@ -20245,30 +20395,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2452 build/trans_presets.java:2914 +#: build/trans_presets.java:2464 build/trans_presets.java:2926 msgid "Height" msgstr "Højde" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "low" msgstr "lav" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "half" msgstr "halv" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "full" msgstr "fuld" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2466 msgid "Hide" msgstr "Skjul" -#: build/trans_presets.java:2455 +#: build/trans_presets.java:2467 msgid "Lock" msgstr "Lås" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2469 msgid "Fountain" msgstr "Springvand" @@ -20277,10 +20427,10 @@ #. -#: build/trans_presets.java:2460 +#: build/trans_presets.java:2472 msgid "Edit Fountain" msgstr "Ret springvand" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2476 msgid "Drinking Water" msgstr "Vandpost" @@ -20289,10 +20439,10 @@ #. -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2479 msgid "Edit Drinking Water" msgstr "Ret vandpost" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2471 +#: build/trans_presets.java:2483 msgid "Baby Hatch" msgstr "Babyluge" @@ -20300,33 +20450,33 @@ #. item #. -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2485 msgid "Edit Baby Hatch" msgstr "Ret babyluge" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2491 msgid "Shops" msgstr "Butikker" #. group "Shops" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2492 msgid "Supermarket" msgstr "Supermarked" #. item -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2493 msgid "Edit Supermarket" msgstr "Ret supermarked" -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2498 msgid "Chemist" msgstr "" #. item -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2499 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2504 msgid "Convenience Store" msgstr "Købmand" @@ -20334,9 +20484,9 @@ #. item #. -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2506 msgid "Edit Convenience Store" msgstr "Ret købmand" -#: build/trans_presets.java:2499 +#: build/trans_presets.java:2511 msgid "Kiosk" msgstr "Kiosk" @@ -20344,27 +20494,27 @@ #. item #. -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2513 msgid "Edit Kiosk" msgstr "Ret kiosk" -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2518 msgid "Book Store" msgstr "" #. item -#: build/trans_presets.java:2507 +#: build/trans_presets.java:2519 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2524 msgid "Travel Agency" msgstr "" #. item -#: build/trans_presets.java:2513 +#: build/trans_presets.java:2525 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2518 +#: build/trans_presets.java:2530 msgid "Vending machine" msgstr "Automat" @@ -20372,5 +20522,5 @@ #. item #. -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2532 msgid "Edit Vending machine" msgstr "Ret automat" @@ -20378,88 +20528,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "Vending products" msgstr "Varer i automat" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_tickets" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "parking_tickets" msgstr "P-automat" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "food" msgstr "mad" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "drinks" msgstr "drikke" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "sweets" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "cigarettes" msgstr "cigaretter" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "photos" msgstr "billeder" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "animal_food" msgstr "dyremad" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "news_papers" msgstr "aviser" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "toys" msgstr "legetøj" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "stamps" msgstr "frimærker" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "SIM-cards" msgstr "SIM-kort" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "telephone_vouchers" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "condoms" msgstr "kondomer" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "tampons" msgstr "tamponer" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "excrement_bags" msgstr "høm-høm-pose" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2543 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2545 msgid "Butcher" msgstr "Slagter" @@ -20467,9 +20617,9 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2547 msgid "Edit Butcher" msgstr "Ret slagter" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2552 msgid "Baker" msgstr "Bager" @@ -20477,9 +20627,9 @@ #. item #. -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2554 msgid "Edit Baker" msgstr "Ret bager" -#: build/trans_presets.java:2547 +#: build/trans_presets.java:2559 msgid "Florist" msgstr "Blomsterhandler" @@ -20487,18 +20637,18 @@ #. item #. -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2561 msgid "Edit Florist" msgstr "Ret blomsterhandler" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2566 msgid "Organic" msgstr "" #. item -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2567 msgid "Edit Organic Shop" msgstr "" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2572 msgid "Alcohol" msgstr "Sprit" @@ -20506,54 +20656,54 @@ #. item #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2574 msgid "Edit Alcohol Shop" msgstr "Redigér spritbutik" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2579 msgid "Beverages" msgstr "Drikkevarer" #. item -#: build/trans_presets.java:2568 +#: build/trans_presets.java:2580 msgid "Edit Beverages Shop" msgstr "Redigér drikkevarebutik" -#: build/trans_presets.java:2573 +#: build/trans_presets.java:2585 msgid "Computer" msgstr "Computer" #. item -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2586 msgid "Edit Computer Shop" msgstr "Ret computerforretning" -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2591 msgid "Electronics" msgstr "Elektronik" #. item -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2592 msgid "Edit Electronics Shop" msgstr "Ret elektronikforretning" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2597 msgid "Hifi" msgstr "Hi-fi" #. item -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2598 msgid "Edit Hifi Shop" msgstr "Ret hi-fi-forhandler" -#: build/trans_presets.java:2591 +#: build/trans_presets.java:2603 msgid "Furniture" msgstr "Møbelforretning" #. item -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2604 msgid "Edit Furniture Shop" msgstr "Ret møbelforretning" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2609 msgid "Garden Centre" msgstr "Havecenter" @@ -20561,9 +20711,9 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2611 msgid "Edit Garden Centre" msgstr "Redigér havecenter" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2616 msgid "Hardware" msgstr "" @@ -20571,9 +20721,9 @@ #. item #. -#: build/trans_presets.java:2606 +#: build/trans_presets.java:2618 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2623 msgid "Do-it-yourself-store" msgstr "Gør-det-selv-butik" @@ -20581,54 +20731,54 @@ #. item #. -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2625 msgid "Edit Do-it-yourself-store" msgstr "Ret gør-det-selv-butik" -#: build/trans_presets.java:2618 +#: build/trans_presets.java:2630 msgid "Stationery" msgstr "" #. item -#: build/trans_presets.java:2619 +#: build/trans_presets.java:2631 msgid "Edit Stationery Shop" msgstr "" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2636 msgid "Hairdresser" msgstr "Frisør" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2637 msgid "Edit Hairdresser" msgstr "Ret frisør" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2642 msgid "Shoes" msgstr "Sko" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2643 msgid "Edit Shoe Shop" msgstr "Ret skobutik" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2648 msgid "Toys" msgstr "Legetøjsbutik" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2649 msgid "Edit Toy Shop" msgstr "Redigér legetøjsbutik" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2654 msgid "Video" msgstr "Video" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2655 msgid "Edit Video Shop" msgstr "Redigér videobutik" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2660 msgid "Dry Cleaning" msgstr "Kemisk renseri" @@ -20636,9 +20786,9 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2662 msgid "Edit Dry Cleaning" msgstr "Ret kemisk renseri" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2667 msgid "Laundry" msgstr "Vaskeri" @@ -20646,9 +20796,9 @@ #. item #. -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2669 msgid "Edit Laundry" msgstr "Ret vaskeri" -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2674 msgid "Outdoor" msgstr "" @@ -20656,28 +20806,28 @@ #. item #. -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2676 msgid "Edit Outdoor Shop" msgstr "" #. item -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2682 msgid "Edit Sports Shop" msgstr "Ret sportsbutik" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2687 msgid "Optician" msgstr "Optiker" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2688 msgid "Edit Optician" msgstr "Ret optiker" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2695 msgid "Cash" msgstr "Penge" #. group "Cash" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2696 msgid "Bank" msgstr "Bank" @@ -20685,14 +20835,14 @@ #. item #. -#: build/trans_presets.java:2686 +#: build/trans_presets.java:2698 msgid "Edit Bank" msgstr "Ret bank" -#: build/trans_presets.java:2691 build/trans_presets.java:2700 +#: build/trans_presets.java:2703 build/trans_presets.java:2712 msgid "Automated Teller Machine" msgstr "Pengeautomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2705 msgid "Money Exchange" msgstr "Vekselkontor" @@ -20700,5 +20850,5 @@ #. item #. -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2707 msgid "Edit Money Exchange" msgstr "Ret vekselkontor" @@ -20706,15 +20856,15 @@ #. item #. -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2714 msgid "Edit Automated Teller Machine" msgstr "Ret pengeautomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2719 msgid "Health" msgstr "Sundhed" #. group "Health" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2720 msgid "Doctors" msgstr "Lægehus" @@ -20722,18 +20872,18 @@ #. item #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2722 msgid "Edit Doctors" msgstr "Ret lægehus" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2727 msgid "Dentist" msgstr "Tandlæge" #. item -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2728 msgid "Edit Dentist" msgstr "Ret tandlæge" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2733 msgid "Pharmacy" msgstr "Apotek" @@ -20741,5 +20891,5 @@ #. item #. -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2735 msgid "Edit Pharmacy" msgstr "Ret apotek" @@ -20747,9 +20897,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2737 msgid "Dispensing" msgstr "Håndkøb" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2741 msgid "Hospital" msgstr "Hospital" @@ -20757,10 +20907,10 @@ #. item #. -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2743 msgid "Edit Hospital" msgstr "Ret Hospital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2747 msgid "Emergency Access Point" msgstr "" @@ -20769,5 +20919,5 @@ #. -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2750 msgid "Edit Emergency Access Point" msgstr "" @@ -20776,20 +20926,20 @@ #. #. -#: build/trans_presets.java:2741 +#: build/trans_presets.java:2753 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2742 +#: build/trans_presets.java:2754 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2756 msgid "Phone Number" msgstr "Telefonnummer" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2757 msgid "(Use international code, like +12-345-67890)" msgstr "(brug forvalgskode, fx +12-345-67890)" @@ -20797,5 +20947,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2760 msgid "Veterinary" msgstr "Dyrlæge" @@ -20804,59 +20954,59 @@ #. -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2763 msgid "Edit Veterinary" msgstr "Ret dyrlæge" -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2770 msgid "Geography" msgstr "" #. group "Places" -#: build/trans_presets.java:2760 +#: build/trans_presets.java:2772 msgid "Continent" msgstr "Kontinent" #. item -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2773 msgid "Edit Continent" msgstr "Ret et kontinent" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2766 +#: build/trans_presets.java:2778 msgid "Country" msgstr "Land" #. item -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2779 msgid "Edit Country" msgstr "Ret land" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2784 msgid "State" msgstr "Stat" #. item -#: build/trans_presets.java:2773 +#: build/trans_presets.java:2785 msgid "Edit State" msgstr "Ret stat" #. item "Places/State" text "Name" -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2790 msgid "Region" msgstr "Region" #. item -#: build/trans_presets.java:2779 +#: build/trans_presets.java:2791 msgid "Edit Region" msgstr "Ret region" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2796 msgid "County" msgstr "Amt" #. item -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2797 msgid "Edit County" msgstr "Ret amt" @@ -20864,15 +21014,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2803 msgid "City" msgstr "By" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2804 msgid "Edit City" msgstr "Ret by" #. item "Places/City" text "Name" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2809 msgid "Town" msgstr "Mindre by" @@ -20880,10 +21030,10 @@ #. item #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2811 msgid "Edit Town" msgstr "Ret mindre by" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2804 +#: build/trans_presets.java:2816 msgid "Suburb" msgstr "Forstad" @@ -20891,25 +21041,25 @@ #. item #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2818 msgid "Edit Suburb" msgstr "Ret forstad" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2823 msgid "Village" msgstr "By" #. item -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2824 msgid "Edit Village" msgstr "Ret by" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2817 +#: build/trans_presets.java:2829 msgid "Hamlet" msgstr "Landsby" #. item -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2830 msgid "Edit Hamlet" msgstr "Ret landsby" @@ -20917,5 +21067,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2824 +#: build/trans_presets.java:2836 msgid "Locality" msgstr "Egn" @@ -20923,10 +21073,10 @@ #. item #. -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2838 msgid "Edit Locality" msgstr "Ret lokalitet" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2843 msgid "Island" msgstr "Ø" @@ -20934,10 +21084,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2845 msgid "Edit Island" msgstr "Ret ø" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2838 +#: build/trans_presets.java:2850 msgid "Islet" msgstr "" @@ -20945,5 +21095,5 @@ #. item #. -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2852 msgid "Edit Islet" msgstr "" @@ -20951,5 +21101,5 @@ #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2858 msgid "Cave Entrance" msgstr "Huleindgang" @@ -20957,10 +21107,10 @@ #. item #. -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2860 msgid "Edit Cave Entrance" msgstr "Ret huleindgang" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2864 msgid "Peak" msgstr "Tinde" @@ -20968,10 +21118,10 @@ #. item #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2866 msgid "Edit Peak" msgstr "Ret tinde" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2871 msgid "Glacier" msgstr "Gletsjer" @@ -20979,10 +21129,10 @@ #. item #. -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2873 msgid "Edit Glacier" msgstr "Ret gletsjer" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2878 msgid "Volcano" msgstr "Vulkan" @@ -20990,70 +21140,70 @@ #. item #. -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2880 msgid "Edit Volcano" msgstr "Ret vulkan" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2886 msgid "Boundaries" msgstr "Grænser" #. group "Boundaries" -#: build/trans_presets.java:2875 +#: build/trans_presets.java:2887 msgid "National" msgstr "National" #. item -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2888 msgid "Edit National Boundary" msgstr "Ret landegrænser" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2881 +#: build/trans_presets.java:2893 msgid "Administrative" msgstr "Administrativt" #. item -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2894 msgid "Edit Administrative Boundary" msgstr "Ret administrativ grænse" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2887 +#: build/trans_presets.java:2899 msgid "Civil" msgstr "Civil" #. item -#: build/trans_presets.java:2888 +#: build/trans_presets.java:2900 msgid "Edit Civil Boundary" msgstr "Ret civil-grænse" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2893 +#: build/trans_presets.java:2905 msgid "Political" msgstr "Politisk" #. item -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2906 msgid "Edit Political Boundary" msgstr "Ret politisk grænse" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2911 msgid "National park" msgstr "Nationalpark" #. item -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2912 msgid "Edit National Park Boundary" msgstr "Ret grænser for nationalpark" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2918 msgid "Land use" msgstr "Brug af land" #. group "Land use" -#: build/trans_presets.java:2907 +#: build/trans_presets.java:2919 msgid "Tree" msgstr "Træ" @@ -21062,15 +21212,15 @@ #. -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2922 msgid "Edit Tree" msgstr "Ret et træ" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2915 +#: build/trans_presets.java:2927 msgid "Botanical Name" msgstr "Botanisk navn" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2929 msgid "Wood" msgstr "Skov" @@ -21079,5 +21229,5 @@ #. -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2932 msgid "Edit Wood" msgstr "Ret skov" @@ -21085,17 +21235,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "coniferous" msgstr "Nåleskov" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "deciduous" msgstr "Løvskov" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "mixed" msgstr "blandet" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2937 msgid "Forest" msgstr "Skov" @@ -21104,14 +21254,14 @@ #. -#: build/trans_presets.java:2928 +#: build/trans_presets.java:2940 msgid "Edit Forest Landuse" msgstr "Ret skovområde" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2946 msgid "Nature Reserve" msgstr "Naturreservat" #. item -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2947 msgid "Edit Nature Reserve" msgstr "Ret naturreservat" @@ -21119,25 +21269,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2952 msgid "Scree" msgstr "Ur" #. item -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2953 msgid "Edit Scree" msgstr "Ret ur" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2957 msgid "Scrub" msgstr "Krat" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:2958 msgid "Edit Scrub" msgstr "Ret krat" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2962 msgid "Fell" msgstr "Højdedrag" @@ -21145,10 +21295,10 @@ #. item #. -#: build/trans_presets.java:2952 +#: build/trans_presets.java:2964 msgid "Edit Fell" msgstr "Ret højdedrag" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2968 msgid "Heath" msgstr "Hede" @@ -21156,5 +21306,5 @@ #. item #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2970 msgid "Edit Heath" msgstr "Ret hede" @@ -21162,5 +21312,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2975 msgid "Farmyard" msgstr "Gårdsplads" @@ -21169,45 +21319,45 @@ #. -#: build/trans_presets.java:2966 +#: build/trans_presets.java:2978 msgid "Edit Farmyard Landuse" msgstr "Ret gårdsplads" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2983 msgid "Farmland" msgstr "" #. item -#: build/trans_presets.java:2972 +#: build/trans_presets.java:2984 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2977 +#: build/trans_presets.java:2989 msgid "Meadow" msgstr "Eng" #. item -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2990 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:2995 msgid "Vineyard" msgstr "Vingård" #. item -#: build/trans_presets.java:2984 +#: build/trans_presets.java:2996 msgid "Edit Vineyard Landuse" msgstr "Ret vingård" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3001 msgid "Allotments" msgstr "Kolonihaver" #. item -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3002 msgid "Edit Allotments Landuse" msgstr "Ret kolonihave-område" @@ -21215,25 +21365,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3008 msgid "Garden" msgstr "Have" #. item -#: build/trans_presets.java:2997 +#: build/trans_presets.java:3009 msgid "Edit Garden" msgstr "Ret have" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3013 msgid "Grass" msgstr "Græs" #. item -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3014 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3019 msgid "Village Green" msgstr "" @@ -21241,10 +21391,10 @@ #. item #. -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3021 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3026 msgid "Common" msgstr "" @@ -21252,20 +21402,20 @@ #. item #. -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3028 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3032 msgid "Park" msgstr "Park" #. item -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3033 msgid "Edit Park" msgstr "Ret park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3037 msgid "Recreation Ground" msgstr "Rekreativt område" @@ -21273,5 +21423,5 @@ #. item #. -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3039 msgid "Edit Recreation Ground Landuse" msgstr "Ret rekreativt område" @@ -21279,15 +21429,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3033 +#: build/trans_presets.java:3045 msgid "Residential area" msgstr "Beboelseområde" #. item -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3046 msgid "Edit Residential Landuse" msgstr "" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3051 msgid "Graveyard" msgstr "Kirkegård" @@ -21295,9 +21445,9 @@ #. item #. -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3053 msgid "Edit Graveyard" msgstr "Ret kirkegård" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3059 msgid "Cemetery" msgstr "Kirkegård" @@ -21305,39 +21455,39 @@ #. item #. -#: build/trans_presets.java:3049 +#: build/trans_presets.java:3061 msgid "Edit Cemetery Landuse" msgstr "Ret kirkegård" -#: build/trans_presets.java:3056 +#: build/trans_presets.java:3068 msgid "Retail" msgstr "Detailhandel" #. item -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3069 msgid "Edit Retail Landuse" msgstr "Ret område for detailhandel" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3062 +#: build/trans_presets.java:3074 msgid "Commercial" msgstr "" #. item -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3075 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3068 +#: build/trans_presets.java:3080 msgid "Industrial" msgstr "Industri" #. item -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3081 msgid "Edit Industrial Landuse" msgstr "Ret industri-område" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3086 msgid "Railway land" msgstr "" @@ -21345,15 +21495,15 @@ #. item #. -#: build/trans_presets.java:3076 +#: build/trans_presets.java:3088 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3081 +#: build/trans_presets.java:3093 msgid "Military" msgstr "Militært område" #. item -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3094 msgid "Edit Military Landuse" msgstr "Ret militært område" @@ -21361,55 +21511,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3100 msgid "Construction area" msgstr "Byggeplads" #. item -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3101 msgid "Edit Construction Landuse" msgstr "Ret område for byggeplads" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3094 +#: build/trans_presets.java:3106 msgid "Brownfield" msgstr "" #. item -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3107 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3100 +#: build/trans_presets.java:3112 msgid "Greenfield" msgstr "" #. item -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3113 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3118 msgid "Landfill" msgstr "" #. item -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3119 msgid "Edit Landfill Landuse" msgstr "" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3124 msgid "Quarry" msgstr "Stenbrud" #. item -#: build/trans_presets.java:3113 +#: build/trans_presets.java:3125 msgid "Edit Quarry Landuse" msgstr "Ret stenbrudsområde" #. group "Relations" -#: build/trans_presets.java:3122 +#: build/trans_presets.java:3134 msgid "Multipolygon" msgstr "Multipolygon" @@ -21419,5 +21569,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:3126 +#: build/trans_presets.java:3138 msgid "Edit Multipolygon" msgstr "Ret multipolygon" @@ -21426,10 +21576,10 @@ #. #. -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3144 msgid "outer segment" msgstr "ydre segment" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3145 msgid "inner segment" msgstr "indre segment" @@ -21437,5 +21587,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3148 msgid "Turn restriction" msgstr "" @@ -21444,5 +21594,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3151 msgid "Edit Turn Restriction" msgstr "" @@ -21450,34 +21600,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_straight_on" msgstr "" @@ -21486,15 +21636,15 @@ #. #. -#: build/trans_presets.java:3146 +#: build/trans_presets.java:3158 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3159 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3148 +#: build/trans_presets.java:3160 msgid "to way" msgstr "" @@ -21502,5 +21652,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3151 +#: build/trans_presets.java:3163 msgid "Route" msgstr "Rute" @@ -21509,5 +21659,5 @@ #. -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3166 msgid "Edit Route" msgstr "Ret rute" @@ -21515,5 +21665,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "Route type" msgstr "" @@ -21585,5 +21735,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:233 +#: build/trans_presets.java:3168 build/trans_style.java:233 #: build/trans_style.java:683 build/trans_style.java:906 #: build/trans_style.java:914 build/trans_style.java:922 @@ -21592,17 +21742,17 @@ msgstr "cykel" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "road" msgstr "vej" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ferry" msgstr "færge" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ski" msgstr "ski" @@ -21655,5 +21805,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:247 +#: build/trans_presets.java:3168 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -21662,13 +21812,13 @@ msgstr "fod" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "hiking" msgstr "vandre" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "tram" msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "detour" msgstr "omvej" @@ -21682,10 +21832,10 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:1206 +#: build/trans_presets.java:3168 build/trans_style.java:1206 msgid "subway" msgstr "undergrundsbane" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3159 +#: build/trans_presets.java:3171 msgid "Symbol description" msgstr "Symbol beskrivelse" @@ -21693,31 +21843,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3174 msgid "Network" msgstr "Netværk" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "proposed" msgstr "foreslået" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "alternate" msgstr "" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "temporary" msgstr "midlertidig" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "connection" msgstr "forbindelse" -#: build/trans_presets.java:3165 +#: build/trans_presets.java:3177 msgid "Color (hex)" msgstr "Farve (hex)" @@ -21726,30 +21876,30 @@ #. #. -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3180 msgid "route segment" msgstr "rute-segment" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3181 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3170 +#: build/trans_presets.java:3182 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3183 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3172 +#: build/trans_presets.java:3184 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3173 +#: build/trans_presets.java:3185 msgid "backward halt point" msgstr "" @@ -25886,4 +26036,23 @@ msgid "Czech UHUL:ORTOFOTO" msgstr "" + +#~ msgid "Combine ways with different memberships?" +#~ msgstr "Sammensæt veje med forskellige tilhørsforhold?" + +#~ msgid "Combine Anyway" +#~ msgstr "Sammensæt alligevel" + +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "" +#~ "De valgte veje hører til forskellige relationer. Vil du stadigvæk " +#~ "sammensætte dem?" + +#~ msgid "Purging 1 primitive" +#~ msgstr "Fjerner 1 primitiv" + +#~ msgid "Empty member in relation." +#~ msgstr "Tomt medlem i relation." #~ msgid "Move" Index: /applications/editors/josm/i18n/po/de.po =================================================================== --- /applications/editors/josm/i18n/po/de.po (revision 17821) +++ /applications/editors/josm/i18n/po/de.po (revision 17822) @@ -9,7 +9,7 @@ "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-22 17:52+0200\n" -"PO-Revision-Date: 2009-09-22 15:08+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-09-28 16:38+0200\n" +"PO-Revision-Date: 2009-09-28 11:23+0000\n" +"Last-Translator: vsandre \n" "Language-Team: Deutsch\n" "MIME-Version: 1.0\n" @@ -17,5 +17,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-22 15:46+0000\n" +"X-Launchpad-Export-Date: 2009-09-28 14:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -69,8 +69,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250 @@ -93,9 +93,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -128,6 +128,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -144,7 +144,7 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:172 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 @@ -157,5 +157,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 @@ -343,6 +342,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -352,6 +350,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 @@ -361,5 +359,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -370,5 +368,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180 @@ -377,5 +375,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -470,9 +468,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -504,10 +502,9 @@ msgstr "Bitte mindestens vier Knotenpunkte auswählen." -#. FIXME: not sure whether this fits in a dialog #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:85 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -617,5 +614,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 #, java-format msgid "File: {0}" @@ -637,38 +634,22 @@ msgstr "Offene Änderungssätze herunterladen..." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine Way" msgstr "Weg verbinden" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 msgid "Combine several ways into one." msgstr "Mehrere Wege zu einem verbinden." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 -msgid "Combine ways with different memberships?" -msgstr "Wege mit unterschiedlicher Mitgliedschaft verbinden?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -msgid "Combine Anyway" -msgstr "Trotzdem verbinden" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" -"Die ausgewählten Wege sind Elemente unterschiedlicher Relationen. Sollen sie " -"wirklich verbunden werden?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 msgid "Change directions?" msgstr "Richtungen ändern?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Reverse and Combine" msgstr "Drehen und Verbinden" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -678,5 +659,5 @@ "Möchten Sie, dass einige Richtungen gedreht werden?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -686,10 +667,10 @@ "Reihenfolge gebracht werden)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 #, java-format msgid "Combine {0} ways" msgstr "{0} Wege verbinden" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 msgid "Please select at least two ways to combine." msgstr "Bitte wählen Sie mindestens zwei Wege zum Verbinden." @@ -736,6 +717,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -800,5 +780,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -829,5 +809,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307 #, java-format msgid "There were {0} conflicts during import." @@ -845,5 +824,4 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Duplicate" @@ -874,10 +852,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:209 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Als GPX exportieren..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:208 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Die Daten ins GPX-Format exportieren." @@ -888,8 +866,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -954,5 +932,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 @@ -996,6 +974,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1085,18 +1062,18 @@ msgstr "Aktuelle Ebene mit einer anderen zusammenführen" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge Nodes" msgstr "Knotenpunkte vereinigen" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 msgid "Merge nodes into the oldest one." msgstr "Mehrere Knotenpunkte zum ältesten vereinigen." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 msgid "Please select at least two nodes to merge." msgstr "Bitte mindestens zwei Knotenpunkte zum Vereinigen wählen." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -1104,5 +1081,5 @@ "gelöscht werden." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 #, java-format msgid "Merge {0} nodes" @@ -1174,5 +1151,4 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350 msgid "New" msgstr "Neu" @@ -1354,10 +1330,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Speichern" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Aktuelle Daten speichern." @@ -1414,10 +1390,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Speichern unter..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Aktuelle Daten in einer neuen Datei speichern." @@ -1461,5 +1437,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:961 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888 @@ -1714,14 +1690,14 @@ msgstr "Auswahl leer" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 msgid "Upload to OSM..." msgstr "Zum OSM-Server hochladen..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload all changes to the OSM server." msgstr "Alle Änderungen zum OSM-Server hochladen." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 #, java-format msgid "" @@ -1732,23 +1708,23 @@ "gelöst werden müssen." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Nichts geändert. Erfassen Sie erst einige Daten." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:171 msgid "No changes to upload." msgstr "Keine Änderungen zum Hochladen vorhanden." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223 #, java-format msgid "Synchronize {0} {1} only" msgstr "Nur {0} {1} synchronisieren" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 msgid "Synchronize entire dataset" msgstr "Ganzen Datensatz synchronisieren" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:228 #, java-format msgid "" @@ -1771,17 +1747,17 @@ "weiterzuarbeiten." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:283 msgid "Conflict detected" msgstr "Konflikt festgestellt" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:257 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 #, java-format msgid "Unexpected return value. Got {0}." msgstr "Unerwarteter Rückgabewert: {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:272 #, java-format msgid "" @@ -1797,5 +1773,5 @@ "weiterzuarbeiten." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:306 #, java-format msgid "" @@ -1809,36 +1785,40 @@ "html>" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 msgid "Changeset closed" msgstr "Änderungssatz geschlossen" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "Warnung: Die Fehlermeldung \"{0}\" passt nicht in das Muster \"{1}\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "" -"Fehler-Kopfzeile \"{0}\" entspricht nicht dem erwarteten Muster \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:425 #, java-format msgid "Uploading failed.
{0}" msgstr "Hochladen fehlgeschlagen.
{0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:434 msgid "Upload to OSM API failed" msgstr "Hochladen zu OSM-API fehlgeschlagen" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457 msgid "Updating primitive" msgstr "Objekt aktualisieren" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:514 #, java-format msgid "Uploading data for layer ''{0}''" msgstr "Daten für Ebene \"{0}\" hochladen" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1926,13 +1906,13 @@ msgstr "Langsamer abspielen" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34 msgid "Downloading GPS data" msgstr "Hole GPS-Daten" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57 msgid "Downloaded GPX Data" msgstr "Heruntergeladene GPS-Daten" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87 msgid "Raw GPS data" msgstr "GPS-Rohdaten" @@ -1949,4 +1929,9 @@ "Der Fehler wird ignoriert, da das Herunterladen abgebrochen wurde. Die " "Fehlermeldung war: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 +#, fuzzy +msgid "No data found in this area." +msgstr "Keine Daten im Gerät gefunden." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2676,11 +2661,9 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 -#, fuzzy, java-format +#, java-format msgid "" "Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitive ''{1}''." msgstr "" -"Warnung: Ebene \"{0}\" existiert nicht mehr. Konflikt für Objekt \"{1}\" " -"konnte nicht entfernt werden." #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70 @@ -2689,9 +2672,9 @@ msgstr "Konflikt für \"{0}\" hinzufügen" -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 +#, fuzzy, java-format +msgid "" +"Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" "Kommando \"{0}\" kann nicht rückgängig gemacht werden, da die Ebene \"{1}\" " @@ -2742,5 +2725,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Delete from relation" msgstr "Aus der Relation entfernen" @@ -2797,14 +2780,15 @@ msgstr[1] "{0} Knoten bewegen" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 -msgid "Purging 1 primitive" -msgstr "1 Objekt entfernen" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 -#, java-format -msgid "removing reference from way {0}" -msgstr "Entferne Referenz aus Weg {0}" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 +#, fuzzy, java-format +msgid "Purged object ''{0}''" +msgstr "Objekte {0} verschieben" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 +#, fuzzy, java-format +msgid "Purged {0} objects" +msgstr "Ändere {0} Objekt" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 #, java-format msgid "" @@ -2815,7 +2799,7 @@ "werden aber min. 2 Knotenpunkte benötigt." -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203 -#, java-format -msgid "removing reference from relation {0}" +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 +#, fuzzy, java-format +msgid "Removing reference from relation {0}" msgstr "Entferne Referenz aus Relation {0}" @@ -2824,4 +2808,11 @@ msgid "Resolve conflicts in member list of relation {0}" msgstr "Konflikte in der Elementenliste für Relation {0} auflösen" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +msgstr "" +"Kommando \"{0}\" kann nicht rückgängig gemacht werden, da die Ebene \"{1}\" " +"nicht mehr existiert." #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 @@ -3130,5 +3121,5 @@ #, java-format msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''." -msgstr "Parameter ''{0}'' größer als 0 erwartet. Der Wert ist ''{1}''." +msgstr "Parameter ''{0}'' größer als 0 erwartet. Erhaltener Wert ''{1}''." #. translators notes must be in front @@ -3185,24 +3176,24 @@ msgstr "F" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Error: {0}" msgstr "Fehler: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Warning: {0}" msgstr "Warnung: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "ID >= 0 erwartet, jedoch {0} erhalten." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 msgid "A primitive with ID = 0 can't be invisible." msgstr "Ein Objekt mit ID=0 darf nicht unsichtbar sein" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3210,5 +3201,5 @@ msgstr "ID >= 0 erwartet, jedoch {0} erhalten." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3239,6 +3230,6 @@ "Schlüssel mit mehreren Werten enthält" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:244 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3259,5 +3250,5 @@ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''." msgstr "" -"Der Parameter \"{0}\" muss im Bereich 0 bis {1} sein. Er ist aber \"{2}\"." +"Der Parameter \"{0}\" muss im Bereich 0 bis {1} liegen, ist aber \"{2}\"." #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180 @@ -3298,120 +3289,113 @@ msgstr "Multipolygon-Weg ''{0}'' ist nicht geschlossen." -#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed -#. TODO Remove useless nullcheck when RelationMember.member is encalupsed -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855 -msgid "Empty member in relation." -msgstr "Leeres Element in der Relation." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:850 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Gelöschtes Element ''{0}'' in der Relation." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:861 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Weg ''{0}'' mit weniger als zwei Knoten." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 msgid "More than one \"from\" way found." msgstr "Mehr als ein Weg mit \"from\" gefunden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:607 msgid "More than one \"to\" way found." msgstr "Mehr als ein Weg mit \"to\" gefunden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:613 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627 msgid "More than one \"via\" found." msgstr "Mehr als ein Element mit \"via\" gefunden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:632 #, java-format msgid "Unknown role ''{0}''." msgstr "Unbekannte Role \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Unbekannter Elementtyp für \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:641 msgid "No \"from\" way found." msgstr "Kein \"from\"-Weg gefunden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645 msgid "No \"to\" way found." msgstr "Kein \"to\"-Weg gefunden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:649 msgid "No \"via\" node or way found." msgstr "Kein \"via\"-Knoten oder Weg gefunden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:658 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Knoten." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:662 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "Der \"to\"-Weg beginnt oder endet nicht an dem \"via\"-Knoten." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Weg." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Weg." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816 #, java-format msgid "Style for restriction {0} not found." msgstr "Kein Zeichenstil für Abbiegeregel {0} gefunden." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:870 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "\"{0}\" ist keine sinnvolle Rolle für den Weg \"{1}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:882 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Nicht-Weg ''{0}'' im Multipolygon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:940 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Kein äußerer Weg im Multipolygon ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1029 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Die Wege ''{0}'' und {1}'' kreuzen sich." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1041 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Innerer Weg \"{0}\" ist außerhalb." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1094 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Zeichenstil des inneren Weges''{0}'' entspricht dem Multipolygon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1120 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Zeichenstil für den äußeren Weg ''{0}'' stimmt nicht überein." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1324 msgid "untagged" msgstr "Ohne Merkmale" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1325 msgid "text" msgstr "Text" @@ -3435,5 +3419,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:249 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 @@ -3444,5 +3428,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 @@ -3471,5 +3455,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:169 msgid "background" msgstr "Hintergrund" @@ -3568,5 +3552,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "railway" msgstr "Eisenbahn" @@ -3622,9 +3606,14 @@ msgstr "Fehlerhafte Anfrage" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +#, fuzzy +msgid "Not Found" +msgstr "Nicht verbunden" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 msgid "Unknown host" msgstr "Rechner unbekannt" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:247 msgid "Primitive already deleted" msgstr "Objekt bereits gelöscht" @@ -4993,5 +4982,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -5207,43 +5196,43 @@ msgstr "Element von" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 msgid "Add Properties" msgstr "Eigenschaften hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 msgid "Add a new key/value pair to all objects" msgstr "Neues Paar aus Schlüssel und Wert zu allen Objekten hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 msgid "Edit Properties" msgstr "Eigenschaften bearbeiten" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 msgid "Edit the value of the selected key for all objects" msgstr "Den Wert des Schlüssels für alle Objekte bearbeiten" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Eigenschaften: {0} / Mitgliedschaften: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 msgid "Properties / Memberships" msgstr "Eigenschaften / Mitgliedschaften" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 msgid "Change relation" msgstr "Relation ändern" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Auswahl wirklich aus Relation {0} entfernen?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:855 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 msgid "Delete the selected key in all objects" msgstr "Den gewählten Schlüssel von allen Objekten entfernen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 msgid "Delete Properties" msgstr "Eigenschaften entfernen" @@ -5253,6 +5242,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168 -#: build/trans_presets.java:3121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 +#: build/trans_presets.java:3133 msgid "Relations" msgstr "Relationen" @@ -5262,22 +5251,22 @@ msgstr "Eine Liste aller Relationen öffnen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:174 #, java-format msgid "Relations: {0}" msgstr "Relationen: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 msgid "Open an editor for the selected relation" msgstr "Editor für die gewählte Relation öffnen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:325 msgid "Delete the selected relation" msgstr "Gewählte Relation löschen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:363 msgid "Create a new relation" msgstr "Eine neue Relation erstellen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:400 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280 msgid "Create a copy of this relation and open it in another editor window" @@ -5285,4 +5274,9 @@ "Eine Kopie dieser Relation erstellen und diese in einem neuen Editorfenster " "öffnen." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 +#, fuzzy +msgid "Set the current selection to the list of selected relations" +msgstr "Die ausgewählte Relation bearbeiten" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5323,9 +5317,9 @@ msgstr "Auswahl: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 msgid "Undock the panel" msgstr "Ansicht separat darstellen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5334,5 +5328,5 @@ "Werkzeugleiste." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 msgid "Click to minimize/maximize the panel content" msgstr "Klicken Sie zum Minimieren oder Maximieren der Ansicht" @@ -5884,5 +5878,5 @@ #. group "Geography" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2771 msgid "Places" msgstr "Orte" @@ -6566,6 +6560,4 @@ #. item "Man Made/Windmill" label "Edit Windmill" #. -#. item "Man Made/Pipeline" label "Edit Pipeline" -#. #. item "Man Made/Wastewater Plant" label "Edit Wastewater Plant" #. @@ -6578,4 +6570,6 @@ #. item "Man Made/Surveillance" label "Edit Surveillance Camera" #. +#. item "Man Made/Power Station" label "Edit Power Station" +#. #. item "Amenities/Fountain" label "Edit Fountain" #. @@ -6900,57 +6894,57 @@ #: build/trans_presets.java:2250 build/trans_presets.java:2258 #: build/trans_presets.java:2290 build/trans_presets.java:2295 -#: build/trans_presets.java:2300 build/trans_presets.java:2305 -#: build/trans_presets.java:2311 build/trans_presets.java:2317 -#: build/trans_presets.java:2323 build/trans_presets.java:2331 -#: build/trans_presets.java:2337 build/trans_presets.java:2343 -#: build/trans_presets.java:2349 build/trans_presets.java:2355 -#: build/trans_presets.java:2365 build/trans_presets.java:2462 -#: build/trans_presets.java:2469 build/trans_presets.java:2483 -#: build/trans_presets.java:2489 build/trans_presets.java:2496 -#: build/trans_presets.java:2503 build/trans_presets.java:2509 -#: build/trans_presets.java:2515 build/trans_presets.java:2537 -#: build/trans_presets.java:2544 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2305 build/trans_presets.java:2310 +#: build/trans_presets.java:2316 build/trans_presets.java:2322 +#: build/trans_presets.java:2339 build/trans_presets.java:2345 +#: build/trans_presets.java:2351 build/trans_presets.java:2357 +#: build/trans_presets.java:2363 build/trans_presets.java:2373 +#: build/trans_presets.java:2380 build/trans_presets.java:2474 +#: build/trans_presets.java:2481 build/trans_presets.java:2495 +#: build/trans_presets.java:2501 build/trans_presets.java:2508 +#: build/trans_presets.java:2515 build/trans_presets.java:2521 +#: build/trans_presets.java:2527 build/trans_presets.java:2549 +#: build/trans_presets.java:2556 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2576 #: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2594 build/trans_presets.java:2601 -#: build/trans_presets.java:2608 build/trans_presets.java:2615 -#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2594 build/trans_presets.java:2600 +#: build/trans_presets.java:2606 build/trans_presets.java:2613 +#: build/trans_presets.java:2620 build/trans_presets.java:2627 #: build/trans_presets.java:2633 build/trans_presets.java:2639 -#: build/trans_presets.java:2645 build/trans_presets.java:2652 -#: build/trans_presets.java:2659 build/trans_presets.java:2666 -#: build/trans_presets.java:2672 build/trans_presets.java:2678 -#: build/trans_presets.java:2688 build/trans_presets.java:2697 -#: build/trans_presets.java:2712 build/trans_presets.java:2718 -#: build/trans_presets.java:2726 build/trans_presets.java:2733 -#: build/trans_presets.java:2753 build/trans_presets.java:2764 -#: build/trans_presets.java:2770 build/trans_presets.java:2776 +#: build/trans_presets.java:2645 build/trans_presets.java:2651 +#: build/trans_presets.java:2657 build/trans_presets.java:2664 +#: build/trans_presets.java:2671 build/trans_presets.java:2678 +#: build/trans_presets.java:2684 build/trans_presets.java:2690 +#: build/trans_presets.java:2700 build/trans_presets.java:2709 +#: build/trans_presets.java:2724 build/trans_presets.java:2730 +#: build/trans_presets.java:2738 build/trans_presets.java:2745 +#: build/trans_presets.java:2765 build/trans_presets.java:2776 #: build/trans_presets.java:2782 build/trans_presets.java:2788 -#: build/trans_presets.java:2795 build/trans_presets.java:2802 -#: build/trans_presets.java:2809 build/trans_presets.java:2815 -#: build/trans_presets.java:2821 build/trans_presets.java:2829 -#: build/trans_presets.java:2836 build/trans_presets.java:2843 -#: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2879 build/trans_presets.java:2885 +#: build/trans_presets.java:2794 build/trans_presets.java:2800 +#: build/trans_presets.java:2807 build/trans_presets.java:2814 +#: build/trans_presets.java:2821 build/trans_presets.java:2827 +#: build/trans_presets.java:2833 build/trans_presets.java:2841 +#: build/trans_presets.java:2848 build/trans_presets.java:2855 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2875 build/trans_presets.java:2882 #: build/trans_presets.java:2891 build/trans_presets.java:2897 -#: build/trans_presets.java:2903 build/trans_presets.java:2912 -#: build/trans_presets.java:2922 build/trans_presets.java:2931 -#: build/trans_presets.java:2937 build/trans_presets.java:2943 -#: build/trans_presets.java:2948 build/trans_presets.java:2954 -#: build/trans_presets.java:2960 build/trans_presets.java:2969 -#: build/trans_presets.java:2975 build/trans_presets.java:2981 +#: build/trans_presets.java:2903 build/trans_presets.java:2909 +#: build/trans_presets.java:2915 build/trans_presets.java:2924 +#: build/trans_presets.java:2934 build/trans_presets.java:2943 +#: build/trans_presets.java:2949 build/trans_presets.java:2955 +#: build/trans_presets.java:2960 build/trans_presets.java:2966 +#: build/trans_presets.java:2972 build/trans_presets.java:2981 #: build/trans_presets.java:2987 build/trans_presets.java:2993 #: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3012 build/trans_presets.java:3018 -#: build/trans_presets.java:3023 build/trans_presets.java:3030 -#: build/trans_presets.java:3037 build/trans_presets.java:3043 -#: build/trans_presets.java:3052 build/trans_presets.java:3060 -#: build/trans_presets.java:3066 build/trans_presets.java:3072 -#: build/trans_presets.java:3079 build/trans_presets.java:3085 -#: build/trans_presets.java:3092 build/trans_presets.java:3098 +#: build/trans_presets.java:3011 build/trans_presets.java:3017 +#: build/trans_presets.java:3024 build/trans_presets.java:3030 +#: build/trans_presets.java:3035 build/trans_presets.java:3042 +#: build/trans_presets.java:3049 build/trans_presets.java:3055 +#: build/trans_presets.java:3064 build/trans_presets.java:3072 +#: build/trans_presets.java:3078 build/trans_presets.java:3084 +#: build/trans_presets.java:3091 build/trans_presets.java:3097 #: build/trans_presets.java:3104 build/trans_presets.java:3110 -#: build/trans_presets.java:3116 build/trans_presets.java:3129 -#: build/trans_presets.java:3143 build/trans_presets.java:3157 +#: build/trans_presets.java:3116 build/trans_presets.java:3122 +#: build/trans_presets.java:3128 build/trans_presets.java:3141 +#: build/trans_presets.java:3155 build/trans_presets.java:3169 msgid "Name" msgstr "Name" @@ -7017,5 +7011,4 @@ msgstr "Änderungssätze schließen" -#. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 msgid "Close the selected open changesets" @@ -7043,15 +7036,15 @@ msgstr "Dateinamen wählen" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "Yes" msgstr "Ja" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "No" msgstr "Nein" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47 #, java-format msgid "Layer ''{0}'' has modifications which should be uploaded to the server." @@ -7060,10 +7053,10 @@ "sollen." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49 #, java-format msgid "Layer ''{0}'' has no modifications to be uploaded." msgstr "Ebene \"{0}\" enthält keine Änderungen zum Hochladen." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60 #, java-format msgid "" @@ -7074,23 +7067,23 @@ "gespeichert werden sollten." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62 #, java-format msgid "Layer ''{0}'' has no modifications to be saved." msgstr "Ebene \"{0}\" enthält Änderungen, die gespeichert werden sollten." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80 msgid "No file associated with this layer" msgstr "Keine Datei ist mit dieser Ebene verknüpft" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:83 msgid "Please select a file" msgstr "Bitte wählen Sie eine Datei" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:86 #, java-format msgid "Layer ''{0}'' is not backed by a file" msgstr "Ebene \"{0}\" ist mit keiner Datei verknüpft" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:101 #, java-format msgid "File ''{0}'' is not writable. Please enter another file name." @@ -7099,6 +7092,6 @@ "Dateinamen." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:115 #, java-format msgid "Select to upload layer ''{0}'' to the server ''{1}''" @@ -7209,5 +7202,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -msgid "Save and Exit" +#, fuzzy +msgid "Save/Upload and Exit" msgstr "Speichern und Beenden" @@ -7219,5 +7213,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -msgid "Save and Delete" +#, fuzzy +msgid "Save/Upload and Delete" msgstr "Speichern und Löschen" @@ -7234,7 +7229,8 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481 +#, fuzzy msgid "" "An upload and/or save operation of one layer with modifications
was " -"cancelled or has been failed." +"cancelled or has failed." msgstr "" "Ein Hochlade- und/oder Speichervorgang einer Ebene mit " @@ -7322,6 +7318,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:891 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:921 msgid "Tags of new changeset" msgstr "Merkmale des neuen Änderungssatzes" @@ -7394,5 +7390,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617 msgid "Provide a brief comment for the changes you are uploading:" -msgstr "Angabe eines kurzen Kommentars über die hochzuladenden Änderungen:" +msgstr "Ein kurzer Kommentar über die hochzuladenden Änderungen:" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672 @@ -7421,7 +7417,6 @@ "Auswählen, um den Änderungssatz nach dem nächsten Hochladen zu schließen" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:909 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:933 #, java-format msgid "Tags of changeset {0}" @@ -7429,48 +7424,48 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:949 msgid "Load the list of your open changesets from the server" msgstr "Liste Ihrer offenen Änderungssätze vom Server laden" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:963 msgid "Close the currently selected open changeset" msgstr "Ausgewählten offenen Änderungssatz schließen" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1011 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106 msgid "Preparing primitives to upload ..." msgstr "Objekte zum Hochladen vorbereiten..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Bilder für {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "GPX lesen..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Keine Zeit für Punkt {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Zeit \"{0}\" vom Punkt {1} x {2} konnte nicht gelesen werden" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325 msgid "No images with readable timestamps found." msgstr "Keine Bilder mit lesbaren Zeitstempel gefunden." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format @@ -7478,29 +7473,29 @@ msgstr "Einlesen {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:402 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246 msgid "Geotagged Images" msgstr "Georeferenzierte Bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:587 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "GPS start: {0}" msgstr "GPS Start: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 #, java-format msgid "GPS end: {0}" msgstr "GPS Ende: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594 #, java-format msgid "current delta: {0}s" msgstr "Aktueller Unterschied: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595 msgid "timezone difference: " msgstr "Zeitzonen Unterschied: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284 msgid "image" @@ -7509,14 +7504,14 @@ msgstr[1] "Bilder" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #, java-format msgid "{0} within the track." msgstr "{0} innerhalb der GPS-Spur." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680 msgid "Sync clock" msgstr "Uhrzeit synchronisieren" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7524,32 +7519,32 @@ msgstr "JPEG-Bilder (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:734 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Das Datum in der Datei \"{0}\" konnte nicht verarbeitet werden." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Keine EXIF-Zeitinformationen in der Datei \\\"{0}\\\" enthalten." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 msgid "Image" msgstr "Bild" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:752 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Angezeigtes Datum eingeben (mm/tt/jjjj HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759 msgid "GPS unit timezone (difference to photo)" msgstr "Zeitzone des GPS-Geräts (Unterschied zum Foto)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:767 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771 msgid "Synchronize Time with GPS Unit" msgstr "Zeit mit GPS-Gerät synchronisieren" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:790 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 msgid "Time entered could not be parsed." msgstr "Die eingegebene Zeit konnte nicht eingelesen werden." @@ -7633,5 +7628,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 #, java-format msgid "Name: {0}" @@ -7654,5 +7649,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3160 +#: build/trans_presets.java:3172 msgid "Description" msgstr "Beschreibung" @@ -7708,5 +7703,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:587 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 @@ -7775,43 +7770,66 @@ "der GPS-Spur entfernt waren, wurden ignoriert." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:105 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:107 #, java-format msgid "Data Layer {0}" msgstr "Datenebene {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 msgid "outside downloaded area" msgstr "Außerhalb des heruntergeladenen Bereichs" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:252 #, java-format msgid "version {0}" msgstr "Version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:289 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:290 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:389 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 +#, fuzzy, java-format +msgid "There was {0} conflict detected." +msgid_plural "There were {0} conflicts detected." +msgstr[0] "Es traten {0} Konflikte während des Imports auf." +msgstr[1] "Es traten {0} Konflikte während des Imports auf." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 +#, java-format +msgid "" +"{0} object has been purged from the local dataset because it is deleted on " +"the server." +msgid_plural "" +"{0} objects have been purged from the local dataset because they are deleted " +"on the server." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 +#, fuzzy +msgid "Conflicts detected" +msgstr "Konflikt festgestellt" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 #, java-format msgid "{0} consists of:" msgstr "{0} besteht aus:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:476 #, java-format msgid " ({0} deleted.)" msgstr " ({0} gelöscht.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 msgid "unset" msgstr "nicht angegeben" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 #, java-format msgid "API version: {0}" msgstr "API-Version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:501 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:584 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" @@ -8187,5 +8205,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:412 #: ../plugins/terracer/src/terracer/TerracerAction.java:430 @@ -8955,5 +8973,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261 msgid "More information about this feature" msgstr "Mehr Informationen zu dieser Vorlage" @@ -9002,5 +9020,5 @@ msgstr "Elemente des Typs {0} werden unterstützt." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:700 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9010,18 +9028,18 @@ msgstr[1] "Ändere {0} Objekte" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Nichts ausgewählt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 msgid "Selection unsuitable!" msgstr "Auswahl unpassend!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 msgid "Apply Preset" msgstr "Vorlage anwenden" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788 msgid "Change Properties" msgstr "Einstellungen ändern" @@ -9313,45 +9331,45 @@ msgstr "Änderungssatz schließen..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "Kein Änderungssatz zum Hochladen vorhanden" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 msgid "Preparing..." msgstr "Daten vorbereiten..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 msgid "Uploading..." msgstr "Daten hochladen..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 msgid "Waiting 10 seconds ... " msgstr "Warte 10 Sekunden... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Starte Versuch {0} von {1} in {2} Sekunden..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 msgid "OK - trying again." msgstr "OK - erneuter Versuch." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 #, java-format msgid "Starting retry {0} of {1}." msgstr "Starte Wiederholung {0} von {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 msgid "Current changeset is null. Can't upload data." msgstr "" "Aktueller Änderungssatz ist leer. Daten konnten nicht hochgeladen werden." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9404,4 +9422,6 @@ msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''." msgstr "" +"Ungültiger numerischer Wert für das Attribut ''{0}''. Erhielt den Wert " +"''{1}''." #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115 @@ -9563,5 +9583,5 @@ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''." msgstr "" -"ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ positive " +"Ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ positive " "Ganzzahl" @@ -9571,5 +9591,5 @@ "Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''." msgstr "" -"ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ " +"Ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ " "Wahrheitswert" @@ -9580,5 +9600,5 @@ "''{1}''." msgstr "" -"ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ " +"Ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ " "OsmPrimitivTyp" @@ -9600,5 +9620,5 @@ msgid "" "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}''," -"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." +"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." msgstr "" @@ -9647,5 +9667,5 @@ msgstr "" "Ungültiger Wert des Attributs \"type\" bei Mitglied {0} der Relation {1}. " -"Wert lautete {2}" +"Erhaltener Wert {2}" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 @@ -9671,4 +9691,6 @@ "{1}." msgstr "" +"Ungültiger Wert des Attributs ''version'' für das Objekt mit der ID {0}. " +"Erhaltener Wert {1}." #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 @@ -9727,9 +9749,11 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490 -#, java-format -msgid "" -"Relation with external id ''{0}'' refers to missing primitive with external " -"id ''{1}''." -msgstr "" +#, fuzzy, java-format +msgid "" +"Relation with external id ''{0}'' refers to a missing primitive with " +"external id ''{1}''." +msgstr "" +"Unbekannter Typ ''{0}'' für ein Relationselement in der Relation mit " +"externer ID ''{1}''" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531 @@ -9748,5 +9772,5 @@ #, java-format msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''." -msgstr "Id-Parameter ''{0}'' > 0 verlangt. Wert ist {1}" +msgstr "ID-Parameter ''{0}'' > 0 verlangt. Wert ist {1}" #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144 @@ -9780,5 +9804,5 @@ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''." msgstr "" -"nichtnegativer Parameter \"{0}\" erwartet, stattdessen \"{1}\" erhalten" +"Nichtnegativer Parameter \"{0}\" erwartet, stattdessen \"{1}\" erhalten" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67 @@ -9825,33 +9849,40 @@ msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}." msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72 +"Ungültiger Wert für das Attribut ''{0}'' auf dem XML-Element ''{1}''. " +"Erhaltener Wert {2}." + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:73 msgid "Starting to upload with one request per primitive ..." msgstr "Hochladen mit einer Anfrage pro Objekt beginnen..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})" msgstr "{0}% ({1}/{2}), {3} verbleiben. Knoten ''{4}'' (id: {5}) hochladen" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" msgstr "{0}% ({1}/{2}), {3} verbleiben. Weg ''{4}'' (id: {5}) hochladen" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" msgstr "{0}% ({1}/{2}), {3} verbleiben. Relation ''{4}'' (id: {5}) hochladen" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Starting to upload in one request ..." msgstr "Übertragung in einer Anfrage wird gestartet ..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 +#, fuzzy, java-format +msgid "Parameter ''{0}'' must not be null" +msgstr "Parameter \"{0}\" darf nicht NULL sein" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 msgid "Uploading data ..." msgstr "Übertragung zum Server ..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 msgid "" "WARNING: no API version defined for data to upload. Falling back to version " @@ -9861,5 +9892,5 @@ "Version 0.6 benutzt." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:153 #, java-format msgid "" @@ -10093,5 +10124,5 @@ #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:202 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:324 build/trans_presets.java:325 @@ -10113,6 +10144,6 @@ #: build/trans_presets.java:789 build/trans_presets.java:1333 #: build/trans_presets.java:1400 build/trans_presets.java:1401 -#: build/trans_presets.java:1402 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 +#: build/trans_presets.java:1402 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 msgid "unknown" msgstr "unbekannt" @@ -10281,5 +10312,14 @@ msgstr "
Fehlermeldung (englisch): {0}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:192 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:182 +#, java-format +msgid "" +"The OSM server ''{0}'' doesn't know about an object
you tried to read, " +"update, or delete. Either the respective object
doesn''t exist on the " +"server or you''re using an invalid URL to access
it. Please carefully " +"check the servers address ''{1}'' for typos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:209 #, java-format msgid "" @@ -10293,5 +10333,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:262 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:279 #, java-format msgid "" @@ -10581,17 +10621,15 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35 msgid "Define Address Interpolation" msgstr "Adressinterpolation festlegen" -#. Whether to re-trigger data changed for relation #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "ungerade" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:413 #: ../plugins/terracer/src/terracer/TerracerAction.java:437 @@ -10599,59 +10637,59 @@ msgstr "gerade" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 msgid "Alphabetic" msgstr "Alphabetisch" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161 #, java-format msgid "Relation: {0}" msgstr "Relation: {0}" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173 msgid "Associate with street using:" msgstr "Mit Straße verknüpfen per:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184 msgid "Numbering Scheme:" msgstr "Nummerierungsschema:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 msgid "Starting #:" msgstr "Startnummer:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188 msgid "Ending #:" msgstr "Endnummer:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 #, java-format msgid "Will associate {0} additional house number nodes" msgstr "{0} zusätzliche Hausnummern-Knoten werden verküpft" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 msgid "City:" msgstr "Stadt:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 msgid "State:" msgstr "Bundesland/-staat:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 msgid "Post Code:" msgstr "Postleitzahl:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 msgid "Country:" msgstr "Land:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 msgid "Full Address:" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325 +msgstr "Vollständige Adresse:" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 msgid "Optional Information:" msgstr "Optionale Adressinformationen:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 msgid "Please select a street to associate with address interpolation way" msgstr "" @@ -10659,5 +10697,5 @@ "verknüpft werden soll" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 msgid "Please select address interpolation way for this street" msgstr "" @@ -10665,37 +10703,37 @@ "verknüpft werden soll" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 msgid "Expected odd numbers for addresses" msgstr "Ungerade Hausnummern erwartet" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 msgid "Expected even numbers for addresses" msgstr "Gerade Hausnummern erwartet" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 msgid "Country code must be 2 letters" msgstr "Ländercode muss aus 2 Buchstaben bestehen" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 msgid "Please enter valid number for starting and ending address" msgstr "Bitte eine gültige Nummer für die Start und Ende eingeben" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 msgid "Alphabetic address must end with a letter" msgstr "Alphabetische Adressen müssen mit einem Buchstaben aufhören" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 msgid "Starting address letter must be less than ending address letter" msgstr "Der Startbuchstabe muss im Alphabet vor dem Endbuchstaben liegen." -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 msgid "Please enter valid number for starting address" msgstr "Bitte eine gültige Nummer für die Startnummer eingeben" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 msgid "Please enter valid number for ending address" msgstr "Bitte eine gültige Nummer für die Endnummer eingeben" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 msgid "Starting address number must be less than ending address number" msgstr "Die Startnummer muss kleiner als die Endnummer sein." @@ -11481,4 +11519,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52 +#: build/trans_presets.java:2331 msgid "Location" msgstr "Ort" @@ -12033,4 +12072,5 @@ msgstr "Südost" +#. item "Man Made/Pipeline" combo "Type" #. color highway_track #. @@ -12076,7 +12116,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:990 build/trans_style.java:1007 -#: build/trans_style.java:1023 build/trans_style.java:3400 -#: build/trans_style.java:3408 +#: build/trans_presets.java:2330 build/trans_style.java:990 +#: build/trans_style.java:1007 build/trans_style.java:1023 +#: build/trans_style.java:3400 build/trans_style.java:3408 msgid "water" msgstr "Wasser" @@ -12387,6 +12427,6 @@ msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -"Bitte 4 oder 5 Wege auswählen, zu denen Abbiegeverbote nach links " -"hinzugefügt werden sollen." +"Bitte wähle 4 oder 5 Wege aus, damit Links-Abbiege-Verbote bestimmt werden " +"können." #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 @@ -12417,5 +12457,5 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 msgid "Create Michigan left turn restriction" -msgstr "Michigan Abbiegeverbote nach links erstellen" +msgstr "Erstelle Michigan Links-Abbiege-Beschränkungen" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 @@ -14780,9 +14820,11 @@ #. item "Public Transport/Airport" text "Name" #. +#. item "Man Made/Power Station" text "Operator" #. item "Relations/Route" text "Name" #: build/trans_presets.java:65 build/trans_presets.java:101 #: build/trans_presets.java:121 build/trans_presets.java:141 #: build/trans_presets.java:178 build/trans_presets.java:198 -#: build/trans_presets.java:1560 build/trans_presets.java:3158 +#: build/trans_presets.java:1560 build/trans_presets.java:2382 +#: build/trans_presets.java:3170 msgid "Reference" msgstr "Referenz" @@ -15344,5 +15386,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 msgid "metal" msgstr "metall" @@ -15362,5 +15404,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 #: build/trans_style.java:3375 msgid "wood" @@ -15649,7 +15691,7 @@ #: build/trans_presets.java:1401 build/trans_presets.java:1402 #: build/trans_presets.java:1767 build/trans_presets.java:1777 -#: build/trans_presets.java:2408 build/trans_presets.java:2444 -#: build/trans_presets.java:2453 build/trans_presets.java:2454 -#: build/trans_presets.java:2455 build/trans_presets.java:2725 +#: build/trans_presets.java:2420 build/trans_presets.java:2456 +#: build/trans_presets.java:2465 build/trans_presets.java:2466 +#: build/trans_presets.java:2467 build/trans_presets.java:2737 msgid "yes" msgstr "ja" @@ -15798,8 +15840,8 @@ #: build/trans_presets.java:1400 build/trans_presets.java:1401 #: build/trans_presets.java:1402 build/trans_presets.java:1767 -#: build/trans_presets.java:1777 build/trans_presets.java:2408 -#: build/trans_presets.java:2444 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 -#: build/trans_presets.java:2725 +#: build/trans_presets.java:1777 build/trans_presets.java:2420 +#: build/trans_presets.java:2456 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 +#: build/trans_presets.java:2737 msgid "no" msgstr "nein" @@ -15937,6 +15979,8 @@ #. item "Water/Wetland" text "Name" #. item "Car/Parking" text "Reference number" +#. item "Man Made/Pipeline" text "Operator" #. item "Man Made/Power Generator" label "Edit Power Generator" #. +#. item "Man Made/Power Tower" label "Edit Power Tower" #. item "Land use/Tree" text "Name" #. item "Land use/Wood" text "Name" @@ -15944,7 +15988,8 @@ #: build/trans_presets.java:350 build/trans_presets.java:649 #: build/trans_presets.java:789 build/trans_presets.java:1137 -#: build/trans_presets.java:1395 build/trans_presets.java:2364 -#: build/trans_presets.java:2913 build/trans_presets.java:2923 -#: build/trans_presets.java:2932 +#: build/trans_presets.java:1395 build/trans_presets.java:2330 +#: build/trans_presets.java:2372 build/trans_presets.java:2398 +#: build/trans_presets.java:2925 build/trans_presets.java:2935 +#: build/trans_presets.java:2944 msgid "Type" msgstr "Typ" @@ -16494,10 +16539,10 @@ #. item "Tourism/Information Terminal" text "Closer description" #. item "Tourism/Audioguide" text "Closer description" -#. item "Man Made/Power Station" label "Edit Power Station" -#. +#. item "Man Made/Tower" text "Height (meters)" +#. item "Man Made/Pipeline" label "Edit Pipeline" +#. +#. item "Man Made/Power Station" text "Name" #. item "Man Made/Power Sub Station" label "Edit Power Sub Station" #. -#. item "Man Made/Power Line" label "Edit Power Line" -#. #. item #. #: build/trans_presets.java:1535 build/trans_presets.java:1789 -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2465 msgid "Shelter" msgstr "Schutzraum" @@ -18855,5 +18902,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1877 build/trans_presets.java:2669 +#: build/trans_presets.java:1877 build/trans_presets.java:2681 msgid "Sports" msgstr "Sport" @@ -20206,6 +20253,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "Religion" msgstr "Religion" @@ -20214,66 +20261,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "bahai" msgstr "bahaiistisch" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "buddhist" msgstr "buddhistisch" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "christian" msgstr "christlich" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "hindu" msgstr "hinduistisch" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jain" msgstr "jainistisch" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jewish" msgstr "jüdisch" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "muslim" msgstr "moslemisch" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "sikh" msgstr "sikhistisch" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "spiritualist" msgstr "spiritistisch" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "taoist" msgstr "taoistisch" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "unitarian" msgstr "unitarisch" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "zoroastrian" msgstr "zoroastrisch" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "Denomination" msgstr "Konfession" @@ -20282,76 +20329,76 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "anglican" msgstr "anglikanisch" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "baptist" msgstr "baptistisch" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "catholic" msgstr "katholisch" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "evangelical" msgstr "evangelikal" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "jehovahs_witness" msgstr "Zeugen Jehovas" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "lutheran" msgstr "lutherisch" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "methodist" msgstr "methodistisch" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "mormon" msgstr "mormonisch" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "orthodox" msgstr "orthodox" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "pentecostal" msgstr "Pfingstgemeinde" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "presbyterian" msgstr "presbyterianisch" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "protestant" msgstr "protestantisch" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "quaker" msgstr "Quäker" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "shia" msgstr "schiitisch" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "sunni" msgstr "sunnitisch" @@ -20447,25 +20494,49 @@ #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2296 +#, fuzzy +msgid "Tower type" +msgstr "Routentyp" + +#. item "Man Made/Tower" combo "Tower type" +#: build/trans_presets.java:2296 +#, fuzzy +msgid "communication" +msgstr "Verbindung" + +#: build/trans_presets.java:2296 +#, fuzzy +msgid "observation" +msgstr "Höhe" + +#. +#: build/trans_presets.java:2298 +#, fuzzy +msgid "Height (meters)" +msgstr "Max. Höhe (Meter)" + +#. item "Man Made/Tower" text "Operator" +#. +#: build/trans_presets.java:2302 msgid "Water Tower" msgstr "Wasserturm" #. item -#: build/trans_presets.java:2298 +#: build/trans_presets.java:2303 msgid "Edit Water Tower" msgstr "Wasserturm bearbeiten" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2307 msgid "Gasometer" msgstr "Gasometer" #. item -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2308 msgid "Edit Gasometer" msgstr "Gasometer bearbeiten" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2307 +#: build/trans_presets.java:2312 msgid "Lighthouse" msgstr "Leuchtturm" @@ -20473,10 +20544,10 @@ #. item #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2314 msgid "Edit Lighthouse" msgstr "Leuchtturm bearbeiten" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2318 msgid "Windmill" msgstr "Windmühle" @@ -20484,21 +20555,55 @@ #. item #. -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2320 msgid "Edit Windmill" msgstr "Windmühle bearbeiten" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2319 +#: build/trans_presets.java:2324 msgid "Pipeline" msgstr "Pipeline" #. item -#. -#: build/trans_presets.java:2321 +#. +#: build/trans_presets.java:2327 msgid "Edit Pipeline" msgstr "Pipeline bearbeiten" -#. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2330 +#, fuzzy +msgid "oil" +msgstr "Fossil" + +#: build/trans_presets.java:2330 build/trans_presets.java:2372 +msgid "gas" +msgstr "Gas" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "sewage" +msgstr "Verwendung" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "heat" +msgstr "Heide" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "any substance" +msgstr "A Nach Entfernung" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "underwater" +msgstr "Wasser" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "overground" +msgstr "Tiefgarage" + +#: build/trans_presets.java:2333 msgid "Wastewater Plant" msgstr "Kläranlage" @@ -20508,10 +20613,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:2329 +#: build/trans_presets.java:2337 msgid "Edit Wastewater Plant" msgstr "Kläranlage bearbeiten" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2333 +#: build/trans_presets.java:2341 msgid "Crane" msgstr "Stationärer Kran" @@ -20519,10 +20624,10 @@ #. item #. -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2343 msgid "Edit Crane" msgstr "Stationären Kran bearbeiten" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2347 msgid "Beacon" msgstr "Bake" @@ -20530,10 +20635,10 @@ #. item #. -#: build/trans_presets.java:2341 +#: build/trans_presets.java:2349 msgid "Edit Beacon" msgstr "Bake bearbeiten" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2353 msgid "Survey Point" msgstr "Vermessungspunkt" @@ -20541,10 +20646,10 @@ #. item #. -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2355 msgid "Edit Survey Point" msgstr "Vermessungspunkt bearbeiten" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2359 msgid "Surveillance" msgstr "Überwachungskamera" @@ -20552,5 +20657,5 @@ #. item #. -#: build/trans_presets.java:2353 +#: build/trans_presets.java:2361 msgid "Edit Surveillance Camera" msgstr "Überwachungskamera bearbeiten" @@ -20558,5 +20663,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2366 msgid "Power Generator" msgstr "Stromgenerator" @@ -20566,39 +20671,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:2362 +#: build/trans_presets.java:2370 msgid "Edit Power Generator" msgstr "Stromgenerator bearbeiten" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "wind" msgstr "Wind" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "hydro" msgstr "Wasser" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "fossil" msgstr "Fossil" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "nuclear" msgstr "Nuklear" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "coal" msgstr "Kohle" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "photovoltaic" msgstr "Photovoltaik" -#: build/trans_presets.java:2364 -msgid "gas" -msgstr "Gas" - #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2375 msgid "Power Station" msgstr "Umspannwerk" @@ -20607,10 +20708,10 @@ #. -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2378 msgid "Edit Power Station" msgstr "Umspannwerk bearbeiten" -#. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2374 +#. item "Man Made/Power Station" text "Reference" +#: build/trans_presets.java:2384 msgid "Power Sub Station" msgstr "Trafostation" @@ -20619,5 +20720,5 @@ #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2387 msgid "Edit Power Sub Station" msgstr "Trafostation bearbeiten" @@ -20625,10 +20726,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2380 build/trans_presets.java:2396 +#: build/trans_presets.java:2390 build/trans_presets.java:2407 msgid "Line reference" msgstr "Liniennummer" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2382 +#: build/trans_presets.java:2392 msgid "Power Tower" msgstr "Strommast" @@ -20639,11 +20740,26 @@ #. 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:2387 +#: build/trans_presets.java:2397 msgid "Edit Power Tower" msgstr "Strommast bearbeiten" -#. item "Man Made/Power Tower" label "Edit Power Tower" -#. -#: build/trans_presets.java:2390 +#. item "Man Made/Power Tower" combo "Type" +#: build/trans_presets.java:2398 +#, fuzzy +msgid "tower" +msgstr "Turm" + +#: build/trans_presets.java:2398 +#, fuzzy +msgid "pole" +msgstr "Rolle" + +#: build/trans_presets.java:2399 +#, fuzzy +msgid "Tower reference" +msgstr "Liniennummer" + +#. item "Man Made/Power Tower" text "Tower reference" +#: build/trans_presets.java:2401 msgid "Power Line" msgstr "Stromleitung" @@ -20652,40 +20768,83 @@ #. -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2404 msgid "Edit Power Line" msgstr "Stromleitung bearbeiten" +#. item "Man Made/Power Line" label "Edit Power Line" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "Line type" +msgstr "Pistentyp" + +#. item "Man Made/Power Line" combo "Line type" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "line" +msgstr "Steigung" + +#: build/trans_presets.java:2405 +#, fuzzy +msgid "minor_line" +msgstr "Autobahnanschluß" + #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2408 msgid "Voltage" msgstr "Spannung" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2398 -msgid "Amount of Wires" +#: build/trans_presets.java:2409 +#, fuzzy +msgid "Amount of Cables" msgstr "Leitungsanzahl" -#. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2401 +#. item "Man Made/Power Line" text "Amount of Cables" +#: build/trans_presets.java:2410 +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:2410 +#, fuzzy +msgid "single" +msgstr "Winkel" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "double" +msgstr "Boule" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "triple" +msgstr "Zauntreppe" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "quad" +msgstr "Quäker" + +#: build/trans_presets.java:2413 msgid "Amenities" msgstr "Einrichtungen" #. group "Amenities" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2414 msgid "Toilets" msgstr "Toiletten" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2409 build/trans_presets.java:2525 +#: build/trans_presets.java:2421 build/trans_presets.java:2537 msgid "Note" msgstr "Kommentar" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2411 +#: build/trans_presets.java:2423 msgid "Post Box" msgstr "Briefkasten" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2428 msgid "Telephone" msgstr "Telefon" @@ -20694,5 +20853,5 @@ #. -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2431 msgid "Edit Telephone" msgstr "Telefon bearbeiten" @@ -20700,5 +20859,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2422 build/trans_presets.java:2526 +#: build/trans_presets.java:2434 build/trans_presets.java:2538 msgid "Coins" msgstr "Münzen" @@ -20706,5 +20865,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2423 build/trans_presets.java:2527 +#: build/trans_presets.java:2435 build/trans_presets.java:2539 msgid "Notes" msgstr "Scheine" @@ -20712,5 +20871,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2424 build/trans_presets.java:2528 +#: build/trans_presets.java:2436 build/trans_presets.java:2540 msgid "Electronic purses and Charge cards" msgstr "Geld- oder Prepaidkarten" @@ -20718,5 +20877,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2425 build/trans_presets.java:2529 +#: build/trans_presets.java:2437 build/trans_presets.java:2541 msgid "Debit cards" msgstr "Konto- oder EC-Karten" @@ -20724,15 +20883,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2426 build/trans_presets.java:2530 +#: build/trans_presets.java:2438 build/trans_presets.java:2542 msgid "Credit cards" msgstr "Kreditkarten" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2439 msgid "Telephone cards" msgstr "Telefonkarten" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2429 +#: build/trans_presets.java:2441 msgid "Recycling" msgstr "Recyclingstelle & -container" @@ -20741,5 +20900,5 @@ #. -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2444 msgid "Edit Recycling station" msgstr "Recyclingstelle oder -container bearbeiten" @@ -20747,35 +20906,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2446 msgid "Batteries" msgstr "Batterien" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2435 +#: build/trans_presets.java:2447 msgid "Cans" msgstr "Dosen" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2448 msgid "Clothes" msgstr "Kleidung" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2437 +#: build/trans_presets.java:2449 msgid "Glass" msgstr "Glas" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2450 msgid "Paper" msgstr "Papier" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2451 msgid "Scrap Metal" msgstr "Altmetall" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2453 msgid "Bench" msgstr "Bank" @@ -20784,31 +20943,31 @@ #. #. -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2456 msgid "Backrest" msgstr "Lehne" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "Material" msgstr "Material" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "stone" msgstr "Stein" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "plastic" msgstr "Kunststoff" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "Colour" msgstr "Farbe" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "black" msgstr "schwarz" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "brown" msgstr "braun" @@ -20879,5 +21038,5 @@ #. #. -#: build/trans_presets.java:2446 build/trans_style.java:3063 +#: build/trans_presets.java:2458 build/trans_style.java:3063 #: build/trans_style.java:3071 build/trans_style.java:3079 #: build/trans_style.java:3087 build/trans_style.java:3135 @@ -20887,27 +21046,27 @@ msgstr "Grün" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "red" msgstr "rot" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "blue" msgstr "blau" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "white" msgstr "weiß" -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2459 msgid "Amount of Seats" msgstr "Anzahl der Sitzplätze" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2461 msgid "Hunting Stand" msgstr "Jagdanstand" #. item -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2462 msgid "Edit Hunting Stand" msgstr "Jagdanstand bearbeiten" @@ -20916,30 +21075,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2452 build/trans_presets.java:2914 +#: build/trans_presets.java:2464 build/trans_presets.java:2926 msgid "Height" msgstr "Höhe" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "low" msgstr "niedrig" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "half" msgstr "halb" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "full" msgstr "voll" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2466 msgid "Hide" msgstr "Versteck" -#: build/trans_presets.java:2455 +#: build/trans_presets.java:2467 msgid "Lock" msgstr "Schloß" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2469 msgid "Fountain" msgstr "Springbrunnen" @@ -20948,10 +21107,10 @@ #. -#: build/trans_presets.java:2460 +#: build/trans_presets.java:2472 msgid "Edit Fountain" msgstr "Springbrunnen bearbeiten" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2476 msgid "Drinking Water" msgstr "Trinkwasser" @@ -20960,10 +21119,10 @@ #. -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2479 msgid "Edit Drinking Water" msgstr "Trinkwasserabgabe bearbeiten" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2471 +#: build/trans_presets.java:2483 msgid "Baby Hatch" msgstr "Babyklappe" @@ -20971,33 +21130,33 @@ #. item #. -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2485 msgid "Edit Baby Hatch" msgstr "Babyklappe bearbeiten" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2491 msgid "Shops" msgstr "Geschäfte" #. group "Shops" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2492 msgid "Supermarket" msgstr "Supermarkt" #. item -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2493 msgid "Edit Supermarket" msgstr "Supermarkt bearbeiten" -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2498 msgid "Chemist" msgstr "Drogerie" #. item -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2499 msgid "Edit Chemist" msgstr "Drogerie bearbeiten" -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2504 msgid "Convenience Store" msgstr "Tante-Emma-Laden" @@ -21005,9 +21164,9 @@ #. item #. -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2506 msgid "Edit Convenience Store" msgstr "Tante-Emma-Laden bearbeiten" -#: build/trans_presets.java:2499 +#: build/trans_presets.java:2511 msgid "Kiosk" msgstr "Kiosk" @@ -21015,27 +21174,27 @@ #. item #. -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2513 msgid "Edit Kiosk" msgstr "Kiosk bearbeiten" -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2518 msgid "Book Store" msgstr "Buchhandlung" #. item -#: build/trans_presets.java:2507 +#: build/trans_presets.java:2519 msgid "Edit Book Store" msgstr "Buchhandlung bearbeiten" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2524 msgid "Travel Agency" msgstr "Reisebüro" #. item -#: build/trans_presets.java:2513 +#: build/trans_presets.java:2525 msgid "Edit Travel Agency" msgstr "Reisebüro bearbeiten" -#: build/trans_presets.java:2518 +#: build/trans_presets.java:2530 msgid "Vending machine" msgstr "Verkaufsautomat" @@ -21043,5 +21202,5 @@ #. item #. -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2532 msgid "Edit Vending machine" msgstr "Automaten bearbeiten" @@ -21049,88 +21208,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "Vending products" msgstr "Automatenprodukte" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_tickets" msgstr "Fahrscheine" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_plans" msgstr "Pläne des öffentlichen Nahverkehrs" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "parking_tickets" msgstr "Parkscheine" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "food" msgstr "Essen" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "drinks" msgstr "Getränke" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "sweets" msgstr "Süßigkeiten" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "cigarettes" msgstr "Zigaretten" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "photos" msgstr "Fotos" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "animal_food" msgstr "Tiernahrung" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "news_papers" msgstr "Zeitungen" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "toys" msgstr "Spielzeug" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "stamps" msgstr "Briefmarken" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "SIM-cards" msgstr "SIM-Karten" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "telephone_vouchers" msgstr "Telefonkarten" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "vouchers" msgstr "Karten/Belege" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "condoms" msgstr "Kondome" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "tampons" msgstr "Tampons" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "excrement_bags" msgstr "Hundekot-Tüten" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2543 msgid "Account or loyalty cards" msgstr "Kundenkarten" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2545 msgid "Butcher" msgstr "Fleischer" @@ -21138,9 +21297,9 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2547 msgid "Edit Butcher" msgstr "Fleischer bearbeiten" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2552 msgid "Baker" msgstr "Bäcker" @@ -21148,9 +21307,9 @@ #. item #. -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2554 msgid "Edit Baker" msgstr "Bäcker bearbeiten" -#: build/trans_presets.java:2547 +#: build/trans_presets.java:2559 msgid "Florist" msgstr "Blumenladen" @@ -21158,18 +21317,18 @@ #. item #. -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2561 msgid "Edit Florist" msgstr "Blumenladen bearbeiten" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2566 msgid "Organic" msgstr "Bioladen" #. item -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2567 msgid "Edit Organic Shop" msgstr "Bioladen bearbeiten" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2572 msgid "Alcohol" msgstr "Spirituosen" @@ -21177,54 +21336,54 @@ #. item #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2574 msgid "Edit Alcohol Shop" msgstr "Spirituosengeschäft bearbeiten" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2579 msgid "Beverages" msgstr "Getränke" #. item -#: build/trans_presets.java:2568 +#: build/trans_presets.java:2580 msgid "Edit Beverages Shop" msgstr "Getränkeladen bearbeiten" -#: build/trans_presets.java:2573 +#: build/trans_presets.java:2585 msgid "Computer" msgstr "Computer" #. item -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2586 msgid "Edit Computer Shop" msgstr "Computergeschäft bearbeiten" -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2591 msgid "Electronics" msgstr "Elektronikgeschäft" #. item -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2592 msgid "Edit Electronics Shop" msgstr "Elektronikgeschäft bearbeiten" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2597 msgid "Hifi" msgstr "Hifi" #. item -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2598 msgid "Edit Hifi Shop" msgstr "Hifi-Geschäft bearbeiten" -#: build/trans_presets.java:2591 +#: build/trans_presets.java:2603 msgid "Furniture" msgstr "Mobiliar" #. item -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2604 msgid "Edit Furniture Shop" msgstr "Möbelgeschäft bearbeiten" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2609 msgid "Garden Centre" msgstr "Gartenzentrum" @@ -21232,9 +21391,9 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2611 msgid "Edit Garden Centre" msgstr "Gartenzentrum bearbeiten" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2616 msgid "Hardware" msgstr "Haushaltswaren" @@ -21242,9 +21401,9 @@ #. item #. -#: build/trans_presets.java:2606 +#: build/trans_presets.java:2618 msgid "Edit Hardware Store" msgstr "Haushaltswaren bearbeiten" -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2623 msgid "Do-it-yourself-store" msgstr "Heimwerkerbedarf" @@ -21252,54 +21411,54 @@ #. item #. -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2625 msgid "Edit Do-it-yourself-store" msgstr "Geschäft für Heimwerkerbedarf bearbeiten" -#: build/trans_presets.java:2618 +#: build/trans_presets.java:2630 msgid "Stationery" msgstr "Bürobedarf" #. item -#: build/trans_presets.java:2619 +#: build/trans_presets.java:2631 msgid "Edit Stationery Shop" msgstr "Bürobedarf bearbeiten" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2636 msgid "Hairdresser" msgstr "Friseur" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2637 msgid "Edit Hairdresser" msgstr "Friseur bearbeiten" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2642 msgid "Shoes" msgstr "Schuhe" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2643 msgid "Edit Shoe Shop" msgstr "Schuhladen bearbeiten" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2648 msgid "Toys" msgstr "Spielzeug" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2649 msgid "Edit Toy Shop" msgstr "Spielzeuggeschäft bearbeiten" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2654 msgid "Video" msgstr "Videoverleih" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2655 msgid "Edit Video Shop" msgstr "Videogeschäft bearbeiten" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2660 msgid "Dry Cleaning" msgstr "Chemische Reinigung" @@ -21307,9 +21466,9 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2662 msgid "Edit Dry Cleaning" msgstr "Chemische Reinigung bearbeiten" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2667 msgid "Laundry" msgstr "Waschsalon" @@ -21317,9 +21476,9 @@ #. item #. -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2669 msgid "Edit Laundry" msgstr "Waschsalon bearbeiten" -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2674 msgid "Outdoor" msgstr "Camping (Outdoor)" @@ -21327,28 +21486,28 @@ #. item #. -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2676 msgid "Edit Outdoor Shop" msgstr "Laden für Camping- (Outdoor-)bedarf bearbeiten" #. item -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2682 msgid "Edit Sports Shop" msgstr "Sportgeschäft bearbeiten" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2687 msgid "Optician" msgstr "Optiker" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2688 msgid "Edit Optician" msgstr "Optiker bearbeiten" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2695 msgid "Cash" msgstr "Geld" #. group "Cash" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2696 msgid "Bank" msgstr "Bank" @@ -21356,14 +21515,14 @@ #. item #. -#: build/trans_presets.java:2686 +#: build/trans_presets.java:2698 msgid "Edit Bank" msgstr "Bank bearbeiten" -#: build/trans_presets.java:2691 build/trans_presets.java:2700 +#: build/trans_presets.java:2703 build/trans_presets.java:2712 msgid "Automated Teller Machine" msgstr "Geldautomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2705 msgid "Money Exchange" msgstr "Wechselstube" @@ -21371,5 +21530,5 @@ #. item #. -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2707 msgid "Edit Money Exchange" msgstr "Wechselstube bearbeiten" @@ -21377,15 +21536,15 @@ #. item #. -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2714 msgid "Edit Automated Teller Machine" msgstr "Geldautomat bearbeiten" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2719 msgid "Health" msgstr "Gesundheit" #. group "Health" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2720 msgid "Doctors" msgstr "Arzt" @@ -21393,18 +21552,18 @@ #. item #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2722 msgid "Edit Doctors" msgstr "Arzt bearbeiten" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2727 msgid "Dentist" msgstr "Zahnarzt" #. item -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2728 msgid "Edit Dentist" msgstr "Zahnarzt bearbeiten" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2733 msgid "Pharmacy" msgstr "Apotheke" @@ -21412,5 +21571,5 @@ #. item #. -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2735 msgid "Edit Pharmacy" msgstr "Apotheke bearbeiten" @@ -21418,9 +21577,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2737 msgid "Dispensing" msgstr "Rezepteinlösung" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2741 msgid "Hospital" msgstr "Krankenhaus" @@ -21428,10 +21587,10 @@ #. item #. -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2743 msgid "Edit Hospital" msgstr "Krankenhaus bearbeiten" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2747 msgid "Emergency Access Point" msgstr "Notfallrettungspunkt" @@ -21440,5 +21599,5 @@ #. -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2750 msgid "Edit Emergency Access Point" msgstr "Notfallrettungspunkt bearbeiten" @@ -21447,20 +21606,20 @@ #. #. -#: build/trans_presets.java:2741 +#: build/trans_presets.java:2753 msgid "Point Number" msgstr "Punktnummer" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2742 +#: build/trans_presets.java:2754 msgid "Point Name" msgstr "Punktname" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2756 msgid "Phone Number" msgstr "Telefonnummer" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2757 msgid "(Use international code, like +12-345-67890)" msgstr "(Internationale Nummer verwenden, z.B. +49-123-45678)" @@ -21468,5 +21627,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2760 msgid "Veterinary" msgstr "Tierarzt" @@ -21475,59 +21634,59 @@ #. -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2763 msgid "Edit Veterinary" msgstr "Tierarzt bearbeiten" -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2770 msgid "Geography" msgstr "Geografie" #. group "Places" -#: build/trans_presets.java:2760 +#: build/trans_presets.java:2772 msgid "Continent" msgstr "Kontinent" #. item -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2773 msgid "Edit Continent" msgstr "Kontinent bearbeiten" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2766 +#: build/trans_presets.java:2778 msgid "Country" msgstr "Staat" #. item -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2779 msgid "Edit Country" msgstr "Staat bearbeiten" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2784 msgid "State" msgstr "Bundesland" #. item -#: build/trans_presets.java:2773 +#: build/trans_presets.java:2785 msgid "Edit State" msgstr "Bundesland bearbeiten" #. item "Places/State" text "Name" -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2790 msgid "Region" msgstr "Region" #. item -#: build/trans_presets.java:2779 +#: build/trans_presets.java:2791 msgid "Edit Region" msgstr "Region bearbeiten" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2796 msgid "County" msgstr "Landkreis" #. item -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2797 msgid "Edit County" msgstr "Landkreis bearbeiten" @@ -21535,15 +21694,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2803 msgid "City" msgstr "Großstadt" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2804 msgid "Edit City" msgstr "Großstadt bearbeiten" #. item "Places/City" text "Name" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2809 msgid "Town" msgstr "Stadt" @@ -21551,10 +21710,10 @@ #. item #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2811 msgid "Edit Town" msgstr "Stadt bearbeiten" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2804 +#: build/trans_presets.java:2816 msgid "Suburb" msgstr "Stadtteil" @@ -21562,25 +21721,25 @@ #. item #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2818 msgid "Edit Suburb" msgstr "Stadtteil bearbeiten" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2823 msgid "Village" msgstr "Dorf" #. item -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2824 msgid "Edit Village" msgstr "Dorf bearbeiten" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2817 +#: build/trans_presets.java:2829 msgid "Hamlet" msgstr "Weiler" #. item -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2830 msgid "Edit Hamlet" msgstr "Weiler bearbeiten" @@ -21588,5 +21747,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2824 +#: build/trans_presets.java:2836 msgid "Locality" msgstr "Unbewohnter Ort" @@ -21594,10 +21753,10 @@ #. item #. -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2838 msgid "Edit Locality" msgstr "Unbewohnten Ort bearbeiten" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2843 msgid "Island" msgstr "Insel" @@ -21605,10 +21764,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2845 msgid "Edit Island" msgstr "Insel bearbeiten" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2838 +#: build/trans_presets.java:2850 msgid "Islet" msgstr "Kleine Insel" @@ -21616,5 +21775,5 @@ #. item #. -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2852 msgid "Edit Islet" msgstr "Kleine Insel bearbeiten" @@ -21622,5 +21781,5 @@ #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2858 msgid "Cave Entrance" msgstr "Höhleneingang" @@ -21628,10 +21787,10 @@ #. item #. -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2860 msgid "Edit Cave Entrance" msgstr "Höhleneingang bearbeiten" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2864 msgid "Peak" msgstr "Bergspitze" @@ -21639,10 +21798,10 @@ #. item #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2866 msgid "Edit Peak" msgstr "Bergspitze bearbeiten" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2871 msgid "Glacier" msgstr "Gletscher" @@ -21650,10 +21809,10 @@ #. item #. -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2873 msgid "Edit Glacier" msgstr "Gletscher bearbeiten" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2878 msgid "Volcano" msgstr "Vulkan" @@ -21661,70 +21820,70 @@ #. item #. -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2880 msgid "Edit Volcano" msgstr "Vulkan bearbeiten" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2886 msgid "Boundaries" msgstr "Grenzen" #. group "Boundaries" -#: build/trans_presets.java:2875 +#: build/trans_presets.java:2887 msgid "National" msgstr "Staat" #. item -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2888 msgid "Edit National Boundary" msgstr "Staatsgrenze bearbeiten" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2881 +#: build/trans_presets.java:2893 msgid "Administrative" msgstr "Innerstaatlich" #. item -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2894 msgid "Edit Administrative Boundary" msgstr "Innerstaatliche Grenze bearbeiten" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2887 +#: build/trans_presets.java:2899 msgid "Civil" msgstr "Zivil" #. item -#: build/trans_presets.java:2888 +#: build/trans_presets.java:2900 msgid "Edit Civil Boundary" msgstr "Zivilrechtliche Grenze bearbeiten" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2893 +#: build/trans_presets.java:2905 msgid "Political" msgstr "Politisch" #. item -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2906 msgid "Edit Political Boundary" msgstr "Politische Grenze bearbeiten" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2911 msgid "National park" msgstr "Nationalpark" #. item -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2912 msgid "Edit National Park Boundary" msgstr "Nationalparkgrenze bearbeiten" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2918 msgid "Land use" msgstr "Landnutzung" #. group "Land use" -#: build/trans_presets.java:2907 +#: build/trans_presets.java:2919 msgid "Tree" msgstr "Baum" @@ -21733,15 +21892,15 @@ #. -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2922 msgid "Edit Tree" msgstr "Baum bearbeiten" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2915 +#: build/trans_presets.java:2927 msgid "Botanical Name" msgstr "Botanischer Name" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2929 msgid "Wood" msgstr "Naturwald" @@ -21750,5 +21909,5 @@ #. -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2932 msgid "Edit Wood" msgstr "Naturwald bearbeiten" @@ -21756,17 +21915,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "coniferous" msgstr "Nadelwald" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "deciduous" msgstr "Laubwald" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "mixed" msgstr "Mischwald" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2937 msgid "Forest" msgstr "Forst" @@ -21775,14 +21934,14 @@ #. -#: build/trans_presets.java:2928 +#: build/trans_presets.java:2940 msgid "Edit Forest Landuse" msgstr "Forst bearbeiten" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2946 msgid "Nature Reserve" msgstr "Naturdenkmal & Reservat" #. item -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2947 msgid "Edit Nature Reserve" msgstr "Naturdenkmal oder Reservat bearbeiten" @@ -21790,25 +21949,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2952 msgid "Scree" msgstr "Geröll" #. item -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2953 msgid "Edit Scree" msgstr "Geröll bearbeiten" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2957 msgid "Scrub" msgstr "Buschland" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:2958 msgid "Edit Scrub" msgstr "Buschland bearbeiten" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2962 msgid "Fell" msgstr "Gebirge" @@ -21816,10 +21975,10 @@ #. item #. -#: build/trans_presets.java:2952 +#: build/trans_presets.java:2964 msgid "Edit Fell" msgstr "Gebirge bearbeiten" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2968 msgid "Heath" msgstr "Heide" @@ -21827,5 +21986,5 @@ #. item #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2970 msgid "Edit Heath" msgstr "Heide bearbeiten" @@ -21833,5 +21992,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2975 msgid "Farmyard" msgstr "Bauernhof" @@ -21840,45 +21999,45 @@ #. -#: build/trans_presets.java:2966 +#: build/trans_presets.java:2978 msgid "Edit Farmyard Landuse" msgstr "Bauernhof bearbeiten" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2983 msgid "Farmland" msgstr "Ackerland" #. item -#: build/trans_presets.java:2972 +#: build/trans_presets.java:2984 msgid "Edit Farmland Landuse" msgstr "Ackerland bearbeiten" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2977 +#: build/trans_presets.java:2989 msgid "Meadow" msgstr "Wiese" #. item -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2990 msgid "Edit Meadow Landuse" msgstr "Wiese bearbeiten" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:2995 msgid "Vineyard" msgstr "Weinberg" #. item -#: build/trans_presets.java:2984 +#: build/trans_presets.java:2996 msgid "Edit Vineyard Landuse" msgstr "Weinberg bearbeiten" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3001 msgid "Allotments" msgstr "Schrebergärten" #. item -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3002 msgid "Edit Allotments Landuse" msgstr "Schrebergärten bearbeiten" @@ -21886,25 +22045,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3008 msgid "Garden" msgstr "Garten" #. item -#: build/trans_presets.java:2997 +#: build/trans_presets.java:3009 msgid "Edit Garden" msgstr "Garten bearbeiten" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3013 msgid "Grass" msgstr "Gras" #. item -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3014 msgid "Edit Grass Landuse" msgstr "Grasfläche bearbeiten" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3019 msgid "Village Green" msgstr "Dorfanger" @@ -21912,10 +22071,10 @@ #. item #. -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3021 msgid "Edit Village Green Landuse" msgstr "Dorfanger bearbeiten" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3026 msgid "Common" msgstr "Öffentlicher Bereich" @@ -21923,20 +22082,20 @@ #. item #. -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3028 msgid "Edit Common" msgstr "Öffentlichen Bereich bearbeiten" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3032 msgid "Park" msgstr "Park" #. item -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3033 msgid "Edit Park" msgstr "Park bearbeiten" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3037 msgid "Recreation Ground" msgstr "Erholungsgebiet" @@ -21944,5 +22103,5 @@ #. item #. -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3039 msgid "Edit Recreation Ground Landuse" msgstr "Erholungsgebiet bearbeiten" @@ -21950,15 +22109,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3033 +#: build/trans_presets.java:3045 msgid "Residential area" msgstr "Wohngebiet" #. item -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3046 msgid "Edit Residential Landuse" msgstr "Wohngebiet bearbeiten" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3051 msgid "Graveyard" msgstr "Kleiner Friedhof" @@ -21966,9 +22125,9 @@ #. item #. -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3053 msgid "Edit Graveyard" msgstr "Kleinen Friedhof bearbeiten" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3059 msgid "Cemetery" msgstr "Friedhof" @@ -21976,39 +22135,39 @@ #. item #. -#: build/trans_presets.java:3049 +#: build/trans_presets.java:3061 msgid "Edit Cemetery Landuse" msgstr "Friedhof bearbeiten" -#: build/trans_presets.java:3056 +#: build/trans_presets.java:3068 msgid "Retail" msgstr "Einkaufsbereich" #. item -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3069 msgid "Edit Retail Landuse" msgstr "Einkaufsbereich bearbeiten" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3062 +#: build/trans_presets.java:3074 msgid "Commercial" msgstr "Gewerbegebiet" #. item -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3075 msgid "Edit Commercial Landuse" msgstr "Gewerbegebiet bearbeiten" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3068 +#: build/trans_presets.java:3080 msgid "Industrial" msgstr "Industrie" #. item -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3081 msgid "Edit Industrial Landuse" msgstr "Industriegebiet bearbeiten" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3086 msgid "Railway land" msgstr "Eisenbahngelände" @@ -22016,15 +22175,15 @@ #. item #. -#: build/trans_presets.java:3076 +#: build/trans_presets.java:3088 msgid "Edit Railway Landuse" msgstr "Eisenbahngelände bearbeiten" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3081 +#: build/trans_presets.java:3093 msgid "Military" msgstr "Militärgebiet" #. item -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3094 msgid "Edit Military Landuse" msgstr "Militärgebiet bearbeiten" @@ -22032,55 +22191,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3100 msgid "Construction area" msgstr "Baustellengebiet" #. item -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3101 msgid "Edit Construction Landuse" msgstr "Baustelle bearbeiten" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3094 +#: build/trans_presets.java:3106 msgid "Brownfield" msgstr "Baulücke" #. item -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3107 msgid "Edit Brownfield Landuse" msgstr "Baulücke bearbeiten" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3100 +#: build/trans_presets.java:3112 msgid "Greenfield" msgstr "Bauland" #. item -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3113 msgid "Edit Greenfield Landuse" msgstr "Bauland bearbeiten" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3118 msgid "Landfill" msgstr "Deponie" #. item -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3119 msgid "Edit Landfill Landuse" msgstr "Deponie bearbeiten" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3124 msgid "Quarry" msgstr "Steinbruch" #. item -#: build/trans_presets.java:3113 +#: build/trans_presets.java:3125 msgid "Edit Quarry Landuse" msgstr "Steinbruch bearbeiten" #. group "Relations" -#: build/trans_presets.java:3122 +#: build/trans_presets.java:3134 msgid "Multipolygon" msgstr "Multipolygon" @@ -22090,5 +22249,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:3126 +#: build/trans_presets.java:3138 msgid "Edit Multipolygon" msgstr "Ein Multipolygon bearbeiten" @@ -22097,10 +22256,10 @@ #. #. -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3144 msgid "outer segment" msgstr "Äußeres Segment" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3145 msgid "inner segment" msgstr "Inneres Segment" @@ -22108,5 +22267,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3148 msgid "Turn restriction" msgstr "Abbiegeeinschränkung" @@ -22115,5 +22274,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3151 msgid "Edit Turn Restriction" msgstr "Abbiegeeinschränkung bearbeiten" @@ -22121,34 +22280,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "Restriction" msgstr "Einschränkung" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_left_turn" msgstr "Nicht links abbiegen" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_right_turn" msgstr "Nicht rechts abbiegen" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_straight_on" msgstr "Nicht geradeaus" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_u_turn" msgstr "Wendeverbot" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_right_turn" msgstr "Nur rechts abbiegen" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_left_turn" msgstr "Nur links abbiegen" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_straight_on" msgstr "Nur geradeaus" @@ -22157,15 +22316,15 @@ #. #. -#: build/trans_presets.java:3146 +#: build/trans_presets.java:3158 msgid "from way" msgstr "Von Weg" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3159 msgid "via node or way" msgstr "Über Knoten oder Weg" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3148 +#: build/trans_presets.java:3160 msgid "to way" msgstr "Zu Weg" @@ -22173,5 +22332,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3151 +#: build/trans_presets.java:3163 msgid "Route" msgstr "Route" @@ -22180,5 +22339,5 @@ #. -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3166 msgid "Edit Route" msgstr "Route bearbeiten" @@ -22186,5 +22345,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "Route type" msgstr "Routentyp" @@ -22256,5 +22415,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:233 +#: build/trans_presets.java:3168 build/trans_style.java:233 #: build/trans_style.java:683 build/trans_style.java:906 #: build/trans_style.java:914 build/trans_style.java:922 @@ -22263,17 +22422,17 @@ msgstr "Fahrrad" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "bus" msgstr "Bus" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "road" msgstr "Straße" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ferry" msgstr "Fähre" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ski" msgstr "Ski" @@ -22326,5 +22485,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:247 +#: build/trans_presets.java:3168 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -22333,13 +22492,13 @@ msgstr "Fuß" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "hiking" msgstr "Wandern" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "tram" msgstr "Straßenbahn" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "detour" msgstr "Umleitung" @@ -22353,10 +22512,10 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:1206 +#: build/trans_presets.java:3168 build/trans_style.java:1206 msgid "subway" msgstr "U-Bahn" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3159 +#: build/trans_presets.java:3171 msgid "Symbol description" msgstr "Symbolbeschreibung" @@ -22364,31 +22523,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3174 msgid "Network" msgstr "Netzwerk" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "Route state" msgstr "Routenstatus" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "proposed" msgstr "geplant" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "alternate" msgstr "alternativ" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "temporary" msgstr "temporär" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "connection" msgstr "Verbindung" -#: build/trans_presets.java:3165 +#: build/trans_presets.java:3177 msgid "Color (hex)" msgstr "Farbe (hex)" @@ -22397,30 +22556,30 @@ #. #. -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3180 msgid "route segment" msgstr "Routenabschnitt" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3181 msgid "forward segment" msgstr "Vorwärts-Abschnitt" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3170 +#: build/trans_presets.java:3182 msgid "backward segment" msgstr "Rückwärts-Abschnitt" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3183 msgid "halt point" msgstr "Haltepunkt" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3172 +#: build/trans_presets.java:3184 msgid "forward halt point" msgstr "Vorwärts-Haltepunkt" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3173 +#: build/trans_presets.java:3185 msgid "backward halt point" msgstr "Rückwärts-Haltepunkt" @@ -26558,4 +26717,30 @@ msgstr "Tschechien UHUL:ORTOFOTO" +#~ msgid "Combine ways with different memberships?" +#~ msgstr "Wege mit unterschiedlicher Mitgliedschaft verbinden?" + +#~ msgid "Combine Anyway" +#~ msgstr "Trotzdem verbinden" + +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "" +#~ "Die ausgewählten Wege sind Elemente unterschiedlicher Relationen. Sollen " +#~ "sie wirklich verbunden werden?" + +#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +#~ msgstr "" +#~ "Fehler-Kopfzeile \"{0}\" entspricht nicht dem erwarteten Muster \"{1}\"" + +#~ msgid "Purging 1 primitive" +#~ msgstr "1 Objekt entfernen" + +#~ msgid "removing reference from way {0}" +#~ msgstr "Entferne Referenz aus Weg {0}" + +#~ msgid "Empty member in relation." +#~ msgstr "Leeres Element in der Relation." + #~ msgid "No data imported." #~ msgstr "Keine Daten importiert." Index: /applications/editors/josm/i18n/po/el.po =================================================================== --- /applications/editors/josm/i18n/po/el.po (revision 17821) +++ /applications/editors/josm/i18n/po/el.po (revision 17822) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-22 17:52+0200\n" +"POT-Creation-Date: 2009-09-28 16:38+0200\n" "PO-Revision-Date: 2009-09-22 14:35+0000\n" "Last-Translator: logictheo \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-22 15:45+0000\n" +"X-Launchpad-Export-Date: 2009-09-28 14:34+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -66,8 +66,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250 @@ -90,9 +90,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -141,7 +141,7 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:172 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 @@ -154,5 +154,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 @@ -329,6 +328,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -338,6 +336,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 @@ -347,5 +345,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -356,5 +354,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180 @@ -363,5 +361,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -454,9 +452,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -488,10 +486,9 @@ msgstr "Παρακαλώ επιλέξτε τουλάχιστον τέσσερεις κόμβους." -#. FIXME: not sure whether this fits in a dialog #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:85 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -601,5 +598,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 #, java-format msgid "File: {0}" @@ -621,36 +618,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine Way" msgstr "Σύνδεση Δρόμου" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 msgid "Combine several ways into one." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 -msgid "Combine ways with different memberships?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -msgid "Combine Anyway" -msgstr "Επιβεβαίωση συνδυασμού" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 msgid "Change directions?" msgstr "Αλλαγή κατευθήνσεων;" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Reverse and Combine" msgstr "Αντισροφή και Συνδυασμός" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -658,5 +641,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -664,10 +647,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 #, java-format msgid "Combine {0} ways" msgstr "Ένωσε {0} δρόμους" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 msgid "Please select at least two ways to combine." msgstr "" @@ -712,6 +695,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -777,5 +759,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -806,5 +788,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307 #, java-format msgid "There were {0} conflicts during import." @@ -822,5 +803,4 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Duplicate" @@ -851,10 +831,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:209 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Εξαγωγή σε GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:208 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Εξαγωγή των δεδομένων σε αρχείο GPX." @@ -865,8 +845,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -931,5 +911,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 @@ -972,6 +952,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1060,22 +1039,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge Nodes" msgstr "Συγχώνευση Κόμβων" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 msgid "Merge nodes into the oldest one." msgstr "Συγχώνευση κόμβων στον παλαιότερο." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 msgid "Please select at least two nodes to merge." msgstr "Παρακαλώ επιλέξτε τουλάχιστον δύο κόμβους για συγχώνευση." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 #, java-format msgid "Merge {0} nodes" @@ -1147,5 +1126,4 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350 msgid "New" msgstr "Νέα" @@ -1325,10 +1303,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Αποθήκευση" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Αποθήκευση τεχόντων δεδομένων." @@ -1383,10 +1361,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Αποθήκευση ως..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Αποθήκευση τρεχόντων δεδομένων σε νέο αρχείο." @@ -1429,5 +1407,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:961 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888 @@ -1667,14 +1645,14 @@ msgstr "Κενή επιλογή" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 msgid "Upload to OSM..." msgstr "Αποστολή προς OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload all changes to the OSM server." msgstr "Αποστολή όλων των αλλαγών στον δακομιστή του OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 #, java-format msgid "" @@ -1683,23 +1661,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Τίποτα για αποστολή. Κάντε λήψη δεδομένων πρώτα." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:171 msgid "No changes to upload." msgstr "Δεν υπάρχουν αλλαγές προς αποστολή" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223 #, java-format msgid "Synchronize {0} {1} only" msgstr "Συγχρονισμός μόνο {0} {1}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 msgid "Synchronize entire dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:228 #, java-format msgid "" @@ -1713,17 +1691,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:283 msgid "Conflict detected" msgstr "" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:257 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 #, java-format msgid "Unexpected return value. Got {0}." msgstr "μη αναμενόμενη επιστρεφόμενη τιμή. Λήφθηκε {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:272 #, java-format msgid "" @@ -1734,5 +1712,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:306 #, java-format msgid "" @@ -1742,9 +1720,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 msgid "Changeset closed" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" @@ -1753,25 +1731,30 @@ "αναμενόμενο πρότυπο \"{1}\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:425 #, java-format msgid "Uploading failed.
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:434 msgid "Upload to OSM API failed" msgstr "Η αποστολή στο OSM API απέτυχε" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457 msgid "Updating primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:514 #, java-format msgid "Uploading data for layer ''{0}''" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." msgstr "" @@ -1860,13 +1843,13 @@ msgstr "Πιο αργά μπροστά" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34 msgid "Downloading GPS data" msgstr "Λήψη δεδομένων GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57 msgid "Downloaded GPX Data" msgstr "Λήψη Δεδομένων GPX" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87 msgid "Raw GPS data" msgstr "Ακατέργαστα δεδομένα GPS" @@ -1881,4 +1864,9 @@ "Ignoring exception because download has been cancelled. Exception was: {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 +#, fuzzy +msgid "No data found in this area." +msgstr "Δεν βρέθηκαν δεδομένα στη συσκευή." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2575,9 +2563,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 +#, java-format +msgid "" +"Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -2626,5 +2614,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Delete from relation" msgstr "Διαγραφή από σχέση" @@ -2677,14 +2665,15 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 -msgid "Purging 1 primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 -#, java-format -msgid "removing reference from way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 +#, fuzzy, java-format +msgid "Purged object ''{0}''" +msgstr "Μετακίνηση αντικειμένων {0}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 +#, fuzzy, java-format +msgid "Purged {0} objects" +msgstr "Αλλαγή {0} αντικειμένου" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 #, java-format msgid "" @@ -2693,7 +2682,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203 -#, java-format -msgid "removing reference from relation {0}" +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 +#, fuzzy, java-format +msgid "Removing reference from relation {0}" msgstr "Αφαίρεση αναφοράς από την σχέση {0}" @@ -2701,4 +2690,9 @@ #, java-format msgid "Resolve conflicts in member list of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -3040,24 +3034,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Error: {0}" msgstr "Σφάλμα: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Warning: {0}" msgstr "Προειδοποίηση: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3065,5 +3059,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3089,6 +3083,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:244 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3144,120 +3138,113 @@ msgstr "" -#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed -#. TODO Remove useless nullcheck when RelationMember.member is encalupsed -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855 -msgid "Empty member in relation." -msgstr "Άδειο μέλος στη σχέση." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:850 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Διαγράφηκε το μέλος ''{0}'' της σχέσης." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:861 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:607 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:613 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627 msgid "More than one \"via\" found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:632 #, java-format msgid "Unknown role ''{0}''." msgstr "Άγνωστος ρόλος \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Άγνωστος τύπος μέλους για το \"{0}\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:641 msgid "No \"from\" way found." msgstr "Οδός \"από\" δεν βρέθηκε." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:649 msgid "No \"via\" node or way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:658 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:662 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693 -msgid "The \"from\" way doesn't start or end at the \"via\" way." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:870 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:882 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:940 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1029 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1041 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Εσωτερικός δρόμος \"{0}\" είναι από έξω." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1094 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1120 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1324 msgid "untagged" msgstr "Χωρίς ετικέτα" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1325 msgid "text" msgstr "κείμενο" @@ -3279,5 +3266,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:249 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 @@ -3288,5 +3275,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 @@ -3315,5 +3302,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:169 msgid "background" msgstr "φόντο" @@ -3410,5 +3397,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "railway" msgstr "σιδηρόδρομος" @@ -3464,9 +3451,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +#, fuzzy +msgid "Not Found" +msgstr "Χωρίς σύνδεση" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 msgid "Unknown host" msgstr "Άγνωστος υπολογιστής" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:247 msgid "Primitive already deleted" msgstr "" @@ -4775,5 +4767,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -4988,43 +4980,43 @@ msgstr "Μέλος του" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 msgid "Add Properties" msgstr "Προσθήκη Ιδιοτήτων" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 msgid "Add a new key/value pair to all objects" msgstr "Προσθήκη νέου ζεύγους κλειδιού/τιμής σε όλα τα αντικείμενα" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 msgid "Edit Properties" msgstr "Επεξεργασία Ιδιοτήτων" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 msgid "Edit the value of the selected key for all objects" msgstr "Επεξεργασία της τιμής του επιλεγμένου κλειδιού για όλα τα αντικείμενα" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Ιδιότητες: {0} / Υπαγωγές: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 msgid "Properties / Memberships" msgstr "Ιδιότητες / Υπαγωγές" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 msgid "Change relation" msgstr "Αλλαγή σχέσης" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Σίγουρα επιθυμήτε την διαγραφή της επιλογής από την σχέση {0};" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:855 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 msgid "Delete the selected key in all objects" msgstr "Διαγραφή του επιλεγμένου κλειδιού από όλα τα αντικείμενα" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 msgid "Delete Properties" msgstr "Διαγραφή Ιδιοτήτων" @@ -5034,6 +5026,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168 -#: build/trans_presets.java:3121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 +#: build/trans_presets.java:3133 msgid "Relations" msgstr "Σχέσεις" @@ -5043,25 +5035,30 @@ msgstr "Άνοιγμα λίστας όλων τον σχέσεων." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:174 #, java-format msgid "Relations: {0}" msgstr "Σχέσεις: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 msgid "Open an editor for the selected relation" msgstr "Άνοιγμα επεξεργαστή για την επιλεγμένη σχέση" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:325 msgid "Delete the selected relation" msgstr "Διαγραφή της επιλεγμένης σχέσης" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:363 msgid "Create a new relation" msgstr "Σημιουργία νέας σχέσης" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:400 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280 msgid "Create a copy of this relation and open it in another editor window" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 +#, fuzzy +msgid "Set the current selection to the list of selected relations" +msgstr "Η τρέχουσα επιλογή δεν μπορεί να χρησιμοποιηθεί για διαίρεση." #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5102,9 +5099,9 @@ msgstr "Επιλογή: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 msgid "Undock the panel" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5113,5 +5110,5 @@ "αριστερή εργαλειοθήκη." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 msgid "Click to minimize/maximize the panel content" msgstr "" @@ -5625,5 +5622,5 @@ #. group "Geography" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2771 msgid "Places" msgstr "Τοποθεσίες" @@ -6297,6 +6294,4 @@ #. item "Man Made/Windmill" label "Edit Windmill" #. -#. item "Man Made/Pipeline" label "Edit Pipeline" -#. #. item "Man Made/Wastewater Plant" label "Edit Wastewater Plant" #. @@ -6309,4 +6304,6 @@ #. item "Man Made/Surveillance" label "Edit Surveillance Camera" #. +#. item "Man Made/Power Station" label "Edit Power Station" +#. #. item "Amenities/Fountain" label "Edit Fountain" #. @@ -6631,57 +6628,57 @@ #: build/trans_presets.java:2250 build/trans_presets.java:2258 #: build/trans_presets.java:2290 build/trans_presets.java:2295 -#: build/trans_presets.java:2300 build/trans_presets.java:2305 -#: build/trans_presets.java:2311 build/trans_presets.java:2317 -#: build/trans_presets.java:2323 build/trans_presets.java:2331 -#: build/trans_presets.java:2337 build/trans_presets.java:2343 -#: build/trans_presets.java:2349 build/trans_presets.java:2355 -#: build/trans_presets.java:2365 build/trans_presets.java:2462 -#: build/trans_presets.java:2469 build/trans_presets.java:2483 -#: build/trans_presets.java:2489 build/trans_presets.java:2496 -#: build/trans_presets.java:2503 build/trans_presets.java:2509 -#: build/trans_presets.java:2515 build/trans_presets.java:2537 -#: build/trans_presets.java:2544 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2305 build/trans_presets.java:2310 +#: build/trans_presets.java:2316 build/trans_presets.java:2322 +#: build/trans_presets.java:2339 build/trans_presets.java:2345 +#: build/trans_presets.java:2351 build/trans_presets.java:2357 +#: build/trans_presets.java:2363 build/trans_presets.java:2373 +#: build/trans_presets.java:2380 build/trans_presets.java:2474 +#: build/trans_presets.java:2481 build/trans_presets.java:2495 +#: build/trans_presets.java:2501 build/trans_presets.java:2508 +#: build/trans_presets.java:2515 build/trans_presets.java:2521 +#: build/trans_presets.java:2527 build/trans_presets.java:2549 +#: build/trans_presets.java:2556 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2576 #: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2594 build/trans_presets.java:2601 -#: build/trans_presets.java:2608 build/trans_presets.java:2615 -#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2594 build/trans_presets.java:2600 +#: build/trans_presets.java:2606 build/trans_presets.java:2613 +#: build/trans_presets.java:2620 build/trans_presets.java:2627 #: build/trans_presets.java:2633 build/trans_presets.java:2639 -#: build/trans_presets.java:2645 build/trans_presets.java:2652 -#: build/trans_presets.java:2659 build/trans_presets.java:2666 -#: build/trans_presets.java:2672 build/trans_presets.java:2678 -#: build/trans_presets.java:2688 build/trans_presets.java:2697 -#: build/trans_presets.java:2712 build/trans_presets.java:2718 -#: build/trans_presets.java:2726 build/trans_presets.java:2733 -#: build/trans_presets.java:2753 build/trans_presets.java:2764 -#: build/trans_presets.java:2770 build/trans_presets.java:2776 +#: build/trans_presets.java:2645 build/trans_presets.java:2651 +#: build/trans_presets.java:2657 build/trans_presets.java:2664 +#: build/trans_presets.java:2671 build/trans_presets.java:2678 +#: build/trans_presets.java:2684 build/trans_presets.java:2690 +#: build/trans_presets.java:2700 build/trans_presets.java:2709 +#: build/trans_presets.java:2724 build/trans_presets.java:2730 +#: build/trans_presets.java:2738 build/trans_presets.java:2745 +#: build/trans_presets.java:2765 build/trans_presets.java:2776 #: build/trans_presets.java:2782 build/trans_presets.java:2788 -#: build/trans_presets.java:2795 build/trans_presets.java:2802 -#: build/trans_presets.java:2809 build/trans_presets.java:2815 -#: build/trans_presets.java:2821 build/trans_presets.java:2829 -#: build/trans_presets.java:2836 build/trans_presets.java:2843 -#: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2879 build/trans_presets.java:2885 +#: build/trans_presets.java:2794 build/trans_presets.java:2800 +#: build/trans_presets.java:2807 build/trans_presets.java:2814 +#: build/trans_presets.java:2821 build/trans_presets.java:2827 +#: build/trans_presets.java:2833 build/trans_presets.java:2841 +#: build/trans_presets.java:2848 build/trans_presets.java:2855 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2875 build/trans_presets.java:2882 #: build/trans_presets.java:2891 build/trans_presets.java:2897 -#: build/trans_presets.java:2903 build/trans_presets.java:2912 -#: build/trans_presets.java:2922 build/trans_presets.java:2931 -#: build/trans_presets.java:2937 build/trans_presets.java:2943 -#: build/trans_presets.java:2948 build/trans_presets.java:2954 -#: build/trans_presets.java:2960 build/trans_presets.java:2969 -#: build/trans_presets.java:2975 build/trans_presets.java:2981 +#: build/trans_presets.java:2903 build/trans_presets.java:2909 +#: build/trans_presets.java:2915 build/trans_presets.java:2924 +#: build/trans_presets.java:2934 build/trans_presets.java:2943 +#: build/trans_presets.java:2949 build/trans_presets.java:2955 +#: build/trans_presets.java:2960 build/trans_presets.java:2966 +#: build/trans_presets.java:2972 build/trans_presets.java:2981 #: build/trans_presets.java:2987 build/trans_presets.java:2993 #: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3012 build/trans_presets.java:3018 -#: build/trans_presets.java:3023 build/trans_presets.java:3030 -#: build/trans_presets.java:3037 build/trans_presets.java:3043 -#: build/trans_presets.java:3052 build/trans_presets.java:3060 -#: build/trans_presets.java:3066 build/trans_presets.java:3072 -#: build/trans_presets.java:3079 build/trans_presets.java:3085 -#: build/trans_presets.java:3092 build/trans_presets.java:3098 +#: build/trans_presets.java:3011 build/trans_presets.java:3017 +#: build/trans_presets.java:3024 build/trans_presets.java:3030 +#: build/trans_presets.java:3035 build/trans_presets.java:3042 +#: build/trans_presets.java:3049 build/trans_presets.java:3055 +#: build/trans_presets.java:3064 build/trans_presets.java:3072 +#: build/trans_presets.java:3078 build/trans_presets.java:3084 +#: build/trans_presets.java:3091 build/trans_presets.java:3097 #: build/trans_presets.java:3104 build/trans_presets.java:3110 -#: build/trans_presets.java:3116 build/trans_presets.java:3129 -#: build/trans_presets.java:3143 build/trans_presets.java:3157 +#: build/trans_presets.java:3116 build/trans_presets.java:3122 +#: build/trans_presets.java:3128 build/trans_presets.java:3141 +#: build/trans_presets.java:3155 build/trans_presets.java:3169 msgid "Name" msgstr "Όνομα" @@ -6744,5 +6741,4 @@ msgstr "" -#. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 msgid "Close the selected open changesets" @@ -6770,25 +6766,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "Yes" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "No" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47 #, java-format msgid "Layer ''{0}'' has modifications which should be uploaded to the server." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49 #, java-format msgid "Layer ''{0}'' has no modifications to be uploaded." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60 #, java-format msgid "" @@ -6797,29 +6793,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62 #, java-format msgid "Layer ''{0}'' has no modifications to be saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80 msgid "No file associated with this layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:83 msgid "Please select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:86 #, java-format msgid "Layer ''{0}'' is not backed by a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:101 #, java-format msgid "File ''{0}'' is not writable. Please enter another file name." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:115 #, java-format msgid "Select to upload layer ''{0}'' to the server ''{1}''" @@ -6912,5 +6908,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -msgid "Save and Exit" +#, fuzzy +msgid "Save/Upload and Exit" msgstr "Αποθήκευση και Έξοδος" @@ -6920,6 +6917,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -msgid "Save and Delete" -msgstr "" +#, fuzzy +msgid "Save/Upload and Delete" +msgstr "Ακυρώθηκε η αποστολή" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 @@ -6935,5 +6933,5 @@ msgid "" "An upload and/or save operation of one layer with modifications
was " -"cancelled or has been failed." +"cancelled or has failed." msgstr "" @@ -7019,6 +7017,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:891 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:921 msgid "Tags of new changeset" msgstr "" @@ -7115,7 +7113,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:909 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:933 #, java-format msgid "Tags of changeset {0}" @@ -7123,48 +7120,48 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:949 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:963 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1011 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106 msgid "Preparing primitives to upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Εικόνες για {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "Ανάγνωση GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Δεν υπάρχει ώρα για το σημείο {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Αδύνατη η ανάγνωση ώρας \"{0}\" από το σημείο {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325 msgid "No images with readable timestamps found." msgstr "Δεν βρέθηκαν εικόνες με αναγνώσιμη χρονοσήμανση." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format @@ -7172,29 +7169,29 @@ msgstr "Ανάγνωση {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:402 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246 msgid "Geotagged Images" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:587 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "GPS start: {0}" msgstr "Αρχή GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 #, java-format msgid "GPS end: {0}" msgstr "Τέλος GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594 #, java-format msgid "current delta: {0}s" msgstr "τρέχουσα διαφορά: {0} δευτερόλεπτα" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595 msgid "timezone difference: " msgstr "διαφορά στη ζώνη ώρας: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284 msgid "image" @@ -7203,14 +7200,14 @@ msgstr[1] "εικόνες" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #, java-format msgid "{0} within the track." msgstr "{0} μέσα στο ίχνος" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680 msgid "Sync clock" msgstr "Συγχρονισμός ρολογιού" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7218,32 +7215,32 @@ msgstr "Εικόνες JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:734 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Η ημερομηνία στο αρχείο \"{0}\" δεν μπόρεσε να ερμηνευθεί." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Δεν υπάρχει ώρα EXIF μέσα στο αρχείο \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 msgid "Image" msgstr "Εικόνα" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:752 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Εισάγετε την εμφνιζόμενη ημερομηνία (μμ/ηη/εεεε ΩΩ:ΛΛ:ΔΔ)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759 msgid "GPS unit timezone (difference to photo)" msgstr "ζώνη ώρας της συσκευής GPS (διαφορά από την φωτογραφία)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:767 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771 msgid "Synchronize Time with GPS Unit" msgstr "Συγχρονισμός Ώρας με τη μονάδα GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:790 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 msgid "Time entered could not be parsed." msgstr "Η ώρα ποθ εισήχθει δεν μπόρεσε να ερμηνευθεί." @@ -7327,5 +7324,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 #, java-format msgid "Name: {0}" @@ -7348,5 +7345,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3160 +#: build/trans_presets.java:3172 msgid "Description" msgstr "Περιγραφή" @@ -7402,5 +7399,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:587 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 @@ -7464,42 +7461,65 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:105 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:107 #, java-format msgid "Data Layer {0}" msgstr "Επίπεδο Δεδομένων {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 msgid "outside downloaded area" msgstr "εκτός περιοχής λήψης" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:252 #, java-format msgid "version {0}" msgstr "έκδοση {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:289 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:290 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 +#, fuzzy, java-format +msgid "There was {0} conflict detected." +msgid_plural "There were {0} conflicts detected." +msgstr[0] "Υπήρξαν {0} συγκρούσεις κατά την εισαγωγή." +msgstr[1] "Υπήρξαν {0} συγκρούσεις κατά την εισαγωγή." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 +#, java-format +msgid "" +"{0} object has been purged from the local dataset because it is deleted on " +"the server." +msgid_plural "" +"{0} objects have been purged from the local dataset because they are deleted " +"on the server." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 +#, fuzzy +msgid "Conflicts detected" +msgstr "Συγκρούσεις" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 #, java-format msgid "{0} consists of:" msgstr "το {0} αποτελείται από:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:476 #, java-format msgid " ({0} deleted.)" msgstr " ({0} διαγράφηκαν.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 #, java-format msgid "API version: {0}" msgstr "Έκδοση API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:501 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:584 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" @@ -7853,5 +7873,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:412 #: ../plugins/terracer/src/terracer/TerracerAction.java:430 @@ -8587,5 +8607,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261 msgid "More information about this feature" msgstr "Περισότερες πληροφορίες για αυτό το χαρακτηριστικό" @@ -8634,5 +8654,5 @@ msgstr "Υποστηρίζονται στοιχεία τύπου {0}." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:700 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -8642,18 +8662,18 @@ msgstr[1] "Αλλαγή {0} αντικειμένων" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Τίποτα επιλεγμένο!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 msgid "Apply Preset" msgstr "Εφαρμογή Προεπιλογής" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788 msgid "Change Properties" msgstr "Αλλαγή ιδιοτήτων" @@ -8939,44 +8959,44 @@ msgstr "Κλείσιμο πακέτου αλλαγών" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 msgid "Preparing..." msgstr "Προετοιμασία..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 msgid "Uploading..." msgstr "Αποστολή..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9207,5 +9227,5 @@ msgid "" "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}''," -"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." +"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." msgstr "" @@ -9322,6 +9342,6 @@ #, java-format msgid "" -"Relation with external id ''{0}'' refers to missing primitive with external " -"id ''{1}''." +"Relation with external id ''{0}'' refers to a missing primitive with " +"external id ''{1}''." msgstr "" @@ -9418,32 +9438,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:73 msgid "Starting to upload with one request per primitive ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Starting to upload in one request ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 +#, java-format +msgid "Parameter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 msgid "Uploading data ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 msgid "" "WARNING: no API version defined for data to upload. Falling back to version " @@ -9451,5 +9476,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:153 #, java-format msgid "" @@ -9678,5 +9703,5 @@ #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:202 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:324 build/trans_presets.java:325 @@ -9698,6 +9723,6 @@ #: build/trans_presets.java:789 build/trans_presets.java:1333 #: build/trans_presets.java:1400 build/trans_presets.java:1401 -#: build/trans_presets.java:1402 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 +#: build/trans_presets.java:1402 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 msgid "unknown" msgstr "άγνωστο" @@ -9844,5 +9869,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:192 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:182 +#, java-format +msgid "" +"The OSM server ''{0}'' doesn't know about an object
you tried to read, " +"update, or delete. Either the respective object
doesn''t exist on the " +"server or you''re using an invalid URL to access
it. Please carefully " +"check the servers address ''{1}'' for typos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:209 #, java-format msgid "" @@ -9852,5 +9886,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:262 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:279 #, java-format msgid "" @@ -10110,17 +10144,15 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35 msgid "Define Address Interpolation" msgstr "" -#. Whether to re-trigger data changed for relation #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "Μονά" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:413 #: ../plugins/terracer/src/terracer/TerracerAction.java:437 @@ -10128,99 +10160,99 @@ msgstr "Ζυγά" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 msgid "Alphabetic" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161 #, java-format msgid "Relation: {0}" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173 msgid "Associate with street using:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184 msgid "Numbering Scheme:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 msgid "Starting #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188 msgid "Ending #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 #, java-format msgid "Will associate {0} additional house number nodes" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 msgid "Starting address number must be less than ending address number" msgstr "" @@ -10957,4 +10989,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52 +#: build/trans_presets.java:2331 msgid "Location" msgstr "Θέση" @@ -11496,4 +11529,5 @@ msgstr "νοτιοανατολικά" +#. item "Man Made/Pipeline" combo "Type" #. color highway_track #. @@ -11539,7 +11573,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:990 build/trans_style.java:1007 -#: build/trans_style.java:1023 build/trans_style.java:3400 -#: build/trans_style.java:3408 +#: build/trans_presets.java:2330 build/trans_style.java:990 +#: build/trans_style.java:1007 build/trans_style.java:1023 +#: build/trans_style.java:3400 build/trans_style.java:3408 msgid "water" msgstr "νερό" @@ -14087,9 +14121,11 @@ #. item "Public Transport/Airport" text "Name" #. +#. item "Man Made/Power Station" text "Operator" #. item "Relations/Route" text "Name" #: build/trans_presets.java:65 build/trans_presets.java:101 #: build/trans_presets.java:121 build/trans_presets.java:141 #: build/trans_presets.java:178 build/trans_presets.java:198 -#: build/trans_presets.java:1560 build/trans_presets.java:3158 +#: build/trans_presets.java:1560 build/trans_presets.java:2382 +#: build/trans_presets.java:3170 msgid "Reference" msgstr "" @@ -14651,5 +14687,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 msgid "metal" msgstr "" @@ -14669,5 +14705,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 #: build/trans_style.java:3375 msgid "wood" @@ -14956,7 +14992,7 @@ #: build/trans_presets.java:1401 build/trans_presets.java:1402 #: build/trans_presets.java:1767 build/trans_presets.java:1777 -#: build/trans_presets.java:2408 build/trans_presets.java:2444 -#: build/trans_presets.java:2453 build/trans_presets.java:2454 -#: build/trans_presets.java:2455 build/trans_presets.java:2725 +#: build/trans_presets.java:2420 build/trans_presets.java:2456 +#: build/trans_presets.java:2465 build/trans_presets.java:2466 +#: build/trans_presets.java:2467 build/trans_presets.java:2737 msgid "yes" msgstr "ναι" @@ -15105,8 +15141,8 @@ #: build/trans_presets.java:1400 build/trans_presets.java:1401 #: build/trans_presets.java:1402 build/trans_presets.java:1767 -#: build/trans_presets.java:1777 build/trans_presets.java:2408 -#: build/trans_presets.java:2444 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 -#: build/trans_presets.java:2725 +#: build/trans_presets.java:1777 build/trans_presets.java:2420 +#: build/trans_presets.java:2456 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 +#: build/trans_presets.java:2737 msgid "no" msgstr "όχι" @@ -15244,6 +15280,8 @@ #. item "Water/Wetland" text "Name" #. item "Car/Parking" text "Reference number" +#. item "Man Made/Pipeline" text "Operator" #. item "Man Made/Power Generator" label "Edit Power Generator" #. +#. item "Man Made/Power Tower" label "Edit Power Tower" #. item "Land use/Tree" text "Name" #. item "Land use/Wood" text "Name" @@ -15251,7 +15289,8 @@ #: build/trans_presets.java:350 build/trans_presets.java:649 #: build/trans_presets.java:789 build/trans_presets.java:1137 -#: build/trans_presets.java:1395 build/trans_presets.java:2364 -#: build/trans_presets.java:2913 build/trans_presets.java:2923 -#: build/trans_presets.java:2932 +#: build/trans_presets.java:1395 build/trans_presets.java:2330 +#: build/trans_presets.java:2372 build/trans_presets.java:2398 +#: build/trans_presets.java:2925 build/trans_presets.java:2935 +#: build/trans_presets.java:2944 msgid "Type" msgstr "Τύπος" @@ -15801,10 +15840,10 @@ #. item "Tourism/Information Terminal" text "Closer description" #. item "Tourism/Audioguide" text "Closer description" -#. item "Man Made/Power Station" label "Edit Power Station" -#. +#. item "Man Made/Tower" text "Height (meters)" +#. item "Man Made/Pipeline" label "Edit Pipeline" +#. +#. item "Man Made/Power Station" text "Name" #. item "Man Made/Power Sub Station" label "Edit Power Sub Station" #. -#. item "Man Made/Power Line" label "Edit Power Line" -#. #. item #. #: build/trans_presets.java:1535 build/trans_presets.java:1789 -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2465 msgid "Shelter" msgstr "Καταφύγιο" @@ -18162,5 +18203,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1877 build/trans_presets.java:2669 +#: build/trans_presets.java:1877 build/trans_presets.java:2681 msgid "Sports" msgstr "Αθλητικά" @@ -19513,6 +19554,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "Religion" msgstr "Θρησκεία" @@ -19521,66 +19562,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "bahai" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "buddhist" msgstr "βουδισμός" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "christian" msgstr "χριστιανισμός" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "hindu" msgstr "ινδουϊσμός" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jain" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jewish" msgstr "ιουδαϊσμός" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "muslim" msgstr "μουσουλμανισμός" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "sikh" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "spiritualist" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "taoist" msgstr "ταοϊσμός" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "zoroastrian" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "Denomination" msgstr "Δόγμα" @@ -19589,76 +19630,76 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "anglican" msgstr "αγγλικανικό" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "baptist" msgstr "βαπτιστικό" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "catholic" msgstr "καθολικό" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "evangelical" msgstr "ευαγγελικό" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "jehovahs_witness" msgstr "μαρτύρων του Ιεχοβά" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "lutheran" msgstr "λουθερανικό" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "methodist" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "mormon" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "orthodox" msgstr "ορθόδοξο" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "pentecostal" msgstr "πεντηκωστής" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "presbyterian" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "protestant" msgstr "προτεσταντικό" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "quaker" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "shia" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "sunni" msgstr "" @@ -19754,25 +19795,49 @@ #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2296 +#, fuzzy +msgid "Tower type" +msgstr "Τύπος Διαδρομής" + +#. item "Man Made/Tower" combo "Tower type" +#: build/trans_presets.java:2296 +#, fuzzy +msgid "communication" +msgstr "σύνδεση" + +#: build/trans_presets.java:2296 +#, fuzzy +msgid "observation" +msgstr "Υψόμετρο" + +#. +#: build/trans_presets.java:2298 +#, fuzzy +msgid "Height (meters)" +msgstr "Μέγιστο Ύψος (μέτρα)" + +#. item "Man Made/Tower" text "Operator" +#. +#: build/trans_presets.java:2302 msgid "Water Tower" msgstr "Υδραγωγείο" #. item -#: build/trans_presets.java:2298 +#: build/trans_presets.java:2303 msgid "Edit Water Tower" msgstr "Επεξεργασία Υδραγωγείου" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2307 msgid "Gasometer" msgstr "Μετρητής Αερίου" #. item -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2308 msgid "Edit Gasometer" msgstr "Επεξεργασία Μετρητή Αερίου" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2307 +#: build/trans_presets.java:2312 msgid "Lighthouse" msgstr "Φάρος" @@ -19780,10 +19845,10 @@ #. item #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2314 msgid "Edit Lighthouse" msgstr "Επεξεργασία Φάρου" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2318 msgid "Windmill" msgstr "Ανεμόμυλος" @@ -19791,21 +19856,55 @@ #. item #. -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2320 msgid "Edit Windmill" msgstr "Επεξεργασία Ανεμόμυλου" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2319 +#: build/trans_presets.java:2324 msgid "Pipeline" msgstr "Αγωγός" #. item -#. -#: build/trans_presets.java:2321 +#. +#: build/trans_presets.java:2327 msgid "Edit Pipeline" msgstr "Επεξεργασία Αγωγού" -#. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2330 +#, fuzzy +msgid "oil" +msgstr "Τουαλέτες" + +#: build/trans_presets.java:2330 build/trans_presets.java:2372 +msgid "gas" +msgstr "Αέριο" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "sewage" +msgstr "χρήση" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "heat" +msgstr "υγεία" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "any substance" +msgstr "Α κατά Απόσταση" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "underwater" +msgstr "νερό" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "overground" +msgstr "υπόγειο" + +#: build/trans_presets.java:2333 msgid "Wastewater Plant" msgstr "Βιολογικός Καθαρισμός" @@ -19815,10 +19914,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:2329 +#: build/trans_presets.java:2337 msgid "Edit Wastewater Plant" msgstr "Επεξεργασία Βιολογικού Καθαρισμού" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2333 +#: build/trans_presets.java:2341 msgid "Crane" msgstr "Γερανός" @@ -19826,10 +19925,10 @@ #. item #. -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2343 msgid "Edit Crane" msgstr "Επεξεργασία Γερανού" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2347 msgid "Beacon" msgstr "Φάρος" @@ -19837,10 +19936,10 @@ #. item #. -#: build/trans_presets.java:2341 +#: build/trans_presets.java:2349 msgid "Edit Beacon" msgstr "Επεξεργασία Φάρου" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2353 msgid "Survey Point" msgstr "" @@ -19848,10 +19947,10 @@ #. item #. -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2355 msgid "Edit Survey Point" msgstr "" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2359 msgid "Surveillance" msgstr "Παρακολούθηση" @@ -19859,5 +19958,5 @@ #. item #. -#: build/trans_presets.java:2353 +#: build/trans_presets.java:2361 msgid "Edit Surveillance Camera" msgstr "Επεξεργασία Κάμερας Παρακολούθησης" @@ -19865,5 +19964,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2366 msgid "Power Generator" msgstr "Γεννήτρια Ρεύματος" @@ -19873,39 +19972,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:2362 +#: build/trans_presets.java:2370 msgid "Edit Power Generator" msgstr "Επεξεργασία Γεννήτριας Ρεύματος" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "wind" msgstr "Αέρας" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "hydro" msgstr "Νερό" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "fossil" msgstr "" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "nuclear" msgstr "Πυρηνικό" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "coal" msgstr "Λιγνίτης" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "photovoltaic" msgstr "Φωτοβολταϊκό" -#: build/trans_presets.java:2364 -msgid "gas" -msgstr "Αέριο" - #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2375 msgid "Power Station" msgstr "Σταθμός Παραγωγής Ρεύματος" @@ -19914,10 +20009,10 @@ #. -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2378 msgid "Edit Power Station" msgstr "Επεξεργασία Σταθμού Παραγωγής Ρεύματος" -#. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2374 +#. item "Man Made/Power Station" text "Reference" +#: build/trans_presets.java:2384 msgid "Power Sub Station" msgstr "Υποσταθμός Ρεύματος" @@ -19926,5 +20021,5 @@ #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2387 msgid "Edit Power Sub Station" msgstr "Επεξεργασία Υποσταθμού Ρεύματος" @@ -19932,10 +20027,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2380 build/trans_presets.java:2396 +#: build/trans_presets.java:2390 build/trans_presets.java:2407 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2382 +#: build/trans_presets.java:2392 msgid "Power Tower" msgstr "Πυλώνας Ρεύματος" @@ -19946,11 +20041,26 @@ #. 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:2387 +#: build/trans_presets.java:2397 msgid "Edit Power Tower" msgstr "Επεξεργασία Πυλώνα Ρεύματος" -#. item "Man Made/Power Tower" label "Edit Power Tower" -#. -#: build/trans_presets.java:2390 +#. item "Man Made/Power Tower" combo "Type" +#: build/trans_presets.java:2398 +#, fuzzy +msgid "tower" +msgstr "Πύργος" + +#: build/trans_presets.java:2398 +#, fuzzy +msgid "pole" +msgstr "Ρόλος" + +#: build/trans_presets.java:2399 +#, fuzzy +msgid "Tower reference" +msgstr "Προτιμήσεις" + +#. item "Man Made/Power Tower" text "Tower reference" +#: build/trans_presets.java:2401 msgid "Power Line" msgstr "Αγωγός Μεταφοράς Ρεύματος" @@ -19959,40 +20069,82 @@ #. -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2404 msgid "Edit Power Line" msgstr "Επεξεργασία Αγωγού Μεταφοράς Ρεύματος" +#. item "Man Made/Power Line" label "Edit Power Line" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "Line type" +msgstr "Είδος Διάβασης" + +#. item "Man Made/Power Line" combo "Line type" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "line" +msgstr "Αγωγός" + +#: build/trans_presets.java:2405 +msgid "minor_line" +msgstr "" + #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2408 msgid "Voltage" msgstr "Τάση ρεύματος" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2398 -msgid "Amount of Wires" +#: build/trans_presets.java:2409 +#, fuzzy +msgid "Amount of Cables" msgstr "Ποσότητα Αγωγών" -#. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2401 +#. item "Man Made/Power Line" text "Amount of Cables" +#: build/trans_presets.java:2410 +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:2410 +#, fuzzy +msgid "single" +msgstr "Γωνία" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "double" +msgstr "Ρόλος" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "triple" +msgstr "<πολλαπλές>" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "quad" +msgstr "λατομείο" + +#: build/trans_presets.java:2413 msgid "Amenities" msgstr "" #. group "Amenities" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2414 msgid "Toilets" msgstr "Τουαλέτες" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2409 build/trans_presets.java:2525 +#: build/trans_presets.java:2421 build/trans_presets.java:2537 msgid "Note" msgstr "Σημείωση" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2411 +#: build/trans_presets.java:2423 msgid "Post Box" msgstr "Γραμματοκιβώτιο" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2428 msgid "Telephone" msgstr "Τηλέφωνο" @@ -20001,5 +20153,5 @@ #. -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2431 msgid "Edit Telephone" msgstr "Επεξεργασία Τηλεφώνου" @@ -20007,5 +20159,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2422 build/trans_presets.java:2526 +#: build/trans_presets.java:2434 build/trans_presets.java:2538 msgid "Coins" msgstr "Κέρματα" @@ -20013,5 +20165,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2423 build/trans_presets.java:2527 +#: build/trans_presets.java:2435 build/trans_presets.java:2539 msgid "Notes" msgstr "Χαρτονομίσματα" @@ -20019,5 +20171,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2424 build/trans_presets.java:2528 +#: build/trans_presets.java:2436 build/trans_presets.java:2540 msgid "Electronic purses and Charge cards" msgstr "" @@ -20025,5 +20177,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2425 build/trans_presets.java:2529 +#: build/trans_presets.java:2437 build/trans_presets.java:2541 msgid "Debit cards" msgstr "Χρεωστικές Κάρτεσ" @@ -20031,15 +20183,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2426 build/trans_presets.java:2530 +#: build/trans_presets.java:2438 build/trans_presets.java:2542 msgid "Credit cards" msgstr "Πιστωτικές Κάρτες" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2439 msgid "Telephone cards" msgstr "Τηλεκάρτες" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2429 +#: build/trans_presets.java:2441 msgid "Recycling" msgstr "Ανακύκλωση" @@ -20048,5 +20200,5 @@ #. -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2444 msgid "Edit Recycling station" msgstr "Επεξεργασία σταθμού Ανακύκλωσης" @@ -20054,35 +20206,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2446 msgid "Batteries" msgstr "Μπαταρίες" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2435 +#: build/trans_presets.java:2447 msgid "Cans" msgstr "Τενεκεδάκια" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2448 msgid "Clothes" msgstr "Ρούχα" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2437 +#: build/trans_presets.java:2449 msgid "Glass" msgstr "Γυαλί" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2450 msgid "Paper" msgstr "Χαρτί" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2451 msgid "Scrap Metal" msgstr "Μέταλλα" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2453 msgid "Bench" msgstr "Παγκάκι" @@ -20091,31 +20243,31 @@ #. #. -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2456 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "stone" msgstr "" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "plastic" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "black" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "brown" msgstr "" @@ -20186,5 +20338,5 @@ #. #. -#: build/trans_presets.java:2446 build/trans_style.java:3063 +#: build/trans_presets.java:2458 build/trans_style.java:3063 #: build/trans_style.java:3071 build/trans_style.java:3079 #: build/trans_style.java:3087 build/trans_style.java:3135 @@ -20194,27 +20346,27 @@ msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "red" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "blue" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "white" msgstr "" -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2459 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2461 msgid "Hunting Stand" msgstr "" #. item -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2462 msgid "Edit Hunting Stand" msgstr "" @@ -20223,30 +20375,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2452 build/trans_presets.java:2914 +#: build/trans_presets.java:2464 build/trans_presets.java:2926 msgid "Height" msgstr "Ύψος" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "low" msgstr "χαμηλό" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "half" msgstr "μισό" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "full" msgstr "πλήρες" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2466 msgid "Hide" msgstr "Κρυψώνα" -#: build/trans_presets.java:2455 +#: build/trans_presets.java:2467 msgid "Lock" msgstr "Κλειδαριά" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2469 msgid "Fountain" msgstr "Συντριβάνι" @@ -20255,10 +20407,10 @@ #. -#: build/trans_presets.java:2460 +#: build/trans_presets.java:2472 msgid "Edit Fountain" msgstr "Επεξεργασία Συντριβανίου" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2476 msgid "Drinking Water" msgstr "Πόσιμο Νερό" @@ -20267,10 +20419,10 @@ #. -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2479 msgid "Edit Drinking Water" msgstr "Επεξεργασία πόσιμου νερού" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2471 +#: build/trans_presets.java:2483 msgid "Baby Hatch" msgstr "Βρεφοδόχος" @@ -20278,33 +20430,33 @@ #. item #. -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2485 msgid "Edit Baby Hatch" msgstr "Επεξεργασία Βρεφοδόχου" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2491 msgid "Shops" msgstr "Καταστήματα" #. group "Shops" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2492 msgid "Supermarket" msgstr "Supermarket" #. item -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2493 msgid "Edit Supermarket" msgstr "Επεξεργασία Supermarket" -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2498 msgid "Chemist" msgstr "" #. item -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2499 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2504 msgid "Convenience Store" msgstr "" @@ -20312,9 +20464,9 @@ #. item #. -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2506 msgid "Edit Convenience Store" msgstr "" -#: build/trans_presets.java:2499 +#: build/trans_presets.java:2511 msgid "Kiosk" msgstr "Περίπτερο" @@ -20322,27 +20474,27 @@ #. item #. -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2513 msgid "Edit Kiosk" msgstr "Επεξεργασία Περιπτέρου" -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2518 msgid "Book Store" msgstr "" #. item -#: build/trans_presets.java:2507 +#: build/trans_presets.java:2519 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2524 msgid "Travel Agency" msgstr "" #. item -#: build/trans_presets.java:2513 +#: build/trans_presets.java:2525 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2518 +#: build/trans_presets.java:2530 msgid "Vending machine" msgstr "Μηχάνημα Πώλησης" @@ -20350,5 +20502,5 @@ #. item #. -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2532 msgid "Edit Vending machine" msgstr "Επεξεργασία Μηχανήματος Πώλησης" @@ -20356,88 +20508,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "Vending products" msgstr "Πωλούμενα Προϊόντα" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_tickets" msgstr "εισητήρια Μέσων Μαζικής Μεταφοράς" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_plans" msgstr "χάρτες Μέσων Μαζικής Μεταφοράς" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "parking_tickets" msgstr "εισιτήρια Στάθμευσης" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "food" msgstr "φαγητό" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "drinks" msgstr "ποτά" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "sweets" msgstr "γλυκά" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "cigarettes" msgstr "τσιγάρα" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "photos" msgstr "φωτογραφίες" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "animal_food" msgstr "τροφές ζώων" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "news_papers" msgstr "εφημερίδες" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "toys" msgstr "Παιχνίδια" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "stamps" msgstr "Γραμματόσημα" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "SIM-cards" msgstr "Κάρτες SIM" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "telephone_vouchers" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "vouchers" msgstr "κουπόνια" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "condoms" msgstr "Προφυλακτικά" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "tampons" msgstr "tampons" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "excrement_bags" msgstr "" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2543 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2545 msgid "Butcher" msgstr "Κρεοπωλείο" @@ -20445,9 +20597,9 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2547 msgid "Edit Butcher" msgstr "Επεξεργασία Κρεοπωλείου" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2552 msgid "Baker" msgstr "Φούρνος" @@ -20455,9 +20607,9 @@ #. item #. -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2554 msgid "Edit Baker" msgstr "Επεξεργασία Φούρνου" -#: build/trans_presets.java:2547 +#: build/trans_presets.java:2559 msgid "Florist" msgstr "Ανθοπωλείο" @@ -20465,18 +20617,18 @@ #. item #. -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2561 msgid "Edit Florist" msgstr "Επεξεργασία Ανθοπωλείου" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2566 msgid "Organic" msgstr "Βιολογικά" #. item -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2567 msgid "Edit Organic Shop" msgstr "Επεξεργασία Καταστήματος Βιολογικών" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2572 msgid "Alcohol" msgstr "" @@ -20484,54 +20636,54 @@ #. item #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2574 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2579 msgid "Beverages" msgstr "" #. item -#: build/trans_presets.java:2568 +#: build/trans_presets.java:2580 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2573 +#: build/trans_presets.java:2585 msgid "Computer" msgstr "Υπολογιστές" #. item -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2586 msgid "Edit Computer Shop" msgstr "Επεξεργασία Καταστήματος Υπολογιστών" -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2591 msgid "Electronics" msgstr "Ηλεκτρονικά" #. item -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2592 msgid "Edit Electronics Shop" msgstr "Επεξεργασία Καταστήματος Ηλεκτρονικών" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2597 msgid "Hifi" msgstr "Ηχοσυστήματα" #. item -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2598 msgid "Edit Hifi Shop" msgstr "Επεξεργασία Καταστήματος Ηχοσυστημάτων" -#: build/trans_presets.java:2591 +#: build/trans_presets.java:2603 msgid "Furniture" msgstr "Έπιπλα" #. item -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2604 msgid "Edit Furniture Shop" msgstr "Επεξεργασία Καταστήματος Επίπλων" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2609 msgid "Garden Centre" msgstr "Είδη Κήπου" @@ -20539,9 +20691,9 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2611 msgid "Edit Garden Centre" msgstr "Επεξεργασία Καταστήματος Ειδών Κήπου" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2616 msgid "Hardware" msgstr "Σιδηρικά" @@ -20549,9 +20701,9 @@ #. item #. -#: build/trans_presets.java:2606 +#: build/trans_presets.java:2618 msgid "Edit Hardware Store" msgstr "Επεξεργασία Καταστήματος Σιδηρικών" -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2623 msgid "Do-it-yourself-store" msgstr "" @@ -20559,54 +20711,54 @@ #. item #. -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2625 msgid "Edit Do-it-yourself-store" msgstr "" -#: build/trans_presets.java:2618 +#: build/trans_presets.java:2630 msgid "Stationery" msgstr "Χαρτικά" #. item -#: build/trans_presets.java:2619 +#: build/trans_presets.java:2631 msgid "Edit Stationery Shop" msgstr "Επεξεργασία Χαρτοπωλείου" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2636 msgid "Hairdresser" msgstr "Κομμωτήριο" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2637 msgid "Edit Hairdresser" msgstr "Επεξεργασία Κομμωτηρίου" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2642 msgid "Shoes" msgstr "Υποδήματα" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2643 msgid "Edit Shoe Shop" msgstr "Επεξεργασία Υποδηματοπωλείου" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2648 msgid "Toys" msgstr "Παιχνίδια" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2649 msgid "Edit Toy Shop" msgstr "Επεξεργασία Καταστήματος Παιχνιδιών" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2654 msgid "Video" msgstr "" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2655 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2660 msgid "Dry Cleaning" msgstr "Στπγνοκαθαριστήριο" @@ -20614,9 +20766,9 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2662 msgid "Edit Dry Cleaning" msgstr "Επεξεργασία Στεγνοκαθαριστηρίου" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2667 msgid "Laundry" msgstr "Πλυντήριο" @@ -20624,9 +20776,9 @@ #. item #. -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2669 msgid "Edit Laundry" msgstr "Επεξεργασία πλυντηρίου" -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2674 msgid "Outdoor" msgstr "" @@ -20634,28 +20786,28 @@ #. item #. -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2676 msgid "Edit Outdoor Shop" msgstr "" #. item -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2682 msgid "Edit Sports Shop" msgstr "Επεξεργασία Καταστήματος Αθλητικών" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2687 msgid "Optician" msgstr "" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2688 msgid "Edit Optician" msgstr "" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2695 msgid "Cash" msgstr "Μετρητά" #. group "Cash" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2696 msgid "Bank" msgstr "Τράπεζα" @@ -20663,14 +20815,14 @@ #. item #. -#: build/trans_presets.java:2686 +#: build/trans_presets.java:2698 msgid "Edit Bank" msgstr "Επεξεργασία Τράπεζας" -#: build/trans_presets.java:2691 build/trans_presets.java:2700 +#: build/trans_presets.java:2703 build/trans_presets.java:2712 msgid "Automated Teller Machine" msgstr "ΑΤΜ" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2705 msgid "Money Exchange" msgstr "Συναλλακτήριο" @@ -20678,5 +20830,5 @@ #. item #. -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2707 msgid "Edit Money Exchange" msgstr "Επεξεργασία Συναλλακτηρίου" @@ -20684,15 +20836,15 @@ #. item #. -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2714 msgid "Edit Automated Teller Machine" msgstr "Επεξεργασία ΑΤΜ" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2719 msgid "Health" msgstr "Υγεία" #. group "Health" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2720 msgid "Doctors" msgstr "Ιατροί" @@ -20700,18 +20852,18 @@ #. item #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2722 msgid "Edit Doctors" msgstr "Επεξεργασία Ιατρών" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2727 msgid "Dentist" msgstr "Οδοντίατρος" #. item -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2728 msgid "Edit Dentist" msgstr "Επεξεργασία Οδοντιάτρου" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2733 msgid "Pharmacy" msgstr "Φαρμακείο" @@ -20719,5 +20871,5 @@ #. item #. -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2735 msgid "Edit Pharmacy" msgstr "Επεξεργασία Φαρμακείου" @@ -20725,9 +20877,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2737 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2741 msgid "Hospital" msgstr "Νοσοκομείο" @@ -20735,10 +20887,10 @@ #. item #. -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2743 msgid "Edit Hospital" msgstr "Επεξεργασία Νοσοκομειου" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2747 msgid "Emergency Access Point" msgstr "" @@ -20747,5 +20899,5 @@ #. -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2750 msgid "Edit Emergency Access Point" msgstr "" @@ -20754,20 +20906,20 @@ #. #. -#: build/trans_presets.java:2741 +#: build/trans_presets.java:2753 msgid "Point Number" msgstr "Αριθμός Σημείου" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2742 +#: build/trans_presets.java:2754 msgid "Point Name" msgstr "Όνομα Σημείου" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2756 msgid "Phone Number" msgstr "Αριθμός Τηλεφώνου" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2757 msgid "(Use international code, like +12-345-67890)" msgstr "(Χρησιμοποιήστε διεθνή κωδικό, όπως +12-345-67890)" @@ -20775,5 +20927,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2760 msgid "Veterinary" msgstr "Κτηνιατρίο" @@ -20782,59 +20934,59 @@ #. -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2763 msgid "Edit Veterinary" msgstr "Επεξεργασία Κτηνιατρίου" -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2770 msgid "Geography" msgstr "" #. group "Places" -#: build/trans_presets.java:2760 +#: build/trans_presets.java:2772 msgid "Continent" msgstr "Ήπειρος" #. item -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2773 msgid "Edit Continent" msgstr "Επεξεργασία Ηπείρου" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2766 +#: build/trans_presets.java:2778 msgid "Country" msgstr "Χώρα" #. item -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2779 msgid "Edit Country" msgstr "Επεξεργασία Χώρας" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2784 msgid "State" msgstr "Πολιτεία" #. item -#: build/trans_presets.java:2773 +#: build/trans_presets.java:2785 msgid "Edit State" msgstr "Επεξεργασία Πολιτείας" #. item "Places/State" text "Name" -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2790 msgid "Region" msgstr "Περιοχή" #. item -#: build/trans_presets.java:2779 +#: build/trans_presets.java:2791 msgid "Edit Region" msgstr "Επεξεργασία Περιοχής" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2796 msgid "County" msgstr "Περιφέρεια" #. item -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2797 msgid "Edit County" msgstr "Επεξεργασία Περιφέρειας" @@ -20842,15 +20994,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2803 msgid "City" msgstr "Πόλη" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2804 msgid "Edit City" msgstr "Επεξεργασία Πόλης" #. item "Places/City" text "Name" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2809 msgid "Town" msgstr "Κωμόπολη" @@ -20858,10 +21010,10 @@ #. item #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2811 msgid "Edit Town" msgstr "Επεξεργασία Κωμόπολης" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2804 +#: build/trans_presets.java:2816 msgid "Suburb" msgstr "Προάστιο" @@ -20869,25 +21021,25 @@ #. item #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2818 msgid "Edit Suburb" msgstr "Επεξεργασία Προαστίου" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2823 msgid "Village" msgstr "Χωριό" #. item -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2824 msgid "Edit Village" msgstr "Επεξεργασία Χωριού" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2817 +#: build/trans_presets.java:2829 msgid "Hamlet" msgstr "" #. item -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2830 msgid "Edit Hamlet" msgstr "" @@ -20895,5 +21047,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2824 +#: build/trans_presets.java:2836 msgid "Locality" msgstr "" @@ -20901,10 +21053,10 @@ #. item #. -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2838 msgid "Edit Locality" msgstr "" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2843 msgid "Island" msgstr "Νησί" @@ -20912,10 +21064,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2845 msgid "Edit Island" msgstr "Επεξεργασία Νησιού" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2838 +#: build/trans_presets.java:2850 msgid "Islet" msgstr "" @@ -20923,5 +21075,5 @@ #. item #. -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2852 msgid "Edit Islet" msgstr "" @@ -20929,5 +21081,5 @@ #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2858 msgid "Cave Entrance" msgstr "Είσοδος σπηλαίου" @@ -20935,10 +21087,10 @@ #. item #. -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2860 msgid "Edit Cave Entrance" msgstr "Επεξεργασία εισόδου σπηλαίου" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2864 msgid "Peak" msgstr "Κορυφή" @@ -20946,10 +21098,10 @@ #. item #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2866 msgid "Edit Peak" msgstr "Επεξεργασία κορυφής" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2871 msgid "Glacier" msgstr "Παγετώνας" @@ -20957,10 +21109,10 @@ #. item #. -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2873 msgid "Edit Glacier" msgstr "Επεξεργασία παγετώνα" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2878 msgid "Volcano" msgstr "Ηφαίστειο" @@ -20968,70 +21120,70 @@ #. item #. -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2880 msgid "Edit Volcano" msgstr "Επεξεργασία ηφαιστείου" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2886 msgid "Boundaries" msgstr "Όρια" #. group "Boundaries" -#: build/trans_presets.java:2875 +#: build/trans_presets.java:2887 msgid "National" msgstr "Εθνικό" #. item -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2888 msgid "Edit National Boundary" msgstr "Επεξεργασία Εθνικού Συνόρου" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2881 +#: build/trans_presets.java:2893 msgid "Administrative" msgstr "Διοικητικό" #. item -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2894 msgid "Edit Administrative Boundary" msgstr "Επεξεργασία Διοικητικού Ορίου" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2887 +#: build/trans_presets.java:2899 msgid "Civil" msgstr "Πολιτικό" #. item -#: build/trans_presets.java:2888 +#: build/trans_presets.java:2900 msgid "Edit Civil Boundary" msgstr "Επεξεργασία Πολιτικού Ορίου" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2893 +#: build/trans_presets.java:2905 msgid "Political" msgstr "Πολιτικό" #. item -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2906 msgid "Edit Political Boundary" msgstr "Επεξεργασία Πολιτικού Ορίου" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2911 msgid "National park" msgstr "Εθνικό πάρκο" #. item -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2912 msgid "Edit National Park Boundary" msgstr "Επεξεργασία Ορίου Εθνικού Δρυμού" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2918 msgid "Land use" msgstr "Χρήση γής" #. group "Land use" -#: build/trans_presets.java:2907 +#: build/trans_presets.java:2919 msgid "Tree" msgstr "Δένδρο" @@ -21040,15 +21192,15 @@ #. -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2922 msgid "Edit Tree" msgstr "Επεξεργασία δένδρου" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2915 +#: build/trans_presets.java:2927 msgid "Botanical Name" msgstr "Βοτανικό όνομα" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2929 msgid "Wood" msgstr "Άλσος" @@ -21057,5 +21209,5 @@ #. -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2932 msgid "Edit Wood" msgstr "Επεξεργασία άλσους" @@ -21063,17 +21215,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "coniferous" msgstr "Κωνοφόρο" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "deciduous" msgstr "φυλλοβόλα" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "mixed" msgstr "Μικτό" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2937 msgid "Forest" msgstr "Δάσος" @@ -21082,14 +21234,14 @@ #. -#: build/trans_presets.java:2928 +#: build/trans_presets.java:2940 msgid "Edit Forest Landuse" msgstr "Επεξεργασία Δάσους" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2946 msgid "Nature Reserve" msgstr "" #. item -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2947 msgid "Edit Nature Reserve" msgstr "" @@ -21097,25 +21249,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2952 msgid "Scree" msgstr "" #. item -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2953 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2957 msgid "Scrub" msgstr "" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:2958 msgid "Edit Scrub" msgstr "" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2962 msgid "Fell" msgstr "" @@ -21123,10 +21275,10 @@ #. item #. -#: build/trans_presets.java:2952 +#: build/trans_presets.java:2964 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2968 msgid "Heath" msgstr "" @@ -21134,5 +21286,5 @@ #. item #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2970 msgid "Edit Heath" msgstr "" @@ -21140,5 +21292,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2975 msgid "Farmyard" msgstr "" @@ -21147,45 +21299,45 @@ #. -#: build/trans_presets.java:2966 +#: build/trans_presets.java:2978 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2983 msgid "Farmland" msgstr "Χωράφι" #. item -#: build/trans_presets.java:2972 +#: build/trans_presets.java:2984 msgid "Edit Farmland Landuse" msgstr "Επεξεργασία Χωραφιού" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2977 +#: build/trans_presets.java:2989 msgid "Meadow" msgstr "" #. item -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2990 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:2995 msgid "Vineyard" msgstr "Αμπελώνας" #. item -#: build/trans_presets.java:2984 +#: build/trans_presets.java:2996 msgid "Edit Vineyard Landuse" msgstr "Επεξεργασία Αμπελώνα" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3001 msgid "Allotments" msgstr "Κλήροι" #. item -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3002 msgid "Edit Allotments Landuse" msgstr "" @@ -21193,25 +21345,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3008 msgid "Garden" msgstr "Κήπος" #. item -#: build/trans_presets.java:2997 +#: build/trans_presets.java:3009 msgid "Edit Garden" msgstr "Επεξεργασία Κήπου" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3013 msgid "Grass" msgstr "Γρασίδι" #. item -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3014 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3019 msgid "Village Green" msgstr "" @@ -21219,10 +21371,10 @@ #. item #. -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3021 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3026 msgid "Common" msgstr "" @@ -21230,20 +21382,20 @@ #. item #. -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3028 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3032 msgid "Park" msgstr "Πάρκο" #. item -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3033 msgid "Edit Park" msgstr "Επεξεργασία Πάρκου" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3037 msgid "Recreation Ground" msgstr "Χώρος αναψυχής" @@ -21251,5 +21403,5 @@ #. item #. -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3039 msgid "Edit Recreation Ground Landuse" msgstr "Επεξεργασία χώρου αναψυχής" @@ -21257,15 +21409,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3033 +#: build/trans_presets.java:3045 msgid "Residential area" msgstr "Οικιστική περιοχή" #. item -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3046 msgid "Edit Residential Landuse" msgstr "Επεξεργασία οικιστικής περιοχής" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3051 msgid "Graveyard" msgstr "Νεκροταφείο" @@ -21273,9 +21425,9 @@ #. item #. -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3053 msgid "Edit Graveyard" msgstr "Επεξεργασία Νεκροταφείου" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3059 msgid "Cemetery" msgstr "Κοιμητήριο" @@ -21283,39 +21435,39 @@ #. item #. -#: build/trans_presets.java:3049 +#: build/trans_presets.java:3061 msgid "Edit Cemetery Landuse" msgstr "Επεξεργασία χρήσης γης κοιμητηρίου" -#: build/trans_presets.java:3056 +#: build/trans_presets.java:3068 msgid "Retail" msgstr "" #. item -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3069 msgid "Edit Retail Landuse" msgstr "" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3062 +#: build/trans_presets.java:3074 msgid "Commercial" msgstr "" #. item -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3075 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3068 +#: build/trans_presets.java:3080 msgid "Industrial" msgstr "Βιομηχανική" #. item -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3081 msgid "Edit Industrial Landuse" msgstr "" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3086 msgid "Railway land" msgstr "" @@ -21323,15 +21475,15 @@ #. item #. -#: build/trans_presets.java:3076 +#: build/trans_presets.java:3088 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3081 +#: build/trans_presets.java:3093 msgid "Military" msgstr "Στρατιωτικά" #. item -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3094 msgid "Edit Military Landuse" msgstr "" @@ -21339,55 +21491,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3100 msgid "Construction area" msgstr "Εγοτάξιο" #. item -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3101 msgid "Edit Construction Landuse" msgstr "Επεξεργασία εργοταξίου" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3094 +#: build/trans_presets.java:3106 msgid "Brownfield" msgstr "" #. item -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3107 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3100 +#: build/trans_presets.java:3112 msgid "Greenfield" msgstr "" #. item -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3113 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3118 msgid "Landfill" msgstr "ΧΥΤΑ" #. item -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3119 msgid "Edit Landfill Landuse" msgstr "Επεξεργασία Χρήσης γης ΧΥΤΑ" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3124 msgid "Quarry" msgstr "Λατομείο" #. item -#: build/trans_presets.java:3113 +#: build/trans_presets.java:3125 msgid "Edit Quarry Landuse" msgstr "Επεξεργασία Λατομείου" #. group "Relations" -#: build/trans_presets.java:3122 +#: build/trans_presets.java:3134 msgid "Multipolygon" msgstr "" @@ -21397,5 +21549,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:3126 +#: build/trans_presets.java:3138 msgid "Edit Multipolygon" msgstr "" @@ -21404,10 +21556,10 @@ #. #. -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3144 msgid "outer segment" msgstr "" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3145 msgid "inner segment" msgstr "" @@ -21415,5 +21567,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3148 msgid "Turn restriction" msgstr "Περιορισμός στροφής" @@ -21422,5 +21574,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3151 msgid "Edit Turn Restriction" msgstr "Επεξεργασία περιορισμού στροφής" @@ -21428,34 +21580,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "Restriction" msgstr "Περιορισμός" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_left_turn" msgstr "όχι_αριστερή_στροφή" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_right_turn" msgstr "όχι_δεξιά_στροφή" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_straight_on" msgstr "όχι_ευθεία" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_u_turn" msgstr "όχι_αναστροφή" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_right_turn" msgstr "μόνο_δεξιά_στροφή" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_left_turn" msgstr "μόνο_αριστερή_στροφή" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_straight_on" msgstr "μόνο_ευθεία" @@ -21464,15 +21616,15 @@ #. #. -#: build/trans_presets.java:3146 +#: build/trans_presets.java:3158 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3159 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3148 +#: build/trans_presets.java:3160 msgid "to way" msgstr "" @@ -21480,5 +21632,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3151 +#: build/trans_presets.java:3163 msgid "Route" msgstr "Διαδρομή" @@ -21487,5 +21639,5 @@ #. -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3166 msgid "Edit Route" msgstr "Επεξεργασία Διαδρομής" @@ -21493,5 +21645,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "Route type" msgstr "Τύπος Διαδρομής" @@ -21563,5 +21715,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:233 +#: build/trans_presets.java:3168 build/trans_style.java:233 #: build/trans_style.java:683 build/trans_style.java:906 #: build/trans_style.java:914 build/trans_style.java:922 @@ -21570,17 +21722,17 @@ msgstr "ποδήλατο" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "bus" msgstr "λεωφορείο" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "road" msgstr "δρόμος" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ferry" msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ski" msgstr "σκι" @@ -21633,5 +21785,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:247 +#: build/trans_presets.java:3168 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -21640,13 +21792,13 @@ msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "hiking" msgstr "πεζοπορία" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "tram" msgstr "τραμ" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "detour" msgstr "παράκαμψη" @@ -21660,10 +21812,10 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:1206 +#: build/trans_presets.java:3168 build/trans_style.java:1206 msgid "subway" msgstr "υπόγειος" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3159 +#: build/trans_presets.java:3171 msgid "Symbol description" msgstr "Περιγραφή συμβόλου" @@ -21671,31 +21823,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3174 msgid "Network" msgstr "Δίκτυο" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "proposed" msgstr "προτεινόμενο" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "alternate" msgstr "εναλλακτικό" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "temporary" msgstr "προσωρινό" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "connection" msgstr "σύνδεση" -#: build/trans_presets.java:3165 +#: build/trans_presets.java:3177 msgid "Color (hex)" msgstr "Χρώμα (δεκαεξαδικό)" @@ -21704,30 +21856,30 @@ #. #. -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3180 msgid "route segment" msgstr "τμήμα διαδρομής" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3181 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3170 +#: build/trans_presets.java:3182 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3183 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3172 +#: build/trans_presets.java:3184 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3173 +#: build/trans_presets.java:3185 msgid "backward halt point" msgstr "" @@ -25865,4 +26017,10 @@ msgstr "" +#~ msgid "Combine Anyway" +#~ msgstr "Επιβεβαίωση συνδυασμού" + +#~ msgid "Empty member in relation." +#~ msgstr "Άδειο μέλος στη σχέση." + #~ msgid "" #~ "The plugin could not be removed. Please tell the people you got JOSM from " Index: /applications/editors/josm/i18n/po/en_GB.po =================================================================== --- /applications/editors/josm/i18n/po/en_GB.po (revision 17821) +++ /applications/editors/josm/i18n/po/en_GB.po (revision 17822) @@ -10,5 +10,5 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-22 17:52+0200\n" +"POT-Creation-Date: 2009-09-28 16:38+0200\n" "PO-Revision-Date: 2009-09-22 15:18+0000\n" "Last-Translator: Bruce Cowan \n" @@ -18,5 +18,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-22 15:46+0000\n" +"X-Launchpad-Export-Date: 2009-09-28 14:34+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -68,8 +68,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250 @@ -92,9 +92,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -127,6 +127,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -143,7 +143,7 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:172 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 @@ -156,5 +156,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 @@ -337,6 +336,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -346,6 +344,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 @@ -355,5 +353,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -364,5 +362,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180 @@ -371,5 +369,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -464,9 +462,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -498,10 +496,9 @@ msgstr "Please select at least four nodes." -#. FIXME: not sure whether this fits in a dialog #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:85 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -611,5 +608,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 #, java-format msgid "File: {0}" @@ -631,38 +628,22 @@ msgstr "Downloading open changesets ..." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine Way" msgstr "Combine Way" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 msgid "Combine several ways into one." msgstr "Combine several ways into one." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 -msgid "Combine ways with different memberships?" -msgstr "Combine ways with different memberships?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -msgid "Combine Anyway" -msgstr "Combine Anyway" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 msgid "Change directions?" msgstr "Change directions?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Reverse and Combine" msgstr "Reverse and Combine" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -672,5 +653,5 @@ "reverse some of them?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -680,10 +661,10 @@ "nodes)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 #, java-format msgid "Combine {0} ways" msgstr "Combine {0} ways" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 msgid "Please select at least two ways to combine." msgstr "Please select at least two ways to combine." @@ -730,6 +711,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -794,5 +774,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -823,5 +803,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307 #, java-format msgid "There were {0} conflicts during import." @@ -839,5 +818,4 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Duplicate" @@ -868,10 +846,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:209 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Export to GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:208 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Export the data to GPX file." @@ -882,8 +860,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -948,5 +926,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 @@ -989,6 +967,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1078,22 +1055,22 @@ msgstr "Merge the current layer into another layer" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge Nodes" msgstr "Merge Nodes" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 msgid "Merge nodes into the oldest one." msgstr "Merge nodes into the oldest one." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 msgid "Please select at least two nodes to merge." msgstr "Please select at least two nodes to merge." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "Cannot merge nodes: Would have to delete a way that is still used." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 #, java-format msgid "Merge {0} nodes" @@ -1165,5 +1142,4 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350 msgid "New" msgstr "New" @@ -1344,10 +1320,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Save" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Save the current data." @@ -1404,10 +1380,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Save As..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Save the current data to a new file." @@ -1451,5 +1427,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:961 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888 @@ -1697,14 +1673,14 @@ msgstr "Selection empty" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 msgid "Upload to OSM..." msgstr "Upload to OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload all changes to the OSM server." msgstr "Upload all changes to the OSM server." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 #, java-format msgid "" @@ -1715,23 +1691,23 @@ "resolve them first." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Nothing to upload. Get some data first." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:171 msgid "No changes to upload." msgstr "No changes to upload." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223 #, java-format msgid "Synchronize {0} {1} only" msgstr "Synchronize {0} {1} only" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 msgid "Synchronize entire dataset" msgstr "Synchronize entire dataset" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:228 #, java-format msgid "" @@ -1752,17 +1728,17 @@ "{6} to abort and continue editing.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:283 msgid "Conflict detected" msgstr "Conflict detected" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:257 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 #, java-format msgid "Unexpected return value. Got {0}." msgstr "unexpected return value. Got {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:272 #, java-format msgid "" @@ -1777,5 +1753,5 @@ "{1} to abort and continue editing.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:306 #, java-format msgid "" @@ -1785,35 +1761,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 msgid "Changeset closed" msgstr "Changeset closed" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "Error header \"{0}\" does not match expected pattern \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:425 #, java-format msgid "Uploading failed.
{0}" msgstr "Uploading failed.
{0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:434 msgid "Upload to OSM API failed" msgstr "Upload to OSM API failed" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457 msgid "Updating primitive" msgstr "Updating primitive" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:514 #, java-format msgid "Uploading data for layer ''{0}''" msgstr "Uploading data for layer ''{0}''" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1901,13 +1882,13 @@ msgstr "Slower Forwards" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34 msgid "Downloading GPS data" msgstr "Downloading GPS data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57 msgid "Downloaded GPX Data" msgstr "Downloaded GPX Data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87 msgid "Raw GPS data" msgstr "Raw GPS data" @@ -1923,4 +1904,9 @@ msgstr "" "Ignoring exception because download has been cancelled. Exception was: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 +#, fuzzy +msgid "No data found in this area." +msgstr "No data found on device." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2629,9 +2615,9 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 -#, fuzzy, java-format +#, java-format msgid "" "Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitive ''{1}''." -msgstr "already registered a conflict for primitive ''{0}''" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70 @@ -2640,9 +2626,9 @@ msgstr "Add conflict for ''{0}''" -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 +#, fuzzy, java-format +msgid "" +"Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2692,5 +2678,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Delete from relation" msgstr "Delete from relation" @@ -2747,14 +2733,15 @@ msgstr[1] "Move {0} nodes" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 -msgid "Purging 1 primitive" -msgstr "Purging 1 primitive" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 -#, java-format -msgid "removing reference from way {0}" -msgstr "removing reference from way {0}" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 +#, fuzzy, java-format +msgid "Purged object ''{0}''" +msgstr "Move objects {0}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 +#, fuzzy, java-format +msgid "Purged {0} objects" +msgstr "Change {0} object" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 #, java-format msgid "" @@ -2765,7 +2752,7 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203 -#, java-format -msgid "removing reference from relation {0}" +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 +#, fuzzy, java-format +msgid "Removing reference from relation {0}" msgstr "removing reference from relation {0}" @@ -2774,4 +2761,10 @@ msgid "Resolve conflicts in member list of relation {0}" msgstr "Resolve conflicts in member list of relation {0}" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +msgstr "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 @@ -3133,24 +3126,24 @@ msgstr "F" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Error: {0}" msgstr "Error: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Warning: {0}" msgstr "Warning: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "expected id >= 0. Got {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 msgid "A primitive with ID = 0 can't be invisible." msgstr "a primitive with id=0 can't be invisible" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3158,5 +3151,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3184,6 +3177,6 @@ "multiple values" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:244 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3239,120 +3232,113 @@ msgstr "multipolygon way ''{0}'' is not closed." -#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed -#. TODO Remove useless nullcheck when RelationMember.member is encalupsed -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855 -msgid "Empty member in relation." -msgstr "Empty member in relation." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:850 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Deleted member ''{0}'' in relation." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:861 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Way ''{0}'' with less than two points." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 msgid "More than one \"from\" way found." msgstr "More than one \"from\" way found." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:607 msgid "More than one \"to\" way found." msgstr "More than one \"to\" way found." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:613 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627 msgid "More than one \"via\" found." msgstr "More than one \"via\" found." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:632 #, java-format msgid "Unknown role ''{0}''." msgstr "Unknown role ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Unknown member type for ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:641 msgid "No \"from\" way found." msgstr "No \"from\" way found." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645 msgid "No \"to\" way found." msgstr "No \"to\" way found." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:649 msgid "No \"via\" node or way found." msgstr "No \"via\" node or way found." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:658 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "The \"from\" way doesn't start or end at a \"via\" node." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:662 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "The \"to\" way doesn't start or end at a \"via\" node." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "The \"from\" way doesn't start or end at the \"via\" way." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "The \"to\" way doesn't start or end at the \"via\" way." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816 #, java-format msgid "Style for restriction {0} not found." msgstr "Style for restriction {0} not found." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:870 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "No useful role ''{0}'' for Way ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:882 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Non-Way ''{0}'' in multipolygon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:940 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "No outer way for multipolygon ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1029 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Intersection between ways ''{0}'' and ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1041 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Inner way ''{0}'' is outside." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1094 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Style for inner way ''{0}'' equals multipolygon." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1120 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Style for outer way ''{0}'' mismatches." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1324 msgid "untagged" msgstr "untagged" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1325 msgid "text" msgstr "text" @@ -3377,5 +3363,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:249 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 @@ -3386,5 +3372,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 @@ -3413,5 +3399,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:169 msgid "background" msgstr "background" @@ -3509,5 +3495,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "railway" msgstr "railway" @@ -3563,9 +3549,14 @@ msgstr "Bad Request" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +#, fuzzy +msgid "Not Found" +msgstr "Not connected" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 msgid "Unknown host" msgstr "Unknown host" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:247 msgid "Primitive already deleted" msgstr "Primitive already deleted" @@ -4914,5 +4905,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -5126,43 +5117,43 @@ msgstr "Member Of" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 msgid "Add Properties" msgstr "Add Properties" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 msgid "Add a new key/value pair to all objects" msgstr "Add a new key/value pair to all objects" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 msgid "Edit Properties" msgstr "Edit Properties" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 msgid "Edit the value of the selected key for all objects" msgstr "Edit the value of the selected key for all objects" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Properties: {0} / Memberships: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 msgid "Properties / Memberships" msgstr "Properties / Memberships" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 msgid "Change relation" msgstr "Change relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Really delete selection from relation {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:855 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 msgid "Delete the selected key in all objects" msgstr "Delete the selected key in all objects" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 msgid "Delete Properties" msgstr "Delete Properties" @@ -5172,6 +5163,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168 -#: build/trans_presets.java:3121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 +#: build/trans_presets.java:3133 msgid "Relations" msgstr "Relations" @@ -5181,25 +5172,30 @@ msgstr "Open a list of all relations." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:174 #, java-format msgid "Relations: {0}" msgstr "Relations: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 msgid "Open an editor for the selected relation" msgstr "Open an editor for the selected relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:325 msgid "Delete the selected relation" msgstr "Delete the selected relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:363 msgid "Create a new relation" msgstr "Create a new relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:400 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280 msgid "Create a copy of this relation and open it in another editor window" msgstr "Create a copy of this relation and open it in another editor window" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 +#, fuzzy +msgid "Set the current selection to the list of selected relations" +msgstr "Edit the currently selected relation" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5240,9 +5236,9 @@ msgstr "Selection: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 msgid "Undock the panel" msgstr "Undock the panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5250,5 +5246,5 @@ "Close this panel. You can reopen it with the buttons in the left toolbar." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 msgid "Click to minimize/maximize the panel content" msgstr "Click to minimise/maximise the panel content" @@ -5787,5 +5783,5 @@ #. group "Geography" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2771 msgid "Places" msgstr "Places" @@ -6460,6 +6456,4 @@ #. item "Man Made/Windmill" label "Edit Windmill" #. -#. item "Man Made/Pipeline" label "Edit Pipeline" -#. #. item "Man Made/Wastewater Plant" label "Edit Wastewater Plant" #. @@ -6472,4 +6466,6 @@ #. item "Man Made/Surveillance" label "Edit Surveillance Camera" #. +#. item "Man Made/Power Station" label "Edit Power Station" +#. #. item "Amenities/Fountain" label "Edit Fountain" #. @@ -6794,57 +6790,57 @@ #: build/trans_presets.java:2250 build/trans_presets.java:2258 #: build/trans_presets.java:2290 build/trans_presets.java:2295 -#: build/trans_presets.java:2300 build/trans_presets.java:2305 -#: build/trans_presets.java:2311 build/trans_presets.java:2317 -#: build/trans_presets.java:2323 build/trans_presets.java:2331 -#: build/trans_presets.java:2337 build/trans_presets.java:2343 -#: build/trans_presets.java:2349 build/trans_presets.java:2355 -#: build/trans_presets.java:2365 build/trans_presets.java:2462 -#: build/trans_presets.java:2469 build/trans_presets.java:2483 -#: build/trans_presets.java:2489 build/trans_presets.java:2496 -#: build/trans_presets.java:2503 build/trans_presets.java:2509 -#: build/trans_presets.java:2515 build/trans_presets.java:2537 -#: build/trans_presets.java:2544 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2305 build/trans_presets.java:2310 +#: build/trans_presets.java:2316 build/trans_presets.java:2322 +#: build/trans_presets.java:2339 build/trans_presets.java:2345 +#: build/trans_presets.java:2351 build/trans_presets.java:2357 +#: build/trans_presets.java:2363 build/trans_presets.java:2373 +#: build/trans_presets.java:2380 build/trans_presets.java:2474 +#: build/trans_presets.java:2481 build/trans_presets.java:2495 +#: build/trans_presets.java:2501 build/trans_presets.java:2508 +#: build/trans_presets.java:2515 build/trans_presets.java:2521 +#: build/trans_presets.java:2527 build/trans_presets.java:2549 +#: build/trans_presets.java:2556 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2576 #: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2594 build/trans_presets.java:2601 -#: build/trans_presets.java:2608 build/trans_presets.java:2615 -#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2594 build/trans_presets.java:2600 +#: build/trans_presets.java:2606 build/trans_presets.java:2613 +#: build/trans_presets.java:2620 build/trans_presets.java:2627 #: build/trans_presets.java:2633 build/trans_presets.java:2639 -#: build/trans_presets.java:2645 build/trans_presets.java:2652 -#: build/trans_presets.java:2659 build/trans_presets.java:2666 -#: build/trans_presets.java:2672 build/trans_presets.java:2678 -#: build/trans_presets.java:2688 build/trans_presets.java:2697 -#: build/trans_presets.java:2712 build/trans_presets.java:2718 -#: build/trans_presets.java:2726 build/trans_presets.java:2733 -#: build/trans_presets.java:2753 build/trans_presets.java:2764 -#: build/trans_presets.java:2770 build/trans_presets.java:2776 +#: build/trans_presets.java:2645 build/trans_presets.java:2651 +#: build/trans_presets.java:2657 build/trans_presets.java:2664 +#: build/trans_presets.java:2671 build/trans_presets.java:2678 +#: build/trans_presets.java:2684 build/trans_presets.java:2690 +#: build/trans_presets.java:2700 build/trans_presets.java:2709 +#: build/trans_presets.java:2724 build/trans_presets.java:2730 +#: build/trans_presets.java:2738 build/trans_presets.java:2745 +#: build/trans_presets.java:2765 build/trans_presets.java:2776 #: build/trans_presets.java:2782 build/trans_presets.java:2788 -#: build/trans_presets.java:2795 build/trans_presets.java:2802 -#: build/trans_presets.java:2809 build/trans_presets.java:2815 -#: build/trans_presets.java:2821 build/trans_presets.java:2829 -#: build/trans_presets.java:2836 build/trans_presets.java:2843 -#: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2879 build/trans_presets.java:2885 +#: build/trans_presets.java:2794 build/trans_presets.java:2800 +#: build/trans_presets.java:2807 build/trans_presets.java:2814 +#: build/trans_presets.java:2821 build/trans_presets.java:2827 +#: build/trans_presets.java:2833 build/trans_presets.java:2841 +#: build/trans_presets.java:2848 build/trans_presets.java:2855 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2875 build/trans_presets.java:2882 #: build/trans_presets.java:2891 build/trans_presets.java:2897 -#: build/trans_presets.java:2903 build/trans_presets.java:2912 -#: build/trans_presets.java:2922 build/trans_presets.java:2931 -#: build/trans_presets.java:2937 build/trans_presets.java:2943 -#: build/trans_presets.java:2948 build/trans_presets.java:2954 -#: build/trans_presets.java:2960 build/trans_presets.java:2969 -#: build/trans_presets.java:2975 build/trans_presets.java:2981 +#: build/trans_presets.java:2903 build/trans_presets.java:2909 +#: build/trans_presets.java:2915 build/trans_presets.java:2924 +#: build/trans_presets.java:2934 build/trans_presets.java:2943 +#: build/trans_presets.java:2949 build/trans_presets.java:2955 +#: build/trans_presets.java:2960 build/trans_presets.java:2966 +#: build/trans_presets.java:2972 build/trans_presets.java:2981 #: build/trans_presets.java:2987 build/trans_presets.java:2993 #: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3012 build/trans_presets.java:3018 -#: build/trans_presets.java:3023 build/trans_presets.java:3030 -#: build/trans_presets.java:3037 build/trans_presets.java:3043 -#: build/trans_presets.java:3052 build/trans_presets.java:3060 -#: build/trans_presets.java:3066 build/trans_presets.java:3072 -#: build/trans_presets.java:3079 build/trans_presets.java:3085 -#: build/trans_presets.java:3092 build/trans_presets.java:3098 +#: build/trans_presets.java:3011 build/trans_presets.java:3017 +#: build/trans_presets.java:3024 build/trans_presets.java:3030 +#: build/trans_presets.java:3035 build/trans_presets.java:3042 +#: build/trans_presets.java:3049 build/trans_presets.java:3055 +#: build/trans_presets.java:3064 build/trans_presets.java:3072 +#: build/trans_presets.java:3078 build/trans_presets.java:3084 +#: build/trans_presets.java:3091 build/trans_presets.java:3097 #: build/trans_presets.java:3104 build/trans_presets.java:3110 -#: build/trans_presets.java:3116 build/trans_presets.java:3129 -#: build/trans_presets.java:3143 build/trans_presets.java:3157 +#: build/trans_presets.java:3116 build/trans_presets.java:3122 +#: build/trans_presets.java:3128 build/trans_presets.java:3141 +#: build/trans_presets.java:3155 build/trans_presets.java:3169 msgid "Name" msgstr "Name" @@ -6907,5 +6903,4 @@ msgstr "" -#. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 msgid "Close the selected open changesets" @@ -6933,25 +6928,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "Yes" msgstr "Yes" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "No" msgstr "No" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47 #, java-format msgid "Layer ''{0}'' has modifications which should be uploaded to the server." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49 #, java-format msgid "Layer ''{0}'' has no modifications to be uploaded." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60 #, java-format msgid "" @@ -6960,29 +6955,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62 #, java-format msgid "Layer ''{0}'' has no modifications to be saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80 msgid "No file associated with this layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:83 msgid "Please select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:86 #, java-format msgid "Layer ''{0}'' is not backed by a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:101 #, java-format msgid "File ''{0}'' is not writable. Please enter another file name." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:115 #, java-format msgid "Select to upload layer ''{0}'' to the server ''{1}''" @@ -7075,5 +7070,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -msgid "Save and Exit" +#, fuzzy +msgid "Save/Upload and Exit" msgstr "Save and Exit" @@ -7083,6 +7079,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -msgid "Save and Delete" -msgstr "" +#, fuzzy +msgid "Save/Upload and Delete" +msgstr "Upload cancelled" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 @@ -7098,5 +7095,5 @@ msgid "" "An upload and/or save operation of one layer with modifications
was " -"cancelled or has been failed." +"cancelled or has failed." msgstr "" @@ -7182,6 +7179,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:891 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:921 msgid "Tags of new changeset" msgstr "" @@ -7280,7 +7277,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:909 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:933 #, java-format msgid "Tags of changeset {0}" @@ -7288,48 +7284,48 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:949 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:963 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1011 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106 msgid "Preparing primitives to upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Images for {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "Read GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "No time for point {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Cannot read time \"{0}\" from point {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325 msgid "No images with readable timestamps found." msgstr "No images with readable timestamps found." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format @@ -7337,29 +7333,29 @@ msgstr "Reading {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:402 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246 msgid "Geotagged Images" msgstr "Geotagged Images" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:587 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "GPS start: {0}" msgstr "GPS start: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 #, java-format msgid "GPS end: {0}" msgstr "GPS end: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594 #, java-format msgid "current delta: {0}s" msgstr "current delta: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595 msgid "timezone difference: " msgstr "timezone difference: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284 msgid "image" @@ -7368,14 +7364,14 @@ msgstr[1] "images" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #, java-format msgid "{0} within the track." msgstr "{0} within the track." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680 msgid "Sync clock" msgstr "Sync clock" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7383,32 +7379,32 @@ msgstr "JPEG images (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:734 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "The date in file \"{0}\" could not be parsed." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "There is no EXIF time within the file \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 msgid "Image" msgstr "Image" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:752 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759 msgid "GPS unit timezone (difference to photo)" msgstr "GPS unit timezone (difference to photo)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:767 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771 msgid "Synchronize Time with GPS Unit" msgstr "Synchronise Time with GPS Unit" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:790 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 msgid "Time entered could not be parsed." msgstr "Time entered could not be parsed." @@ -7492,5 +7488,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 #, java-format msgid "Name: {0}" @@ -7513,5 +7509,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3160 +#: build/trans_presets.java:3172 msgid "Description" msgstr "Description" @@ -7567,5 +7563,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:587 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 @@ -7632,42 +7628,65 @@ "time were omitted." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:105 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:107 #, java-format msgid "Data Layer {0}" msgstr "Data Layer {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 msgid "outside downloaded area" msgstr "outside downloaded area" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:252 #, java-format msgid "version {0}" msgstr "version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:289 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:290 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:389 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 +#, fuzzy, java-format +msgid "There was {0} conflict detected." +msgid_plural "There were {0} conflicts detected." +msgstr[0] "There were {0} conflicts during import." +msgstr[1] "There were {0} conflicts during import." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 +#, java-format +msgid "" +"{0} object has been purged from the local dataset because it is deleted on " +"the server." +msgid_plural "" +"{0} objects have been purged from the local dataset because they are deleted " +"on the server." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 +#, fuzzy +msgid "Conflicts detected" +msgstr "Conflict detected" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 #, java-format msgid "{0} consists of:" msgstr "{0} consists of:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:476 #, java-format msgid " ({0} deleted.)" msgstr " ({0} deleted.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 msgid "unset" msgstr "unset" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 #, java-format msgid "API version: {0}" msgstr "API version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:501 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:584 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" @@ -8034,5 +8053,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:412 #: ../plugins/terracer/src/terracer/TerracerAction.java:430 @@ -8798,5 +8817,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261 msgid "More information about this feature" msgstr "More information about this feature" @@ -8845,5 +8864,5 @@ msgstr "Elements of type {0} are supported." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:700 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -8853,18 +8872,18 @@ msgstr[1] "Change {0} objects" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Nothing selected!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 msgid "Selection unsuitable!" msgstr "Selection unsuitable!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 msgid "Apply Preset" msgstr "Apply Preset" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788 msgid "Change Properties" msgstr "Change Properties" @@ -9155,44 +9174,44 @@ msgstr "Closing changeset..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "No changeset present for diff upload" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 msgid "Preparing..." msgstr "Preparing..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 msgid "Uploading..." msgstr "Uploading..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 msgid "Waiting 10 seconds ... " msgstr "Waiting 10 seconds ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 msgid "OK - trying again." msgstr "OK - trying again." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 #, java-format msgid "Starting retry {0} of {1}." msgstr "Starting retry {0} of {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9433,5 +9452,5 @@ msgid "" "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}''," -"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." +"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." msgstr "" @@ -9548,6 +9567,6 @@ #, java-format msgid "" -"Relation with external id ''{0}'' refers to missing primitive with external " -"id ''{1}''." +"Relation with external id ''{0}'' refers to a missing primitive with " +"external id ''{1}''." msgstr "" @@ -9643,32 +9662,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:73 msgid "Starting to upload with one request per primitive ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Starting to upload in one request ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 +#, fuzzy, java-format +msgid "Parameter ''{0}'' must not be null" +msgstr "parameter ''{0}'' must not be null" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 msgid "Uploading data ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 msgid "" "WARNING: no API version defined for data to upload. Falling back to version " @@ -9676,5 +9700,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:153 #, java-format msgid "" @@ -9899,5 +9923,5 @@ #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:202 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:324 build/trans_presets.java:325 @@ -9919,6 +9943,6 @@ #: build/trans_presets.java:789 build/trans_presets.java:1333 #: build/trans_presets.java:1400 build/trans_presets.java:1401 -#: build/trans_presets.java:1402 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 +#: build/trans_presets.java:1402 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 msgid "unknown" msgstr "unknown" @@ -10071,5 +10095,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:192 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:182 +#, java-format +msgid "" +"The OSM server ''{0}'' doesn't know about an object
you tried to read, " +"update, or delete. Either the respective object
doesn''t exist on the " +"server or you''re using an invalid URL to access
it. Please carefully " +"check the servers address ''{1}'' for typos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:209 #, java-format msgid "" @@ -10082,5 +10115,5 @@ "preferences and your internet connection." -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:262 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:279 #, java-format msgid "" @@ -10350,17 +10383,15 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35 msgid "Define Address Interpolation" msgstr "" -#. Whether to re-trigger data changed for relation #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "Odd" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:413 #: ../plugins/terracer/src/terracer/TerracerAction.java:437 @@ -10368,99 +10399,99 @@ msgstr "Even" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 msgid "Alphabetic" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161 #, java-format msgid "Relation: {0}" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173 msgid "Associate with street using:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184 msgid "Numbering Scheme:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 msgid "Starting #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188 msgid "Ending #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 #, java-format msgid "Will associate {0} additional house number nodes" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 msgid "Starting address number must be less than ending address number" msgstr "" @@ -11219,4 +11250,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52 +#: build/trans_presets.java:2331 msgid "Location" msgstr "Location" @@ -11768,4 +11800,5 @@ msgstr "southeast" +#. item "Man Made/Pipeline" combo "Type" #. color highway_track #. @@ -11811,7 +11844,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:990 build/trans_style.java:1007 -#: build/trans_style.java:1023 build/trans_style.java:3400 -#: build/trans_style.java:3408 +#: build/trans_presets.java:2330 build/trans_style.java:990 +#: build/trans_style.java:1007 build/trans_style.java:1023 +#: build/trans_style.java:3400 build/trans_style.java:3408 msgid "water" msgstr "water" @@ -14452,9 +14485,11 @@ #. item "Public Transport/Airport" text "Name" #. +#. item "Man Made/Power Station" text "Operator" #. item "Relations/Route" text "Name" #: build/trans_presets.java:65 build/trans_presets.java:101 #: build/trans_presets.java:121 build/trans_presets.java:141 #: build/trans_presets.java:178 build/trans_presets.java:198 -#: build/trans_presets.java:1560 build/trans_presets.java:3158 +#: build/trans_presets.java:1560 build/trans_presets.java:2382 +#: build/trans_presets.java:3170 msgid "Reference" msgstr "Reference" @@ -15016,5 +15051,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 msgid "metal" msgstr "" @@ -15034,5 +15069,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 #: build/trans_style.java:3375 msgid "wood" @@ -15321,7 +15356,7 @@ #: build/trans_presets.java:1401 build/trans_presets.java:1402 #: build/trans_presets.java:1767 build/trans_presets.java:1777 -#: build/trans_presets.java:2408 build/trans_presets.java:2444 -#: build/trans_presets.java:2453 build/trans_presets.java:2454 -#: build/trans_presets.java:2455 build/trans_presets.java:2725 +#: build/trans_presets.java:2420 build/trans_presets.java:2456 +#: build/trans_presets.java:2465 build/trans_presets.java:2466 +#: build/trans_presets.java:2467 build/trans_presets.java:2737 msgid "yes" msgstr "yes" @@ -15470,8 +15505,8 @@ #: build/trans_presets.java:1400 build/trans_presets.java:1401 #: build/trans_presets.java:1402 build/trans_presets.java:1767 -#: build/trans_presets.java:1777 build/trans_presets.java:2408 -#: build/trans_presets.java:2444 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 -#: build/trans_presets.java:2725 +#: build/trans_presets.java:1777 build/trans_presets.java:2420 +#: build/trans_presets.java:2456 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 +#: build/trans_presets.java:2737 msgid "no" msgstr "no" @@ -15609,6 +15644,8 @@ #. item "Water/Wetland" text "Name" #. item "Car/Parking" text "Reference number" +#. item "Man Made/Pipeline" text "Operator" #. item "Man Made/Power Generator" label "Edit Power Generator" #. +#. item "Man Made/Power Tower" label "Edit Power Tower" #. item "Land use/Tree" text "Name" #. item "Land use/Wood" text "Name" @@ -15616,7 +15653,8 @@ #: build/trans_presets.java:350 build/trans_presets.java:649 #: build/trans_presets.java:789 build/trans_presets.java:1137 -#: build/trans_presets.java:1395 build/trans_presets.java:2364 -#: build/trans_presets.java:2913 build/trans_presets.java:2923 -#: build/trans_presets.java:2932 +#: build/trans_presets.java:1395 build/trans_presets.java:2330 +#: build/trans_presets.java:2372 build/trans_presets.java:2398 +#: build/trans_presets.java:2925 build/trans_presets.java:2935 +#: build/trans_presets.java:2944 msgid "Type" msgstr "Type" @@ -16166,10 +16204,10 @@ #. item "Tourism/Information Terminal" text "Closer description" #. item "Tourism/Audioguide" text "Closer description" -#. item "Man Made/Power Station" label "Edit Power Station" -#. +#. item "Man Made/Tower" text "Height (meters)" +#. item "Man Made/Pipeline" label "Edit Pipeline" +#. +#. item "Man Made/Power Station" text "Name" #. item "Man Made/Power Sub Station" label "Edit Power Sub Station" #. -#. item "Man Made/Power Line" label "Edit Power Line" -#. #. item #. #: build/trans_presets.java:1535 build/trans_presets.java:1789 -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2465 msgid "Shelter" msgstr "Shelter" @@ -18527,5 +18567,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1877 build/trans_presets.java:2669 +#: build/trans_presets.java:1877 build/trans_presets.java:2681 msgid "Sports" msgstr "Sports" @@ -19878,6 +19918,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "Religion" msgstr "Religion" @@ -19886,66 +19926,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "bahai" msgstr "bahai" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "buddhist" msgstr "buddhist" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "christian" msgstr "christian" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "hindu" msgstr "hindu" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jain" msgstr "jain" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jewish" msgstr "jewish" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "muslim" msgstr "muslim" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "spiritualist" msgstr "spiritualist" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "taoist" msgstr "taoist" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "unitarian" msgstr "unitarian" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "zoroastrian" msgstr "zoroastrian" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "Denomination" msgstr "Denomination" @@ -19954,76 +19994,76 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "anglican" msgstr "anglican" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "baptist" msgstr "baptist" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "catholic" msgstr "catholic" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "evangelical" msgstr "evangelical" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "jehovahs_witness" msgstr "jehovahs_witness" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "lutheran" msgstr "lutheran" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "methodist" msgstr "methodist" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "mormon" msgstr "mormon" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "orthodox" msgstr "orthodox" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "pentecostal" msgstr "pentecostal" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "presbyterian" msgstr "presbyterian" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "protestant" msgstr "protestant" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "quaker" msgstr "quaker" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "shia" msgstr "shia" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "sunni" msgstr "sunni" @@ -20119,25 +20159,49 @@ #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2296 +#, fuzzy +msgid "Tower type" +msgstr "Route type" + +#. item "Man Made/Tower" combo "Tower type" +#: build/trans_presets.java:2296 +#, fuzzy +msgid "communication" +msgstr "connection" + +#: build/trans_presets.java:2296 +#, fuzzy +msgid "observation" +msgstr "Elevation" + +#. +#: build/trans_presets.java:2298 +#, fuzzy +msgid "Height (meters)" +msgstr "Max. Height (metres)" + +#. item "Man Made/Tower" text "Operator" +#. +#: build/trans_presets.java:2302 msgid "Water Tower" msgstr "Water Tower" #. item -#: build/trans_presets.java:2298 +#: build/trans_presets.java:2303 msgid "Edit Water Tower" msgstr "Edit Water Tower" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2307 msgid "Gasometer" msgstr "Gasometer" #. item -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2308 msgid "Edit Gasometer" msgstr "Edit Gasometer" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2307 +#: build/trans_presets.java:2312 msgid "Lighthouse" msgstr "Lighthouse" @@ -20145,10 +20209,10 @@ #. item #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2314 msgid "Edit Lighthouse" msgstr "Edit Lighthouse" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2318 msgid "Windmill" msgstr "Windmill" @@ -20156,21 +20220,55 @@ #. item #. -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2320 msgid "Edit Windmill" msgstr "Edit Windmill" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2319 +#: build/trans_presets.java:2324 msgid "Pipeline" msgstr "Pipeline" #. item -#. -#: build/trans_presets.java:2321 +#. +#: build/trans_presets.java:2327 msgid "Edit Pipeline" msgstr "Edit Pipeline" -#. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2330 +#, fuzzy +msgid "oil" +msgstr "fossil" + +#: build/trans_presets.java:2330 build/trans_presets.java:2372 +msgid "gas" +msgstr "gas" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "sewage" +msgstr "usage" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "heat" +msgstr "heath" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "any substance" +msgstr "A By Distance" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "underwater" +msgstr "water" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "overground" +msgstr "underground" + +#: build/trans_presets.java:2333 msgid "Wastewater Plant" msgstr "Sewerage Plant" @@ -20180,10 +20278,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:2329 +#: build/trans_presets.java:2337 msgid "Edit Wastewater Plant" msgstr "Edit Sewerage Plant" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2333 +#: build/trans_presets.java:2341 msgid "Crane" msgstr "Crane" @@ -20191,10 +20289,10 @@ #. item #. -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2343 msgid "Edit Crane" msgstr "Edit Crane" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2347 msgid "Beacon" msgstr "Beacon" @@ -20202,10 +20300,10 @@ #. item #. -#: build/trans_presets.java:2341 +#: build/trans_presets.java:2349 msgid "Edit Beacon" msgstr "Edit Beacon" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2353 msgid "Survey Point" msgstr "Survey Point" @@ -20213,10 +20311,10 @@ #. item #. -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2355 msgid "Edit Survey Point" msgstr "Edit Survey Point" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2359 msgid "Surveillance" msgstr "Surveillance" @@ -20224,5 +20322,5 @@ #. item #. -#: build/trans_presets.java:2353 +#: build/trans_presets.java:2361 msgid "Edit Surveillance Camera" msgstr "Edit Surveillance Camera" @@ -20230,5 +20328,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2366 msgid "Power Generator" msgstr "Power Generator" @@ -20238,39 +20336,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:2362 +#: build/trans_presets.java:2370 msgid "Edit Power Generator" msgstr "Edit Power Generator" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "wind" msgstr "wind" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "hydro" msgstr "hydro" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "fossil" msgstr "fossil" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "nuclear" msgstr "nuclear" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "coal" msgstr "coal" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "photovoltaic" msgstr "photovoltaic" -#: build/trans_presets.java:2364 -msgid "gas" -msgstr "gas" - #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2375 msgid "Power Station" msgstr "Power Station" @@ -20279,10 +20373,10 @@ #. -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2378 msgid "Edit Power Station" msgstr "Edit Power Station" -#. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2374 +#. item "Man Made/Power Station" text "Reference" +#: build/trans_presets.java:2384 msgid "Power Sub Station" msgstr "Power Sub Station" @@ -20291,5 +20385,5 @@ #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2387 msgid "Edit Power Sub Station" msgstr "Edit Power Sub Station" @@ -20297,10 +20391,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2380 build/trans_presets.java:2396 +#: build/trans_presets.java:2390 build/trans_presets.java:2407 msgid "Line reference" msgstr "Line reference" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2382 +#: build/trans_presets.java:2392 msgid "Power Tower" msgstr "Power Tower" @@ -20311,11 +20405,26 @@ #. 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:2387 +#: build/trans_presets.java:2397 msgid "Edit Power Tower" msgstr "Edit Power Tower" -#. item "Man Made/Power Tower" label "Edit Power Tower" -#. -#: build/trans_presets.java:2390 +#. item "Man Made/Power Tower" combo "Type" +#: build/trans_presets.java:2398 +#, fuzzy +msgid "tower" +msgstr "Tower" + +#: build/trans_presets.java:2398 +#, fuzzy +msgid "pole" +msgstr "Role" + +#: build/trans_presets.java:2399 +#, fuzzy +msgid "Tower reference" +msgstr "Line reference" + +#. item "Man Made/Power Tower" text "Tower reference" +#: build/trans_presets.java:2401 msgid "Power Line" msgstr "Power Line" @@ -20324,40 +20433,83 @@ #. -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2404 msgid "Edit Power Line" msgstr "Edit Power Line" +#. item "Man Made/Power Line" label "Edit Power Line" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "Line type" +msgstr "Piste type" + +#. item "Man Made/Power Line" combo "Line type" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "line" +msgstr "linked" + +#: build/trans_presets.java:2405 +#, fuzzy +msgid "minor_line" +msgstr "motorway_link" + #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2408 msgid "Voltage" msgstr "Voltage" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2398 -msgid "Amount of Wires" +#: build/trans_presets.java:2409 +#, fuzzy +msgid "Amount of Cables" msgstr "Amount of Wires" -#. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2401 +#. item "Man Made/Power Line" text "Amount of Cables" +#: build/trans_presets.java:2410 +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:2410 +#, fuzzy +msgid "single" +msgstr "Angle" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "double" +msgstr "Boule" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "triple" +msgstr "Stile" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "quad" +msgstr "quaker" + +#: build/trans_presets.java:2413 msgid "Amenities" msgstr "Amenities" #. group "Amenities" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2414 msgid "Toilets" msgstr "Toilets" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2409 build/trans_presets.java:2525 +#: build/trans_presets.java:2421 build/trans_presets.java:2537 msgid "Note" msgstr "Note" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2411 +#: build/trans_presets.java:2423 msgid "Post Box" msgstr "Post Box" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2428 msgid "Telephone" msgstr "Telephone" @@ -20366,5 +20518,5 @@ #. -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2431 msgid "Edit Telephone" msgstr "Edit Telephone" @@ -20372,5 +20524,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2422 build/trans_presets.java:2526 +#: build/trans_presets.java:2434 build/trans_presets.java:2538 msgid "Coins" msgstr "Coins" @@ -20378,5 +20530,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2423 build/trans_presets.java:2527 +#: build/trans_presets.java:2435 build/trans_presets.java:2539 msgid "Notes" msgstr "Notes" @@ -20384,5 +20536,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2424 build/trans_presets.java:2528 +#: build/trans_presets.java:2436 build/trans_presets.java:2540 msgid "Electronic purses and Charge cards" msgstr "Electronic purses and Charge cards" @@ -20390,5 +20542,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2425 build/trans_presets.java:2529 +#: build/trans_presets.java:2437 build/trans_presets.java:2541 msgid "Debit cards" msgstr "Debit cards" @@ -20396,15 +20548,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2426 build/trans_presets.java:2530 +#: build/trans_presets.java:2438 build/trans_presets.java:2542 msgid "Credit cards" msgstr "Credit cards" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2439 msgid "Telephone cards" msgstr "Telephone cards" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2429 +#: build/trans_presets.java:2441 msgid "Recycling" msgstr "Recycling" @@ -20413,5 +20565,5 @@ #. -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2444 msgid "Edit Recycling station" msgstr "Edit Recycling station" @@ -20419,35 +20571,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2446 msgid "Batteries" msgstr "Batteries" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2435 +#: build/trans_presets.java:2447 msgid "Cans" msgstr "Cans" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2448 msgid "Clothes" msgstr "Clothes" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2437 +#: build/trans_presets.java:2449 msgid "Glass" msgstr "Glass" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2450 msgid "Paper" msgstr "Paper" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2451 msgid "Scrap Metal" msgstr "Scrap Metal" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2453 msgid "Bench" msgstr "Bench" @@ -20456,31 +20608,31 @@ #. #. -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2456 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "stone" msgstr "" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "plastic" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "black" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "brown" msgstr "" @@ -20551,5 +20703,5 @@ #. #. -#: build/trans_presets.java:2446 build/trans_style.java:3063 +#: build/trans_presets.java:2458 build/trans_style.java:3063 #: build/trans_style.java:3071 build/trans_style.java:3079 #: build/trans_style.java:3087 build/trans_style.java:3135 @@ -20559,27 +20711,27 @@ msgstr "green" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "red" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "blue" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "white" msgstr "" -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2459 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2461 msgid "Hunting Stand" msgstr "Hunting Stand" #. item -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2462 msgid "Edit Hunting Stand" msgstr "Edit Hunting Stand" @@ -20588,30 +20740,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2452 build/trans_presets.java:2914 +#: build/trans_presets.java:2464 build/trans_presets.java:2926 msgid "Height" msgstr "Height" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "low" msgstr "low" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "half" msgstr "half" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "full" msgstr "full" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2466 msgid "Hide" msgstr "Hide" -#: build/trans_presets.java:2455 +#: build/trans_presets.java:2467 msgid "Lock" msgstr "Lock" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2469 msgid "Fountain" msgstr "Fountain" @@ -20620,10 +20772,10 @@ #. -#: build/trans_presets.java:2460 +#: build/trans_presets.java:2472 msgid "Edit Fountain" msgstr "Edit Fountain" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2476 msgid "Drinking Water" msgstr "Drinking Water" @@ -20632,10 +20784,10 @@ #. -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2479 msgid "Edit Drinking Water" msgstr "Edit Drinking Water" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2471 +#: build/trans_presets.java:2483 msgid "Baby Hatch" msgstr "Baby Hatch" @@ -20643,33 +20795,33 @@ #. item #. -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2485 msgid "Edit Baby Hatch" msgstr "Edit Baby Hatch" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2491 msgid "Shops" msgstr "Shops" #. group "Shops" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2492 msgid "Supermarket" msgstr "Supermarket" #. item -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2493 msgid "Edit Supermarket" msgstr "Edit Supermarket" -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2498 msgid "Chemist" msgstr "" #. item -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2499 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2504 msgid "Convenience Store" msgstr "Convenience Store" @@ -20677,9 +20829,9 @@ #. item #. -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2506 msgid "Edit Convenience Store" msgstr "Edit Convenience Store" -#: build/trans_presets.java:2499 +#: build/trans_presets.java:2511 msgid "Kiosk" msgstr "Kiosk" @@ -20687,27 +20839,27 @@ #. item #. -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2513 msgid "Edit Kiosk" msgstr "Edit Kiosk" -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2518 msgid "Book Store" msgstr "" #. item -#: build/trans_presets.java:2507 +#: build/trans_presets.java:2519 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2524 msgid "Travel Agency" msgstr "" #. item -#: build/trans_presets.java:2513 +#: build/trans_presets.java:2525 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2518 +#: build/trans_presets.java:2530 msgid "Vending machine" msgstr "Vending machine" @@ -20715,5 +20867,5 @@ #. item #. -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2532 msgid "Edit Vending machine" msgstr "Edit Vending machine" @@ -20721,88 +20873,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "Vending products" msgstr "Vending products" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_tickets" msgstr "public_transport_tickets" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_plans" msgstr "public_transport_plans" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "parking_tickets" msgstr "parking_tickets" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "food" msgstr "food" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "drinks" msgstr "drinks" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "sweets" msgstr "sweets" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "cigarettes" msgstr "cigarettes" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "photos" msgstr "photos" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "animal_food" msgstr "animal_food" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "news_papers" msgstr "news_papers" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "toys" msgstr "toys" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "stamps" msgstr "stamps" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "SIM-cards" msgstr "SIM-cards" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "telephone_vouchers" msgstr "telephone_vouchers" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "vouchers" msgstr "vouchers" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "condoms" msgstr "condoms" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "tampons" msgstr "tampons" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "excrement_bags" msgstr "excrement_bags" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2543 msgid "Account or loyalty cards" msgstr "Account or loyalty cards" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2545 msgid "Butcher" msgstr "Butcher" @@ -20810,9 +20962,9 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2547 msgid "Edit Butcher" msgstr "Edit Butcher" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2552 msgid "Baker" msgstr "Baker" @@ -20820,9 +20972,9 @@ #. item #. -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2554 msgid "Edit Baker" msgstr "Edit Baker" -#: build/trans_presets.java:2547 +#: build/trans_presets.java:2559 msgid "Florist" msgstr "Florist" @@ -20830,18 +20982,18 @@ #. item #. -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2561 msgid "Edit Florist" msgstr "Edit Florist" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2566 msgid "Organic" msgstr "Organic" #. item -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2567 msgid "Edit Organic Shop" msgstr "Edit Organic Shop" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2572 msgid "Alcohol" msgstr "Alcohol" @@ -20849,54 +21001,54 @@ #. item #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2574 msgid "Edit Alcohol Shop" msgstr "Edit Alcohol Shop" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2579 msgid "Beverages" msgstr "Beverages" #. item -#: build/trans_presets.java:2568 +#: build/trans_presets.java:2580 msgid "Edit Beverages Shop" msgstr "Edit Beverages Shop" -#: build/trans_presets.java:2573 +#: build/trans_presets.java:2585 msgid "Computer" msgstr "Computer" #. item -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2586 msgid "Edit Computer Shop" msgstr "Edit Computer Shop" -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2591 msgid "Electronics" msgstr "Electronics" #. item -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2592 msgid "Edit Electronics Shop" msgstr "Edit Electronics Shop" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2597 msgid "Hifi" msgstr "Hifi" #. item -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2598 msgid "Edit Hifi Shop" msgstr "Edit Hifi Shop" -#: build/trans_presets.java:2591 +#: build/trans_presets.java:2603 msgid "Furniture" msgstr "Furniture" #. item -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2604 msgid "Edit Furniture Shop" msgstr "Edit Furniture Shop" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2609 msgid "Garden Centre" msgstr "Garden Centre" @@ -20904,9 +21056,9 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2611 msgid "Edit Garden Centre" msgstr "Edit Garden Centre" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2616 msgid "Hardware" msgstr "Hardware" @@ -20914,9 +21066,9 @@ #. item #. -#: build/trans_presets.java:2606 +#: build/trans_presets.java:2618 msgid "Edit Hardware Store" msgstr "Edit Hardware Store" -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2623 msgid "Do-it-yourself-store" msgstr "Do-it-yourself-store" @@ -20924,54 +21076,54 @@ #. item #. -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2625 msgid "Edit Do-it-yourself-store" msgstr "Edit Do-it-yourself-store" -#: build/trans_presets.java:2618 +#: build/trans_presets.java:2630 msgid "Stationery" msgstr "Stationery" #. item -#: build/trans_presets.java:2619 +#: build/trans_presets.java:2631 msgid "Edit Stationery Shop" msgstr "Edit Stationery Shop" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2636 msgid "Hairdresser" msgstr "Hairdresser" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2637 msgid "Edit Hairdresser" msgstr "Edit Hairdresser" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2642 msgid "Shoes" msgstr "Shoes" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2643 msgid "Edit Shoe Shop" msgstr "Edit Shoe Shop" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2648 msgid "Toys" msgstr "Toys" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2649 msgid "Edit Toy Shop" msgstr "Edit Toy Shop" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2654 msgid "Video" msgstr "Video" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2655 msgid "Edit Video Shop" msgstr "Edit Video Shop" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2660 msgid "Dry Cleaning" msgstr "Dry Cleaning" @@ -20979,9 +21131,9 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2662 msgid "Edit Dry Cleaning" msgstr "Edit Dry Cleaning" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2667 msgid "Laundry" msgstr "Laundry" @@ -20989,9 +21141,9 @@ #. item #. -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2669 msgid "Edit Laundry" msgstr "Edit Laundry" -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2674 msgid "Outdoor" msgstr "Outdoor" @@ -20999,28 +21151,28 @@ #. item #. -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2676 msgid "Edit Outdoor Shop" msgstr "Edit Outdoor Shop" #. item -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2682 msgid "Edit Sports Shop" msgstr "Edit Sports Shop" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2687 msgid "Optician" msgstr "Optician" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2688 msgid "Edit Optician" msgstr "Edit Optician" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2695 msgid "Cash" msgstr "Cash" #. group "Cash" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2696 msgid "Bank" msgstr "Bank" @@ -21028,14 +21180,14 @@ #. item #. -#: build/trans_presets.java:2686 +#: build/trans_presets.java:2698 msgid "Edit Bank" msgstr "Edit Bank" -#: build/trans_presets.java:2691 build/trans_presets.java:2700 +#: build/trans_presets.java:2703 build/trans_presets.java:2712 msgid "Automated Teller Machine" msgstr "Automated Teller Machine" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2705 msgid "Money Exchange" msgstr "Money Exchange" @@ -21043,5 +21195,5 @@ #. item #. -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2707 msgid "Edit Money Exchange" msgstr "Edit Money Exchange" @@ -21049,15 +21201,15 @@ #. item #. -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2714 msgid "Edit Automated Teller Machine" msgstr "Edit Automated Teller Machine" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2719 msgid "Health" msgstr "Health" #. group "Health" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2720 msgid "Doctors" msgstr "Doctors" @@ -21065,18 +21217,18 @@ #. item #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2722 msgid "Edit Doctors" msgstr "Edit Doctors" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2727 msgid "Dentist" msgstr "Dentist" #. item -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2728 msgid "Edit Dentist" msgstr "Edit Dentist" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2733 msgid "Pharmacy" msgstr "Pharmacy" @@ -21084,5 +21236,5 @@ #. item #. -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2735 msgid "Edit Pharmacy" msgstr "Edit Pharmacy" @@ -21090,9 +21242,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2737 msgid "Dispensing" msgstr "Dispensing" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2741 msgid "Hospital" msgstr "Hospital" @@ -21100,10 +21252,10 @@ #. item #. -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2743 msgid "Edit Hospital" msgstr "Edit Hospital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2747 msgid "Emergency Access Point" msgstr "Emergency Access Point" @@ -21112,5 +21264,5 @@ #. -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2750 msgid "Edit Emergency Access Point" msgstr "Edit Emergency Access Point" @@ -21119,20 +21271,20 @@ #. #. -#: build/trans_presets.java:2741 +#: build/trans_presets.java:2753 msgid "Point Number" msgstr "Point Number" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2742 +#: build/trans_presets.java:2754 msgid "Point Name" msgstr "Point Name" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2756 msgid "Phone Number" msgstr "Phone Number" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2757 msgid "(Use international code, like +12-345-67890)" msgstr "(Use international code, like +12-345-67890)" @@ -21140,5 +21292,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2760 msgid "Veterinary" msgstr "Veterinary" @@ -21147,59 +21299,59 @@ #. -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2763 msgid "Edit Veterinary" msgstr "Edit Veterinary" -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2770 msgid "Geography" msgstr "" #. group "Places" -#: build/trans_presets.java:2760 +#: build/trans_presets.java:2772 msgid "Continent" msgstr "Continent" #. item -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2773 msgid "Edit Continent" msgstr "Edit Continent" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2766 +#: build/trans_presets.java:2778 msgid "Country" msgstr "Country" #. item -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2779 msgid "Edit Country" msgstr "Edit Country" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2784 msgid "State" msgstr "State" #. item -#: build/trans_presets.java:2773 +#: build/trans_presets.java:2785 msgid "Edit State" msgstr "Edit State" #. item "Places/State" text "Name" -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2790 msgid "Region" msgstr "Region" #. item -#: build/trans_presets.java:2779 +#: build/trans_presets.java:2791 msgid "Edit Region" msgstr "Edit Region" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2796 msgid "County" msgstr "County" #. item -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2797 msgid "Edit County" msgstr "Edit County" @@ -21207,15 +21359,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2803 msgid "City" msgstr "City" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2804 msgid "Edit City" msgstr "Edit City" #. item "Places/City" text "Name" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2809 msgid "Town" msgstr "Town" @@ -21223,10 +21375,10 @@ #. item #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2811 msgid "Edit Town" msgstr "Edit Town" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2804 +#: build/trans_presets.java:2816 msgid "Suburb" msgstr "Suburb" @@ -21234,25 +21386,25 @@ #. item #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2818 msgid "Edit Suburb" msgstr "Edit Suburb" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2823 msgid "Village" msgstr "Village" #. item -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2824 msgid "Edit Village" msgstr "Edit Village" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2817 +#: build/trans_presets.java:2829 msgid "Hamlet" msgstr "Hamlet" #. item -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2830 msgid "Edit Hamlet" msgstr "Edit Hamlet" @@ -21260,5 +21412,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2824 +#: build/trans_presets.java:2836 msgid "Locality" msgstr "Locality" @@ -21266,10 +21418,10 @@ #. item #. -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2838 msgid "Edit Locality" msgstr "Edit Locality" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2843 msgid "Island" msgstr "Island" @@ -21277,10 +21429,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2845 msgid "Edit Island" msgstr "Edit Island" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2838 +#: build/trans_presets.java:2850 msgid "Islet" msgstr "" @@ -21288,5 +21440,5 @@ #. item #. -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2852 msgid "Edit Islet" msgstr "" @@ -21294,5 +21446,5 @@ #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2858 msgid "Cave Entrance" msgstr "Cave Entrance" @@ -21300,10 +21452,10 @@ #. item #. -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2860 msgid "Edit Cave Entrance" msgstr "Edit Cave Entrance" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2864 msgid "Peak" msgstr "Peak" @@ -21311,10 +21463,10 @@ #. item #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2866 msgid "Edit Peak" msgstr "Edit Peak" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2871 msgid "Glacier" msgstr "Glacier" @@ -21322,10 +21474,10 @@ #. item #. -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2873 msgid "Edit Glacier" msgstr "Edit Glacier" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2878 msgid "Volcano" msgstr "Volcano" @@ -21333,70 +21485,70 @@ #. item #. -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2880 msgid "Edit Volcano" msgstr "Edit Volcano" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2886 msgid "Boundaries" msgstr "Boundaries" #. group "Boundaries" -#: build/trans_presets.java:2875 +#: build/trans_presets.java:2887 msgid "National" msgstr "National" #. item -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2888 msgid "Edit National Boundary" msgstr "Edit National Boundary" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2881 +#: build/trans_presets.java:2893 msgid "Administrative" msgstr "Administrative" #. item -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2894 msgid "Edit Administrative Boundary" msgstr "Edit Administrative Boundary" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2887 +#: build/trans_presets.java:2899 msgid "Civil" msgstr "Civil" #. item -#: build/trans_presets.java:2888 +#: build/trans_presets.java:2900 msgid "Edit Civil Boundary" msgstr "Edit Civil Boundary" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2893 +#: build/trans_presets.java:2905 msgid "Political" msgstr "Political" #. item -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2906 msgid "Edit Political Boundary" msgstr "Edit Political Boundary" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2911 msgid "National park" msgstr "National park" #. item -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2912 msgid "Edit National Park Boundary" msgstr "Edit National Park Boundary" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2918 msgid "Land use" msgstr "Land use" #. group "Land use" -#: build/trans_presets.java:2907 +#: build/trans_presets.java:2919 msgid "Tree" msgstr "Tree" @@ -21405,15 +21557,15 @@ #. -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2922 msgid "Edit Tree" msgstr "Edit Tree" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2915 +#: build/trans_presets.java:2927 msgid "Botanical Name" msgstr "Botanical Name" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2929 msgid "Wood" msgstr "Wood" @@ -21422,5 +21574,5 @@ #. -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2932 msgid "Edit Wood" msgstr "Edit Wood" @@ -21428,17 +21580,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "coniferous" msgstr "coniferous" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "deciduous" msgstr "deciduous" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "mixed" msgstr "mixed" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2937 msgid "Forest" msgstr "Forest" @@ -21447,14 +21599,14 @@ #. -#: build/trans_presets.java:2928 +#: build/trans_presets.java:2940 msgid "Edit Forest Landuse" msgstr "Edit Forest Landuse" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2946 msgid "Nature Reserve" msgstr "Nature Reserve" #. item -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2947 msgid "Edit Nature Reserve" msgstr "Edit Nature Reserve" @@ -21462,25 +21614,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2952 msgid "Scree" msgstr "Scree" #. item -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2953 msgid "Edit Scree" msgstr "Edit Scree" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2957 msgid "Scrub" msgstr "Scrub" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:2958 msgid "Edit Scrub" msgstr "Edit Scrub" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2962 msgid "Fell" msgstr "Fell" @@ -21488,10 +21640,10 @@ #. item #. -#: build/trans_presets.java:2952 +#: build/trans_presets.java:2964 msgid "Edit Fell" msgstr "Edit Fell" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2968 msgid "Heath" msgstr "Heath" @@ -21499,5 +21651,5 @@ #. item #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2970 msgid "Edit Heath" msgstr "Edit Heath" @@ -21505,5 +21657,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2975 msgid "Farmyard" msgstr "Farmyard" @@ -21512,45 +21664,45 @@ #. -#: build/trans_presets.java:2966 +#: build/trans_presets.java:2978 msgid "Edit Farmyard Landuse" msgstr "Edit Farmyard Landuse" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2983 msgid "Farmland" msgstr "Farmland" #. item -#: build/trans_presets.java:2972 +#: build/trans_presets.java:2984 msgid "Edit Farmland Landuse" msgstr "Edit Farmland Landuse" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2977 +#: build/trans_presets.java:2989 msgid "Meadow" msgstr "Meadow" #. item -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2990 msgid "Edit Meadow Landuse" msgstr "Edit Meadow Landuse" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:2995 msgid "Vineyard" msgstr "Vineyard" #. item -#: build/trans_presets.java:2984 +#: build/trans_presets.java:2996 msgid "Edit Vineyard Landuse" msgstr "Edit Vineyard Landuse" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3001 msgid "Allotments" msgstr "Allotments" #. item -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3002 msgid "Edit Allotments Landuse" msgstr "Edit Allotments Landuse" @@ -21558,25 +21710,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3008 msgid "Garden" msgstr "Garden" #. item -#: build/trans_presets.java:2997 +#: build/trans_presets.java:3009 msgid "Edit Garden" msgstr "Edit Garden" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3013 msgid "Grass" msgstr "Grass" #. item -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3014 msgid "Edit Grass Landuse" msgstr "Edit Grass Landuse" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3019 msgid "Village Green" msgstr "Village Green" @@ -21584,10 +21736,10 @@ #. item #. -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3021 msgid "Edit Village Green Landuse" msgstr "Edit Village Green Landuse" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3026 msgid "Common" msgstr "Common" @@ -21595,20 +21747,20 @@ #. item #. -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3028 msgid "Edit Common" msgstr "Edit Common" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3032 msgid "Park" msgstr "Park" #. item -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3033 msgid "Edit Park" msgstr "Edit Park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3037 msgid "Recreation Ground" msgstr "Recreation Ground" @@ -21616,5 +21768,5 @@ #. item #. -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3039 msgid "Edit Recreation Ground Landuse" msgstr "Edit Recreation Ground Landuse" @@ -21622,15 +21774,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3033 +#: build/trans_presets.java:3045 msgid "Residential area" msgstr "Residential area" #. item -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3046 msgid "Edit Residential Landuse" msgstr "Edit Residential Landuse" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3051 msgid "Graveyard" msgstr "Graveyard" @@ -21638,9 +21790,9 @@ #. item #. -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3053 msgid "Edit Graveyard" msgstr "Edit Graveyard" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3059 msgid "Cemetery" msgstr "Cemetery" @@ -21648,39 +21800,39 @@ #. item #. -#: build/trans_presets.java:3049 +#: build/trans_presets.java:3061 msgid "Edit Cemetery Landuse" msgstr "Edit Cemetery Landuse" -#: build/trans_presets.java:3056 +#: build/trans_presets.java:3068 msgid "Retail" msgstr "Retail" #. item -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3069 msgid "Edit Retail Landuse" msgstr "Edit Retail Landuse" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3062 +#: build/trans_presets.java:3074 msgid "Commercial" msgstr "Commercial" #. item -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3075 msgid "Edit Commercial Landuse" msgstr "Edit Commercial Landuse" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3068 +#: build/trans_presets.java:3080 msgid "Industrial" msgstr "Industrial" #. item -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3081 msgid "Edit Industrial Landuse" msgstr "Edit Industrial Landuse" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3086 msgid "Railway land" msgstr "Railway land" @@ -21688,15 +21840,15 @@ #. item #. -#: build/trans_presets.java:3076 +#: build/trans_presets.java:3088 msgid "Edit Railway Landuse" msgstr "Edit Railway Landuse" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3081 +#: build/trans_presets.java:3093 msgid "Military" msgstr "Military" #. item -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3094 msgid "Edit Military Landuse" msgstr "Edit Military Landuse" @@ -21704,55 +21856,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3100 msgid "Construction area" msgstr "Construction area" #. item -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3101 msgid "Edit Construction Landuse" msgstr "Edit Construction Landuse" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3094 +#: build/trans_presets.java:3106 msgid "Brownfield" msgstr "Brownfield" #. item -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3107 msgid "Edit Brownfield Landuse" msgstr "Edit Brownfield Landuse" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3100 +#: build/trans_presets.java:3112 msgid "Greenfield" msgstr "Greenfield" #. item -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3113 msgid "Edit Greenfield Landuse" msgstr "Edit Greenfield Landuse" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3118 msgid "Landfill" msgstr "Landfill" #. item -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3119 msgid "Edit Landfill Landuse" msgstr "Edit Landfill Landuse" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3124 msgid "Quarry" msgstr "Quarry" #. item -#: build/trans_presets.java:3113 +#: build/trans_presets.java:3125 msgid "Edit Quarry Landuse" msgstr "Edit Quarry Landuse" #. group "Relations" -#: build/trans_presets.java:3122 +#: build/trans_presets.java:3134 msgid "Multipolygon" msgstr "Multipolygon" @@ -21762,5 +21914,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:3126 +#: build/trans_presets.java:3138 msgid "Edit Multipolygon" msgstr "Edit Multipolygon" @@ -21769,10 +21921,10 @@ #. #. -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3144 msgid "outer segment" msgstr "outer segment" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3145 msgid "inner segment" msgstr "inner segment" @@ -21780,5 +21932,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3148 msgid "Turn restriction" msgstr "Turn restriction" @@ -21787,5 +21939,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3151 msgid "Edit Turn Restriction" msgstr "Edit Turn Restriction" @@ -21793,34 +21945,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "Restriction" msgstr "Restriction" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_left_turn" msgstr "no left turn" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_right_turn" msgstr "no right turn" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_straight_on" msgstr "no straight on" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_u_turn" msgstr "no U turn" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_right_turn" msgstr "only turn right" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_left_turn" msgstr "only turn left" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_straight_on" msgstr "only straight on" @@ -21829,15 +21981,15 @@ #. #. -#: build/trans_presets.java:3146 +#: build/trans_presets.java:3158 msgid "from way" msgstr "from way" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3159 msgid "via node or way" msgstr "via node or way" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3148 +#: build/trans_presets.java:3160 msgid "to way" msgstr "to way" @@ -21845,5 +21997,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3151 +#: build/trans_presets.java:3163 msgid "Route" msgstr "Route" @@ -21852,5 +22004,5 @@ #. -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3166 msgid "Edit Route" msgstr "Edit Route" @@ -21858,5 +22010,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "Route type" msgstr "Route type" @@ -21928,5 +22080,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:233 +#: build/trans_presets.java:3168 build/trans_style.java:233 #: build/trans_style.java:683 build/trans_style.java:906 #: build/trans_style.java:914 build/trans_style.java:922 @@ -21935,17 +22087,17 @@ msgstr "bicycle" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "road" msgstr "road" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ferry" msgstr "ferry" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ski" msgstr "ski" @@ -21998,5 +22150,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:247 +#: build/trans_presets.java:3168 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -22005,13 +22157,13 @@ msgstr "foot" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "hiking" msgstr "hiking" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "tram" msgstr "tram" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "detour" msgstr "detour" @@ -22025,10 +22177,10 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:1206 +#: build/trans_presets.java:3168 build/trans_style.java:1206 msgid "subway" msgstr "subway" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3159 +#: build/trans_presets.java:3171 msgid "Symbol description" msgstr "Symbol description" @@ -22036,31 +22188,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3174 msgid "Network" msgstr "Network" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "proposed" msgstr "proposed" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "alternate" msgstr "alternate" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "temporary" msgstr "temporary" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "connection" msgstr "connection" -#: build/trans_presets.java:3165 +#: build/trans_presets.java:3177 msgid "Color (hex)" msgstr "Colour (hex)" @@ -22069,30 +22221,30 @@ #. #. -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3180 msgid "route segment" msgstr "route segment" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3181 msgid "forward segment" msgstr "forward segment" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3170 +#: build/trans_presets.java:3182 msgid "backward segment" msgstr "backward segment" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3183 msgid "halt point" msgstr "halt point" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3172 +#: build/trans_presets.java:3184 msgid "forward halt point" msgstr "forward halt point" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3173 +#: build/trans_presets.java:3185 msgid "backward halt point" msgstr "backward halt point" @@ -26229,4 +26381,29 @@ msgid "Czech UHUL:ORTOFOTO" msgstr "" + +#~ msgid "Combine ways with different memberships?" +#~ msgstr "Combine ways with different memberships?" + +#~ msgid "Combine Anyway" +#~ msgstr "Combine Anyway" + +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" + +#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +#~ msgstr "Error header \"{0}\" does not match expected pattern \"{1}\"" + +#~ msgid "Purging 1 primitive" +#~ msgstr "Purging 1 primitive" + +#~ msgid "removing reference from way {0}" +#~ msgstr "removing reference from way {0}" + +#~ msgid "Empty member in relation." +#~ msgstr "Empty member in relation." #~ msgid "Move" @@ -26823,7 +27000,4 @@ #~ msgstr "Image with path {0} does not exist or is not readable." -#~ msgid "linked" -#~ msgstr "linked" - #~ msgid "% of lon:" #~ msgstr "% of lon:" Index: /applications/editors/josm/i18n/po/es.po =================================================================== --- /applications/editors/josm/i18n/po/es.po (revision 17821) +++ /applications/editors/josm/i18n/po/es.po (revision 17822) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-22 17:52+0200\n" -"PO-Revision-Date: 2009-09-22 14:48+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-09-28 16:38+0200\n" +"PO-Revision-Date: 2009-09-27 06:43+0000\n" +"Last-Translator: Paco Molinero \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: 2009-09-22 15:46+0000\n" +"X-Launchpad-Export-Date: 2009-09-28 14:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -66,8 +66,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250 @@ -90,9 +90,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -141,7 +141,7 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:172 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 @@ -154,5 +154,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 @@ -296,4 +295,7 @@ "page for OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" +"Atención: formato inesperado para la URL base de la API. La redirección " +"hacia la página de Información o de Históricos es probable que falle. La URL " +"base de la API es: ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 @@ -303,4 +305,7 @@ "user will probably fail. API base URL is: ''{0}''" msgstr "" +"Atención: formato inesperado para la URL base de la API. La redirección " +"hacia las páginas de usuario OSM es probable que falle. La URL base de la " +"API es: ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 @@ -332,6 +337,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -341,6 +345,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 @@ -350,5 +354,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -359,5 +363,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180 @@ -366,5 +370,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -458,9 +462,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -492,10 +496,9 @@ msgstr "Por favor, selecciona al menos cuatro nodos." -#. FIXME: not sure whether this fits in a dialog #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:85 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -559,5 +562,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "download" -msgstr "descargar" +msgstr "Descarga" #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 @@ -595,5 +598,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 msgid "Closes open changesets" -msgstr "" +msgstr "Cierre de los conjuntos de cambios abiertos" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -605,5 +608,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 #, java-format msgid "File: {0}" @@ -613,49 +616,34 @@ #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" -msgstr "" +msgstr "No hay conjuntos de cambios abiertos" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" -msgstr "" +msgstr "Ningún conjunto de cambios abiertos" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 +msgstr "Descargando conjunto de cambios abiertos..." + #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine Way" msgstr "Combinar vía" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 msgid "Combine several ways into one." msgstr "Combinar varias vías en una." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 -msgid "Combine ways with different memberships?" -msgstr "¿Combinar vías con diferentes relaciones?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -msgid "Combine Anyway" -msgstr "Combinar de todos modos" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" -"Las vías seleccionadas tienen diferentes relaciones. ¿Aún quiere combinarlas?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 msgid "Change directions?" msgstr "¿Cambiar direcciones?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Reverse and Combine" msgstr "Invertir y combinar" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -665,5 +653,5 @@ "alguna de ellas?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -673,10 +661,10 @@ "única de nodos)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 #, java-format msgid "Combine {0} ways" msgstr "Combinar {0} vías" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 msgid "Please select at least two ways to combine." msgstr "Por favor, selecciona al menos dos vías para combinar." @@ -723,6 +711,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -789,5 +776,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -819,5 +806,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307 #, java-format msgid "There were {0} conflicts during import." @@ -835,5 +821,4 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Duplicate" @@ -864,10 +849,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:209 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Exportar a GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:208 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Exportar los datos a archivo GPX" @@ -878,8 +863,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -944,5 +929,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 @@ -985,6 +970,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1076,18 +1060,18 @@ msgstr "Unir la capar actual en otrar capa" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge Nodes" msgstr "Unir nodos" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 msgid "Merge nodes into the oldest one." msgstr "Unir nodos en el más antiguo." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 msgid "Please select at least two nodes to merge." msgstr "Por favor seleccione por lo menos dos nodos para unir." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -1095,5 +1079,5 @@ "uso." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 #, java-format msgid "Merge {0} nodes" @@ -1165,5 +1149,4 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350 msgid "New" msgstr "Nuevo" @@ -1206,5 +1189,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:41 msgid "Enter URL to download:" -msgstr "Introduzca URL a descargar" +msgstr "Introduzca la URL a descargar" #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:46 @@ -1348,10 +1331,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Guardar" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Guardar los datos actuales." @@ -1408,10 +1391,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Guardar como..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Guardar los datos actuales en un nuevo archivo." @@ -1456,5 +1439,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:961 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888 @@ -1701,14 +1684,14 @@ msgstr "Selección vacía" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 msgid "Upload to OSM..." msgstr "Subir a OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload all changes to the OSM server." msgstr "Subir todos los cambios al servidor OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 #, java-format msgid "" @@ -1719,23 +1702,23 @@ "corregirlos primero." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Nada que subir. Consigue algunos datos primero." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:171 msgid "No changes to upload." msgstr "Ningún cambio que subir" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223 #, java-format msgid "Synchronize {0} {1} only" msgstr "Sincronizar {0} {1} únicamente" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 msgid "Synchronize entire dataset" msgstr "Sincronizar el conjunto de datos completo" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:228 #, java-format msgid "" @@ -1757,17 +1740,17 @@ "continuar editando.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:283 msgid "Conflict detected" msgstr "Conflicto detectado" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:257 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 #, java-format msgid "Unexpected return value. Got {0}." msgstr "Retorno de valor inexperado. Obtenido {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:272 #, java-format msgid "" @@ -1783,5 +1766,5 @@ "
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:306 #, java-format msgid "" @@ -1790,10 +1773,14 @@ "again with a new or an existing open changeset." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310 +"El envío de datos falló debido a que se ha " +"empleado
un conjunto de cambios {0} que se cerró previamente ({1})." +"
Vuelva a enviar los datos de nuevo con un conjunto de cambios nuevo o " +"uno existente y abierto." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 msgid "Changeset closed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +msgstr "Conjunto de cambios cerrados" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" @@ -1802,26 +1789,31 @@ "\"{1}\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "Error de cabecera \"{0}\" no coincide con el patrón esperado \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:425 #, java-format msgid "Uploading failed.
{0}" msgstr "Subida fallida.
{0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:434 msgid "Upload to OSM API failed" msgstr "Subida a la API de OSM fallida" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457 msgid "Updating primitive" msgstr "Actualizando primitiva" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:514 #, java-format msgid "Uploading data for layer ''{0}''" msgstr "Subiendo datos de la capa \"{0}\"" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1909,13 +1901,13 @@ msgstr "Avance lento" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34 msgid "Downloading GPS data" msgstr "Descargando datos GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57 msgid "Downloaded GPX Data" msgstr "Datos GPX descargados" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87 msgid "Raw GPS data" msgstr "Datos GPS en bruto" @@ -1931,4 +1923,9 @@ msgstr "" "Ignorar excepción porque la descarga ha sido cancelada. La excepción fue: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 +#, fuzzy +msgid "No data found in this area." +msgstr "No se han encontrado datos en el dispositivo." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2207,5 +2204,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 msgid "Please enter a filter string." -msgstr "" +msgstr "Por favor, introduce una cadena de caracteres como filtro" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2227,5 +2224,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "find in selection" -msgstr "" +msgstr "encontrar en la selección" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2287,5 +2284,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "id:... - object with given ID (0 for new objects)" -msgstr "" +msgstr "id:... - objecto con el ID indicado (0 para los objetos nuevos)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 @@ -2353,5 +2350,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "Submit filter" -msgstr "" +msgstr "Enviar filtro" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 @@ -2377,5 +2374,5 @@ #, java-format msgid "Nothing find in selection by searching for ''{0}''" -msgstr "" +msgstr "No se ha encontrado nada en la selección búscando por ''{0}''" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2533,5 +2530,5 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 msgid "Cyclic dependency between relations:" -msgstr "" +msgstr "Dependencia de ciclismo entre las relaciones:" #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47 @@ -2542,16 +2539,19 @@ "dependency." msgstr "" +"Las relaciones {0} son cíclicas (cada una se refiere a la otra)" +"
JOSM no puede enviarlas. Por favor: edite las relaciones y elimine la " +"dependencia cíclica." #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53 msgid "Relation ..." -msgstr "" +msgstr "Relación..." #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54 msgid "... refers to relation" -msgstr "" +msgstr "... se refiere a la relación" #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87 msgid "Cycling dependencies" -msgstr "" +msgstr "Dependencias de ciclismo" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 @@ -2637,5 +2637,5 @@ #, java-format msgid "Change relation member role for {0} {1}" -msgstr "" +msgstr "Modificar la función del miembro de la relación para {0} {1}" #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32 @@ -2645,4 +2645,6 @@ "conflict can't be added." msgstr "" +"La capa ''{0}'' ya tiene un conflicto con la primitiva
''{1}''." +"
Este conflicto no puede ser añadido." #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 @@ -2652,9 +2654,11 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 -#, fuzzy, java-format +#, java-format msgid "" "Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitive ''{1}''." -msgstr "ya se ha registrado un conflicto para la primitiva \"{0}\"" +msgstr "" +"Atención: La capa ''{0}'' ya no existe. No se puede eliminar el conflicto " +"para la primitiva ''{1}''." #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70 @@ -2663,9 +2667,9 @@ msgstr "Añadir conflicto para ''{0}''" -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 +#, fuzzy, java-format +msgid "" +"Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" "No se puede deshacer la orden ''{0}'' porque la capa \"{1}'' ya no está " @@ -2716,5 +2720,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Delete from relation" msgstr "Borrar de la relación" @@ -2726,4 +2730,6 @@ "from relation?" msgstr "" +"La selección \"{0}\" se utiliza en la relación \"{1}\" con la función " +"{2}.
¿Eliminar de la relación?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 @@ -2733,4 +2739,6 @@ "" msgstr "" +"La selección \"{0}\" se utiliza en la relación \"{1}\".
¿Eliminar " +"de la relación?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456 @@ -2767,14 +2775,15 @@ msgstr[1] "Mover {0} nodos" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 -msgid "Purging 1 primitive" -msgstr "Purgando 1 primitiva" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 -#, java-format -msgid "removing reference from way {0}" -msgstr "eliminando referencia de la vía {0}" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 +#, fuzzy, java-format +msgid "Purged object ''{0}''" +msgstr "Mover objetos {0}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 +#, fuzzy, java-format +msgid "Purged {0} objects" +msgstr "Modificar objeto {0}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 #, java-format msgid "" @@ -2785,7 +2794,7 @@ "debajo de 2. El actual es {1}" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203 -#, java-format -msgid "removing reference from relation {0}" +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 +#, fuzzy, java-format +msgid "Removing reference from relation {0}" msgstr "eliminando referencia de la relación {0}" @@ -2795,4 +2804,11 @@ msgstr "Resolver conflictos en la lista de miembros de la relación {0}" +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +msgstr "" +"No se puede deshacer la orden ''{0}'' porque la capa \"{1}'' ya no está " +"presente" + #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 #, java-format @@ -2803,10 +2819,10 @@ #, java-format msgid "Remove way ''{0}'' at position {1} from relation ''{2}''" -msgstr "" +msgstr "Eliminar vía ''{0}'' en la posición {1} de la relación ''{2}''" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:71 #, java-format msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''" -msgstr "" +msgstr "Eliminar relación ''{0}'' en la posición {1} de la relación ''{2}''" #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:141 @@ -2824,15 +2840,15 @@ #, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "" +msgstr "Resolver {0} conflictos de etiquetado en el nodo {1}" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 #, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "" +msgstr "Resolver {0} conflictos de etiquetado en la vía {1}" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "" +msgstr "Resolver {0} conflictos de etiquetado en la relación {1}" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2849,15 +2865,15 @@ #, java-format msgid "Resolve version conflicts for way {0}" -msgstr "" +msgstr "Resolver conflictos de versión para la vía {0}" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 #, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "" +msgstr "Resolver conflictos de versión para la relación {0}" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 #, java-format msgid "Resolve conflicts in node list of way {0}" -msgstr "" +msgstr "Resolver conflictos en la lista de nodos de la vía {0}" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 @@ -2885,9 +2901,9 @@ #: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28 msgid "Old role" -msgstr "Rol antiguo" +msgstr "Función antigua" #: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30 msgid "New role" -msgstr "Rol nuevo" +msgstr "Función nueva" #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23 @@ -2927,5 +2943,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:123 msgid "Roles in relations referring to" -msgstr "Roles en la relaciones referidos a" +msgstr "Funciones en la relaciones referidas a" #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:144 @@ -2949,4 +2965,6 @@ "isn't a directory." msgstr "" +"Aviso: Error al inicializar las preferencias. El directorio de las " +"preferencias ''{0}'' no es un directorio." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:380 @@ -2965,4 +2983,6 @@ "preference directory: {0}" msgstr "" +"Aviso: Error al inicializar las preferencias. Error al crear el directorio " +"de preferencias desaparecido: {0}" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:391 @@ -2972,4 +2992,6 @@ "preference directory: {0}" msgstr "" +"Error al inicializar las preferencias.
Error al crear el " +"directorio de preferencias desaparecido: {0}." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 @@ -2996,4 +3018,6 @@ "to default: {0}" msgstr "" +"Error al inicializar las preferencias.
Error al reiniciar el " +"archivo de preferencias por defecto:{0}." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 @@ -3003,4 +3027,7 @@ "
and creating a new default preference file." msgstr "" +"El archivo de preferencias contiene errores.
Realizando una copia " +"de seguridad en
{0}
y creando un nuevo archivo de preferencias por " +"defecto." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437 @@ -3010,4 +3037,6 @@ "default: {0}" msgstr "" +"Aviso: Error al inicializar las preferencias. Fallo al reiniciar el archivo " +"de preferencias por defecto. {0}." #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87 @@ -3031,4 +3060,6 @@ "{1}" msgstr "" +"Error al cargar marcadores desde ''{0}'' por razones de seguridad. La " +"excepción fue: {1}" #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78 @@ -3093,30 +3124,30 @@ msgctxt "filter" msgid "E" -msgstr "" +msgstr "E" #. column header: hide filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 msgid "H" -msgstr "" +msgstr "H" #. column header: filter text #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 msgid "Text" -msgstr "" +msgstr "Texto" #. column header: apply filter for children #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 msgid "C" -msgstr "" +msgstr "C" #. column header: inverted filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 msgid "I" -msgstr "" +msgstr "I" #. column header: filter mode #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 msgid "M" -msgstr "" +msgstr "M" #. translators notes must be in front @@ -3124,50 +3155,50 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 msgid "R" -msgstr "" +msgstr "R" #. filter mode: add #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 msgid "A" -msgstr "" +msgstr "A" #. filter mode: remove #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 msgid "D" -msgstr "" +msgstr "D" #. filter mode: in selection #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 msgid "F" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +msgstr "F" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Error: {0}" msgstr "Error: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Warning: {0}" msgstr "Advertencia: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 #, java-format msgid "Expected ID >= 0. Got {0}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302 +msgstr "Se esperaba un ID >=0. Obtenido {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 msgid "A primitive with ID = 0 can't be invisible." msgstr "una proimitiva con id=0 no puede ser invisible" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format msgid "ID > 0 expected. Got {0}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340 +msgstr "Se esperaba un ID >0. Obtenido {0}" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 #, java-format msgid "Version > 0 expected. Got {0}." -msgstr "" +msgstr "Se esperaba una versión > 0. Encontrada {0}" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25 @@ -3190,6 +3221,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:244 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3249,120 +3280,113 @@ msgstr "La vía multipoligonal ''{0}'' no está cerrada." -#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed -#. TODO Remove useless nullcheck when RelationMember.member is encalupsed -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855 -msgid "Empty member in relation." -msgstr "Miembro vacío en la relación." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:850 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Miembro ''{0}'' borrado en la relación." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:861 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Vía ''{0}'' con menos de dos puntos." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 msgid "More than one \"from\" way found." msgstr "Se ha encontrado más de una vía \"desde\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:607 msgid "More than one \"to\" way found." msgstr "Se ha encontrado más de una vía \"a\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:613 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627 msgid "More than one \"via\" found." msgstr "Se ha encontrado más de un elemento \"vía\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:632 +#, java-format +msgid "Unknown role ''{0}''." +msgstr "Función ''{0}'' desconocida." + #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 -#, java-format -msgid "Unknown role ''{0}''." -msgstr "Rol ''{0}'' desconocido." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Tipo de miembro \"{0}\" desconocido." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:641 msgid "No \"from\" way found." msgstr "No se ha encontrado ninguna vía \"desde\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645 msgid "No \"to\" way found." msgstr "No se ha encontrado ninguna vía \"a\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:649 msgid "No \"via\" node or way found." msgstr "No se ha encontrado ningún nodo o vía con el rol \"vía\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:658 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "La vía \"desde\" no comienza o termina en un nodo \"vía\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:662 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "La vía \"a\" no comienza o termina en un nodo \"vía\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "La vía \"desde\" no comienza o termina en la vía con rol \"vía\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "La vía \"a\" no comienza o termina en la vía con rol \"vía\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816 #, java-format msgid "Style for restriction {0} not found." msgstr "No se ha encontrado el estilo para la restricción {0}." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:870 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." -msgstr "El rol \"{0}\" no es útil para el tramo \"{1}\"." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889 +msgstr "La función \"{0}\" no es útil para el tramo \"{1}\"." + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:882 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "La no-vía ''{0}'' en multipolígono" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:940 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Ninguna vía exterior en el multipolígono ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1029 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Intersección entre las vías ''{0}'' y ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1041 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "La vía interior ''{0}'' se encuentra en la parte de fuera." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1094 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "El estilo de la vía interior ''{0}'' es igual al del multipolígono" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1120 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "El estilo de la vía exterior ''{0}'' no coincide." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1324 msgid "untagged" msgstr "sin etiquetar" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1325 msgid "text" msgstr "texto" @@ -3387,5 +3411,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:249 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 @@ -3396,5 +3420,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 @@ -3423,5 +3447,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:169 msgid "background" msgstr "fondo" @@ -3518,5 +3542,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "railway" msgstr "ferrocarril" @@ -3570,11 +3594,16 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 msgid "Bad Request" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 +msgstr "Solicitud errónea" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +#, fuzzy +msgid "Not Found" +msgstr "No conectado" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 msgid "Unknown host" msgstr "Host desconocido" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:247 msgid "Primitive already deleted" msgstr "Primitiva ya eliminada" @@ -3713,5 +3742,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 msgid "options provided as Java system properties" -msgstr "" +msgstr "opciones proporcionadas como propiedades de sistema Java" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 @@ -3721,5 +3750,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "Change the folder for all user settings" -msgstr "" +msgstr "Cambiar la carpeta para todas las configuraciones de usuario" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 @@ -3729,4 +3758,8 @@ " Java option to increase the maximum size of allocated memory" msgstr "" +"nota: Para algunas tareas, JOSM necesita mucha memoria. Puede ser necesario " +"el añadir la siguiente \n" +" opción de Java para incrementar el tamaño máximo de la memoria " +"utilizada." #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 @@ -3888,5 +3921,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 msgid "User:" -msgstr "" +msgstr "Usuario:" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -3956,5 +3989,5 @@ #, java-format msgid "Role {0} is not participating in compare pair {1}." -msgstr "el rol {0} no participa en la pareja de comparación {1}" +msgstr "La función {0} no participa en la pareja de comparación {1}" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 @@ -4497,5 +4530,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 msgid "Role" -msgstr "Rol" +msgstr "Función" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 @@ -4507,4 +4540,6 @@ msgid "Merged nodes not frozen yet. Can't build resolution command" msgstr "" +"Los nodos fusionados aún no están congelados. No se puede construir la orden " +"de resolución." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 @@ -4619,14 +4654,14 @@ #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" -msgstr "" +msgstr "Conflictos al fusionar vías - La vía fusionada es ''{0}''" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" -msgstr "" +msgstr "Conflictos al fusionar nodos - El nodo fusionado es ''{0}''" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 msgid "No conflicts to resolve" -msgstr "" +msgstr "Ningún conflicto que resolver" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 @@ -4638,5 +4673,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Apply resolved conflicts" -msgstr "" +msgstr "Aplicar la resolución de conflictos" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 @@ -4756,6 +4791,6 @@ msgid "{0} tag" msgid_plural "{0} tags" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{0} etiqueta" +msgstr[1] "{0} etiquetas" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 @@ -4772,5 +4807,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57 msgid "Replace" -msgstr "" +msgstr "Reemplazar" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 @@ -4782,5 +4817,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62 msgid "Undecided" -msgstr "" +msgstr "Indeciso" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42 @@ -4793,5 +4828,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" -msgstr "" +msgstr "Función:" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:65 @@ -4810,5 +4845,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86 msgid "Apply this role to all members" -msgstr "" +msgstr "Aplicar esta función a todos los miembros" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 @@ -4822,5 +4857,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 msgid "Decision" -msgstr "" +msgstr "Decisión" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4933,5 +4968,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -4950,41 +4985,41 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 msgid "Add filter." -msgstr "" +msgstr "Añadir filtro." #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 msgid "Edit filter." -msgstr "" +msgstr "Editar filtro." #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 msgid "Delete filter." -msgstr "" +msgstr "Borrar filtro." #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Move filter up." -msgstr "" +msgstr "Subir filtro." #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Move filter down." -msgstr "" +msgstr "Bajar filtro." #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 msgid "Enable filter" -msgstr "" +msgstr "Activar filtro" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Hide elements" -msgstr "" +msgstr "Ocultar elementos" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 msgid "Apply also for children" -msgstr "" +msgstr "Aplicar también a los niños" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Inverse filter" -msgstr "" +msgstr "Invertir filtro" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Filter mode" -msgstr "" +msgstr "Modo de filtro" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -5147,43 +5182,43 @@ msgstr "Miembro de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 msgid "Add Properties" msgstr "Añadir propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 msgid "Add a new key/value pair to all objects" msgstr "Añadir una nueva pareja clave/valor para todos los objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 msgid "Edit Properties" msgstr "Editar propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 msgid "Edit the value of the selected key for all objects" msgstr "Editar el valor de la clave seleccionada para todos los objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Propiedades: {0} / Miembros: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 msgid "Properties / Memberships" msgstr "Propiedades / Miembros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 msgid "Change relation" msgstr "Cambiar relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 #, java-format msgid "Really delete selection from relation {0}?" msgstr "¿Seguro de eliminar la selección de la relación {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:855 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 msgid "Delete the selected key in all objects" msgstr "Borrar la clave seleccionada en todos los objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 msgid "Delete Properties" msgstr "Eliminar propiedades" @@ -5193,6 +5228,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168 -#: build/trans_presets.java:3121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 +#: build/trans_presets.java:3133 msgid "Relations" msgstr "Relaciones" @@ -5202,25 +5237,30 @@ msgstr "Abrir una lista de todas las relaciones." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:174 #, java-format msgid "Relations: {0}" msgstr "Relaciones: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 msgid "Open an editor for the selected relation" msgstr "Abrir un editor para la relación seleccionada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:325 msgid "Delete the selected relation" msgstr "Borrar la relación seleccionada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:363 msgid "Create a new relation" msgstr "Crear un anueva relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:400 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280 msgid "Create a copy of this relation and open it in another editor window" msgstr "Crea una copia de esta relación y la abre en otra ventana de edición." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 +#, fuzzy +msgid "Set the current selection to the list of selected relations" +msgstr "La selección actual no se puede usar para separar." #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5261,9 +5301,9 @@ msgstr "Selección: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 msgid "Undock the panel" msgstr "Desacoplar el panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5272,5 +5312,5 @@ "herramientas de la izquierda." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 msgid "Click to minimize/maximize the panel content" msgstr "Haga click para minimizar/maximizar el contenido del panel" @@ -5303,5 +5343,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 msgid "Launches a browser with information about the user" -msgstr "" +msgstr "Lanza un buscador con información sobre el usuario" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 @@ -5317,8 +5357,10 @@ "missing on this system." msgstr "" +"Fallo al crear una URL porque la codificación ''{0}''
no existe en " +"este sistema." #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 msgid "Missing encoding" -msgstr "" +msgstr "Falta codificación" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 @@ -5348,5 +5390,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:246 msgid "Download Selected Children" -msgstr "" +msgstr "Descargar los hijos seleccionados" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 @@ -5376,5 +5418,5 @@ #, java-format msgid "Downloading relation {0}" -msgstr "" +msgstr "Descargando relación {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 @@ -5387,5 +5429,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Tags and Members" -msgstr "" +msgstr "Etiquetas y miembros" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 @@ -5524,9 +5566,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 msgid "Yes, create a conflict and close" -msgstr "" +msgstr "Sí, crear un conflicto y cerrar" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 msgid "No, continue editing" -msgstr "" +msgstr "No, continuar editando" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 @@ -5550,9 +5592,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Apply the current updates" -msgstr "" +msgstr "Aplicar las actualizaciones actuales" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 msgid "Apply the updates and close the dialog" -msgstr "" +msgstr "Aplicar las actualizaciones y cerrar el diálogo" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 @@ -5562,5 +5604,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174 msgid "Add an empty tag" -msgstr "" +msgstr "Añadir una etiqueta vacía" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 @@ -5578,9 +5620,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208 msgid "Sets a role for the selected members" -msgstr "" +msgstr "Fijar una función para los miembros seleccionados" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211 msgid "Apply Role" -msgstr "Aplicar rol" +msgstr "Aplicar función" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224 @@ -5602,5 +5644,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 msgid "Confirm empty role" -msgstr "" +msgstr "Confirmar función vacía" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 @@ -5783,5 +5825,5 @@ #. group "Geography" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2771 msgid "Places" msgstr "Lugares" @@ -6455,6 +6497,4 @@ #. item "Man Made/Windmill" label "Edit Windmill" #. -#. item "Man Made/Pipeline" label "Edit Pipeline" -#. #. item "Man Made/Wastewater Plant" label "Edit Wastewater Plant" #. @@ -6467,4 +6507,6 @@ #. item "Man Made/Surveillance" label "Edit Surveillance Camera" #. +#. item "Man Made/Power Station" label "Edit Power Station" +#. #. item "Amenities/Fountain" label "Edit Fountain" #. @@ -6789,57 +6831,57 @@ #: build/trans_presets.java:2250 build/trans_presets.java:2258 #: build/trans_presets.java:2290 build/trans_presets.java:2295 -#: build/trans_presets.java:2300 build/trans_presets.java:2305 -#: build/trans_presets.java:2311 build/trans_presets.java:2317 -#: build/trans_presets.java:2323 build/trans_presets.java:2331 -#: build/trans_presets.java:2337 build/trans_presets.java:2343 -#: build/trans_presets.java:2349 build/trans_presets.java:2355 -#: build/trans_presets.java:2365 build/trans_presets.java:2462 -#: build/trans_presets.java:2469 build/trans_presets.java:2483 -#: build/trans_presets.java:2489 build/trans_presets.java:2496 -#: build/trans_presets.java:2503 build/trans_presets.java:2509 -#: build/trans_presets.java:2515 build/trans_presets.java:2537 -#: build/trans_presets.java:2544 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2305 build/trans_presets.java:2310 +#: build/trans_presets.java:2316 build/trans_presets.java:2322 +#: build/trans_presets.java:2339 build/trans_presets.java:2345 +#: build/trans_presets.java:2351 build/trans_presets.java:2357 +#: build/trans_presets.java:2363 build/trans_presets.java:2373 +#: build/trans_presets.java:2380 build/trans_presets.java:2474 +#: build/trans_presets.java:2481 build/trans_presets.java:2495 +#: build/trans_presets.java:2501 build/trans_presets.java:2508 +#: build/trans_presets.java:2515 build/trans_presets.java:2521 +#: build/trans_presets.java:2527 build/trans_presets.java:2549 +#: build/trans_presets.java:2556 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2576 #: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2594 build/trans_presets.java:2601 -#: build/trans_presets.java:2608 build/trans_presets.java:2615 -#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2594 build/trans_presets.java:2600 +#: build/trans_presets.java:2606 build/trans_presets.java:2613 +#: build/trans_presets.java:2620 build/trans_presets.java:2627 #: build/trans_presets.java:2633 build/trans_presets.java:2639 -#: build/trans_presets.java:2645 build/trans_presets.java:2652 -#: build/trans_presets.java:2659 build/trans_presets.java:2666 -#: build/trans_presets.java:2672 build/trans_presets.java:2678 -#: build/trans_presets.java:2688 build/trans_presets.java:2697 -#: build/trans_presets.java:2712 build/trans_presets.java:2718 -#: build/trans_presets.java:2726 build/trans_presets.java:2733 -#: build/trans_presets.java:2753 build/trans_presets.java:2764 -#: build/trans_presets.java:2770 build/trans_presets.java:2776 +#: build/trans_presets.java:2645 build/trans_presets.java:2651 +#: build/trans_presets.java:2657 build/trans_presets.java:2664 +#: build/trans_presets.java:2671 build/trans_presets.java:2678 +#: build/trans_presets.java:2684 build/trans_presets.java:2690 +#: build/trans_presets.java:2700 build/trans_presets.java:2709 +#: build/trans_presets.java:2724 build/trans_presets.java:2730 +#: build/trans_presets.java:2738 build/trans_presets.java:2745 +#: build/trans_presets.java:2765 build/trans_presets.java:2776 #: build/trans_presets.java:2782 build/trans_presets.java:2788 -#: build/trans_presets.java:2795 build/trans_presets.java:2802 -#: build/trans_presets.java:2809 build/trans_presets.java:2815 -#: build/trans_presets.java:2821 build/trans_presets.java:2829 -#: build/trans_presets.java:2836 build/trans_presets.java:2843 -#: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2879 build/trans_presets.java:2885 +#: build/trans_presets.java:2794 build/trans_presets.java:2800 +#: build/trans_presets.java:2807 build/trans_presets.java:2814 +#: build/trans_presets.java:2821 build/trans_presets.java:2827 +#: build/trans_presets.java:2833 build/trans_presets.java:2841 +#: build/trans_presets.java:2848 build/trans_presets.java:2855 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2875 build/trans_presets.java:2882 #: build/trans_presets.java:2891 build/trans_presets.java:2897 -#: build/trans_presets.java:2903 build/trans_presets.java:2912 -#: build/trans_presets.java:2922 build/trans_presets.java:2931 -#: build/trans_presets.java:2937 build/trans_presets.java:2943 -#: build/trans_presets.java:2948 build/trans_presets.java:2954 -#: build/trans_presets.java:2960 build/trans_presets.java:2969 -#: build/trans_presets.java:2975 build/trans_presets.java:2981 +#: build/trans_presets.java:2903 build/trans_presets.java:2909 +#: build/trans_presets.java:2915 build/trans_presets.java:2924 +#: build/trans_presets.java:2934 build/trans_presets.java:2943 +#: build/trans_presets.java:2949 build/trans_presets.java:2955 +#: build/trans_presets.java:2960 build/trans_presets.java:2966 +#: build/trans_presets.java:2972 build/trans_presets.java:2981 #: build/trans_presets.java:2987 build/trans_presets.java:2993 #: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3012 build/trans_presets.java:3018 -#: build/trans_presets.java:3023 build/trans_presets.java:3030 -#: build/trans_presets.java:3037 build/trans_presets.java:3043 -#: build/trans_presets.java:3052 build/trans_presets.java:3060 -#: build/trans_presets.java:3066 build/trans_presets.java:3072 -#: build/trans_presets.java:3079 build/trans_presets.java:3085 -#: build/trans_presets.java:3092 build/trans_presets.java:3098 +#: build/trans_presets.java:3011 build/trans_presets.java:3017 +#: build/trans_presets.java:3024 build/trans_presets.java:3030 +#: build/trans_presets.java:3035 build/trans_presets.java:3042 +#: build/trans_presets.java:3049 build/trans_presets.java:3055 +#: build/trans_presets.java:3064 build/trans_presets.java:3072 +#: build/trans_presets.java:3078 build/trans_presets.java:3084 +#: build/trans_presets.java:3091 build/trans_presets.java:3097 #: build/trans_presets.java:3104 build/trans_presets.java:3110 -#: build/trans_presets.java:3116 build/trans_presets.java:3129 -#: build/trans_presets.java:3143 build/trans_presets.java:3157 +#: build/trans_presets.java:3116 build/trans_presets.java:3122 +#: build/trans_presets.java:3128 build/trans_presets.java:3141 +#: build/trans_presets.java:3155 build/trans_presets.java:3169 msgid "Name" msgstr "Nombre" @@ -6902,5 +6944,4 @@ msgstr "" -#. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 msgid "Close the selected open changesets" @@ -6928,25 +6969,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "Yes" msgstr "Si" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "No" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47 #, java-format msgid "Layer ''{0}'' has modifications which should be uploaded to the server." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49 #, java-format msgid "Layer ''{0}'' has no modifications to be uploaded." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60 #, java-format msgid "" @@ -6955,29 +6996,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62 #, java-format msgid "Layer ''{0}'' has no modifications to be saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80 msgid "No file associated with this layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:83 msgid "Please select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:86 #, java-format msgid "Layer ''{0}'' is not backed by a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:101 #, java-format msgid "File ''{0}'' is not writable. Please enter another file name." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:115 #, java-format msgid "Select to upload layer ''{0}'' to the server ''{1}''" @@ -7070,5 +7111,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -msgid "Save and Exit" +#, fuzzy +msgid "Save/Upload and Exit" msgstr "Guardar y salir" @@ -7079,5 +7121,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -msgid "Save and Delete" +#, fuzzy +msgid "Save/Upload and Delete" msgstr "Grabar y borrar" @@ -7095,5 +7138,5 @@ msgid "" "An upload and/or save operation of one layer with modifications
was " -"cancelled or has been failed." +"cancelled or has failed." msgstr "" @@ -7179,6 +7222,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:891 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:921 msgid "Tags of new changeset" msgstr "Etiquetas del nuevo conjunto de cambios" @@ -7277,7 +7320,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:909 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:933 #, java-format msgid "Tags of changeset {0}" @@ -7285,49 +7327,49 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:949 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:963 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1011 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106 msgid "Preparing primitives to upload ..." msgstr "Preparando primitivas para subir" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Imágenes para {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "Leer gpx" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "No hay hora para el punto {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "No pudo leerse la hora \"{0}\" desde el punto {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325 msgid "No images with readable timestamps found." msgstr "" "No se han encontrado imágenes con metadatos legibles sobre la fecha y hora." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format @@ -7335,29 +7377,29 @@ msgstr "Leyendo {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:402 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246 msgid "Geotagged Images" msgstr "Imagenes Geoetiquetadas" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:587 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "GPS start: {0}" msgstr "Iniciar GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 #, java-format msgid "GPS end: {0}" msgstr "Finalizar GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594 #, java-format msgid "current delta: {0}s" msgstr "delta actual: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595 msgid "timezone difference: " msgstr "diferencia de zona horaria: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284 msgid "image" @@ -7366,14 +7408,14 @@ msgstr[1] "imagenes" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #, java-format msgid "{0} within the track." msgstr "{0} dentro de la traza." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680 msgid "Sync clock" msgstr "Sincronizar reloj" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7381,32 +7423,32 @@ msgstr "Imágenes JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:734 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "La fecha en el archivo \"{0}\" no pudo ser analizada sintácticamente." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "No hay datos sobre la hora en la cabecera EXIF del archivo \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 msgid "Image" msgstr "Imagen" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:752 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Introduce la fecha mostrada (mm/dd/aaaa HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759 msgid "GPS unit timezone (difference to photo)" msgstr "Zona horaria del GPS (diferencia con la foto)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:767 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771 msgid "Synchronize Time with GPS Unit" msgstr "Sincronizar hora con la del receptor GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:790 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 msgid "Time entered could not be parsed." msgstr "La hora no pudo ser analizada sintácticamente." @@ -7490,5 +7532,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 #, java-format msgid "Name: {0}" @@ -7511,5 +7553,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3160 +#: build/trans_presets.java:3172 msgid "Description" msgstr "Descripción" @@ -7565,5 +7607,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:587 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 @@ -7631,42 +7673,65 @@ "tiempos fueran razonablemente estimados se han omitido." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:105 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:107 #, java-format msgid "Data Layer {0}" msgstr "Capa de datos {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 msgid "outside downloaded area" msgstr "fuera del área descargada" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:252 #, java-format msgid "version {0}" msgstr "versión {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:289 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:290 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 +#, fuzzy, java-format +msgid "There was {0} conflict detected." +msgid_plural "There were {0} conflicts detected." +msgstr[0] "Existió {0} conflictos durante la importación." +msgstr[1] "Existió {0} conflictos durante la importación." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 +#, java-format +msgid "" +"{0} object has been purged from the local dataset because it is deleted on " +"the server." +msgid_plural "" +"{0} objects have been purged from the local dataset because they are deleted " +"on the server." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 +#, fuzzy +msgid "Conflicts detected" +msgstr "Conflicto detectado" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 #, java-format msgid "{0} consists of:" msgstr "{0} formado por:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:476 #, java-format msgid " ({0} deleted.)" msgstr " ({0} borrados.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 msgid "unset" msgstr "sin ajustar" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 #, java-format msgid "API version: {0}" msgstr "Versión del API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:501 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:584 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" @@ -8043,5 +8108,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:412 #: ../plugins/terracer/src/terracer/TerracerAction.java:430 @@ -8817,5 +8882,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261 msgid "More information about this feature" msgstr "Más información sobre esta característica" @@ -8864,5 +8929,5 @@ msgstr "Los elementos del tipo {0} son soportados" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:700 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -8872,18 +8937,18 @@ msgstr[1] "Modificar objetos {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "¡No hay nada seleccionado!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 msgid "Selection unsuitable!" msgstr "¡Selección inadecuada!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 msgid "Apply Preset" msgstr "Aplicar" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788 msgid "Change Properties" msgstr "Cambiar propiedades" @@ -9173,44 +9238,44 @@ msgstr "Cerrando conjunto de cambios..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "Sin nuevos cambios que enviar" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 msgid "Preparing..." msgstr "Preparando…" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 msgid "Uploading..." msgstr "Subiendo..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "Reintentando {0} de {1} en {2} segundos..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 msgid "OK - trying again." msgstr "OK - intentando de nuevo." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 #, java-format msgid "Starting retry {0} of {1}." msgstr "Reintentando {0} de {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9453,5 +9518,5 @@ msgid "" "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}''," -"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." +"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." msgstr "" @@ -9568,6 +9633,6 @@ #, java-format msgid "" -"Relation with external id ''{0}'' refers to missing primitive with external " -"id ''{1}''." +"Relation with external id ''{0}'' refers to a missing primitive with " +"external id ''{1}''." msgstr "" @@ -9664,32 +9729,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:73 msgid "Starting to upload with one request per primitive ..." msgstr "Comenzando a subir en un única petición por primitiva..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})" msgstr "{0}% ({1}/{2}), {3} restantes. Subiendo nodo ''{4}'' (id: {5})" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Starting to upload in one request ..." msgstr "Comenzando a subir en un única petición..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 +#, fuzzy, java-format +msgid "Parameter ''{0}'' must not be null" +msgstr "el parámetro ''{0}'' no debe ser nulo" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 msgid "Uploading data ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 msgid "" "WARNING: no API version defined for data to upload. Falling back to version " @@ -9697,5 +9767,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:153 #, java-format msgid "" @@ -9748,5 +9818,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127 msgid "Skip Download" -msgstr "Salta la descargar" +msgstr "Omitir la descarga" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129 @@ -9925,5 +9995,5 @@ #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:202 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:324 build/trans_presets.java:325 @@ -9945,6 +10015,6 @@ #: build/trans_presets.java:789 build/trans_presets.java:1333 #: build/trans_presets.java:1400 build/trans_presets.java:1401 -#: build/trans_presets.java:1402 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 +#: build/trans_presets.java:1402 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 msgid "unknown" msgstr "desconocido" @@ -10053,4 +10123,7 @@ "applet and because you didn''t load your applet from ''{1}''." msgstr "" +"Fallo al abrir una conexión con el servidor remoto
''{0}''
por " +"razones de seguridad. Esto sucede normalmente porque está funcionando en una " +"miniaplicacióin
y no lo ha cargado desde ''{1}''." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 @@ -10097,5 +10170,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:192 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:182 +#, java-format +msgid "" +"The OSM server ''{0}'' doesn't know about an object
you tried to read, " +"update, or delete. Either the respective object
doesn''t exist on the " +"server or you''re using an invalid URL to access
it. Please carefully " +"check the servers address ''{1}'' for typos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:209 #, java-format msgid "" @@ -10105,5 +10187,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:262 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:279 #, java-format msgid "" @@ -10370,17 +10452,15 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35 msgid "Define Address Interpolation" msgstr "" -#. Whether to re-trigger data changed for relation #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "Impar" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:413 #: ../plugins/terracer/src/terracer/TerracerAction.java:437 @@ -10388,99 +10468,99 @@ msgstr "Par" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 msgid "Alphabetic" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161 #, java-format msgid "Relation: {0}" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173 msgid "Associate with street using:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184 msgid "Numbering Scheme:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 msgid "Starting #:" msgstr "Comenzando #:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188 msgid "Ending #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 #, java-format msgid "Will associate {0} additional house number nodes" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 msgid "Starting address number must be less than ending address number" msgstr "" @@ -11250,4 +11330,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52 +#: build/trans_presets.java:2331 msgid "Location" msgstr "Localización" @@ -11799,4 +11880,5 @@ msgstr "sureste" +#. item "Man Made/Pipeline" combo "Type" #. color highway_track #. @@ -11842,7 +11924,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:990 build/trans_style.java:1007 -#: build/trans_style.java:1023 build/trans_style.java:3400 -#: build/trans_style.java:3408 +#: build/trans_presets.java:2330 build/trans_style.java:990 +#: build/trans_style.java:1007 build/trans_style.java:1023 +#: build/trans_style.java:3400 build/trans_style.java:3408 msgid "water" msgstr "lámina de agua" @@ -12184,5 +12266,5 @@ #, java-format msgid "Processing {0}" -msgstr "" +msgstr "Procesando {0}" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 @@ -13069,5 +13151,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171 msgid "Updating ignored errors ..." -msgstr "" +msgstr "Subiendo errores ignorados..." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118 @@ -13158,8 +13240,10 @@ "the same layer, but are not connected by a node." msgstr "" +"Este test comprueba si dos carreteras, vías de ferrocarril, canales o " +"edificios se cruzan misma capa, pero no están conectados por un nodo." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125 msgid "Crossing buildings" -msgstr "" +msgstr "Edificios superpuestos" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125 @@ -13178,5 +13262,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83 msgid "Nodes at same position" -msgstr "" +msgstr "Nodos en la misma posición" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145 @@ -13194,8 +13278,10 @@ "coordinates." msgstr "" +"Este test comprueba que no existen vías con las mismas etiquetas y nodos con " +"iguales coordenadas." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144 msgid "Delete duplicate ways" -msgstr "" +msgstr "Eliminar vías duplicadas" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -13754,4 +13840,6 @@ "Display a map that was previously scanned and uploaded to walking-papers.org" msgstr "" +"Mostrar un mapa que estaba anteriormente escaneado y subido a walking-papers." +"org" #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29 @@ -13759,9 +13847,11 @@ "Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" msgstr "" +"Introduce una URL de walking-papers.org o un ID (justo después de ?id= en la " +"URL)" #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 #, java-format msgid "Could not read information from walking-papers.org the id \"{0}\"" -msgstr "" +msgstr "No se pudo leer la información de walking-papers.org el id \"{0}\"" #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 @@ -13924,5 +14014,5 @@ #, java-format msgid "Warning: The complete URL is ''{0}''." -msgstr "" +msgstr "Atención: La URL completa es ''{0}''." #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 @@ -13947,5 +14037,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 msgid "(deactivated)" -msgstr "" +msgstr "(desactivado)" #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:143 @@ -13978,5 +14068,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202 msgid "Invalid URL?" -msgstr "" +msgstr "¿URL no válida?" #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 @@ -14077,5 +14167,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 msgid "Please select at least one row to copy." -msgstr "" +msgstr "Por favor, seleccione al menos una fila para copiar" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164 @@ -14098,5 +14188,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10 msgid "WMS Files (*.wms)" -msgstr "" +msgstr "Archivos WMS (*.wms)" #. * @@ -14145,4 +14235,6 @@ msgid "Group common Address Interpolation inputs in a single dialog," msgstr "" +"Agrupar las entradas comunes de \tinterpolación de direcciones en un único " +"diálogo," #. Plugin AgPifoJ @@ -14272,5 +14364,5 @@ #: build/trans_plugins.java:37 msgid "Adds no left turn for sets of 4 or 5 ways" -msgstr "" +msgstr "No añadir ningún giro a la izquierda para conjuntos de 4 o 5 vías" #. Plugin nearclick @@ -14521,9 +14613,11 @@ #. item "Public Transport/Airport" text "Name" #. +#. item "Man Made/Power Station" text "Operator" #. item "Relations/Route" text "Name" #: build/trans_presets.java:65 build/trans_presets.java:101 #: build/trans_presets.java:121 build/trans_presets.java:141 #: build/trans_presets.java:178 build/trans_presets.java:198 -#: build/trans_presets.java:1560 build/trans_presets.java:3158 +#: build/trans_presets.java:1560 build/trans_presets.java:2382 +#: build/trans_presets.java:3170 msgid "Reference" msgstr "Referencia" @@ -15066,5 +15160,5 @@ #: build/trans_presets.java:1309 msgid "asphalt" -msgstr "" +msgstr "asfalto" #: build/trans_presets.java:243 build/trans_presets.java:261 @@ -15085,7 +15179,7 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 msgid "metal" -msgstr "" +msgstr "metal" #. color heath @@ -15103,5 +15197,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 #: build/trans_style.java:3375 msgid "wood" @@ -15116,5 +15210,5 @@ #: build/trans_presets.java:1309 msgid "paving_stones" -msgstr "" +msgstr "pavimento adoquinado" #. item "Ways/Track Grade 2" combo "Surface" @@ -15151,5 +15245,5 @@ #: build/trans_presets.java:1309 msgid "pebblestone" -msgstr "" +msgstr "grijo" #: build/trans_presets.java:243 build/trans_presets.java:261 @@ -15161,5 +15255,5 @@ #: build/trans_presets.java:1309 msgid "compacted" -msgstr "" +msgstr "compactado" #: build/trans_presets.java:243 build/trans_presets.java:261 @@ -15171,5 +15265,5 @@ #: build/trans_presets.java:1309 msgid "grass_paver" -msgstr "" +msgstr "Pavimento vegetal (de celosía)" #: build/trans_presets.java:243 build/trans_presets.java:261 @@ -15390,7 +15484,7 @@ #: build/trans_presets.java:1401 build/trans_presets.java:1402 #: build/trans_presets.java:1767 build/trans_presets.java:1777 -#: build/trans_presets.java:2408 build/trans_presets.java:2444 -#: build/trans_presets.java:2453 build/trans_presets.java:2454 -#: build/trans_presets.java:2455 build/trans_presets.java:2725 +#: build/trans_presets.java:2420 build/trans_presets.java:2456 +#: build/trans_presets.java:2465 build/trans_presets.java:2466 +#: build/trans_presets.java:2467 build/trans_presets.java:2737 msgid "yes" msgstr "sí" @@ -15539,8 +15633,8 @@ #: build/trans_presets.java:1400 build/trans_presets.java:1401 #: build/trans_presets.java:1402 build/trans_presets.java:1767 -#: build/trans_presets.java:1777 build/trans_presets.java:2408 -#: build/trans_presets.java:2444 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 -#: build/trans_presets.java:2725 +#: build/trans_presets.java:1777 build/trans_presets.java:2420 +#: build/trans_presets.java:2456 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 +#: build/trans_presets.java:2737 msgid "no" msgstr "no" @@ -15678,6 +15772,8 @@ #. item "Water/Wetland" text "Name" #. item "Car/Parking" text "Reference number" +#. item "Man Made/Pipeline" text "Operator" #. item "Man Made/Power Generator" label "Edit Power Generator" #. +#. item "Man Made/Power Tower" label "Edit Power Tower" #. item "Land use/Tree" text "Name" #. item "Land use/Wood" text "Name" @@ -15685,7 +15781,8 @@ #: build/trans_presets.java:350 build/trans_presets.java:649 #: build/trans_presets.java:789 build/trans_presets.java:1137 -#: build/trans_presets.java:1395 build/trans_presets.java:2364 -#: build/trans_presets.java:2913 build/trans_presets.java:2923 -#: build/trans_presets.java:2932 +#: build/trans_presets.java:1395 build/trans_presets.java:2330 +#: build/trans_presets.java:2372 build/trans_presets.java:2398 +#: build/trans_presets.java:2925 build/trans_presets.java:2935 +#: build/trans_presets.java:2944 msgid "Type" msgstr "Tipo" @@ -15932,5 +16029,5 @@ #: build/trans_presets.java:418 msgid "Bridleway" -msgstr "Camino de herradura" +msgstr "Vía ecuestre" #. item @@ -15938,5 +16035,5 @@ #: build/trans_presets.java:420 msgid "Edit Bridleway" -msgstr "Editar camino de herradura" +msgstr "Editar vía ecuestre" #. item "Ways/Bridleway" text "Width (meters)" @@ -15957,5 +16054,5 @@ #: build/trans_presets.java:450 msgid "Pedestrians" -msgstr "" +msgstr "Peatones" #. item "Ways/Cycleway" text "Width (meters)" @@ -15975,5 +16072,5 @@ #: build/trans_presets.java:470 msgid "Bikes" -msgstr "" +msgstr "Bicicletas" #. item "Ways/Footway" text "Width (meters)" @@ -16236,10 +16333,10 @@ #. item "Tourism/Information Terminal" text "Closer description" #. item "Tourism/Audioguide" text "Closer description" -#. item "Man Made/Power Station" label "Edit Power Station" -#. +#. item "Man Made/Tower" text "Height (meters)" +#. item "Man Made/Pipeline" label "Edit Pipeline" +#. +#. item "Man Made/Power Station" text "Name" #. item "Man Made/Power Sub Station" label "Edit Power Sub Station" #. -#. item "Man Made/Power Line" label "Edit Power Line" -#. #. item #. #: build/trans_presets.java:1535 build/trans_presets.java:1789 -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2465 msgid "Shelter" msgstr "Refugio" @@ -18261,5 +18360,5 @@ #: build/trans_presets.java:1724 msgid "Detail Grade" -msgstr "" +msgstr "Grado de detalle" #. item "Tourism/Map" combo "Detail Grade" @@ -18308,22 +18407,22 @@ #: build/trans_presets.java:1724 msgid "scheme" -msgstr "" +msgstr "esquema" #: build/trans_presets.java:1725 msgid "Shown Area" -msgstr "" +msgstr "Mostrar área" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1725 msgid "site" -msgstr "" +msgstr "sitio" #: build/trans_presets.java:1725 msgid "city" -msgstr "" +msgstr "ciudad" #: build/trans_presets.java:1725 msgid "region" -msgstr "" +msgstr "región" #. item "Tourism/Other Information Points" text "Name" @@ -18339,5 +18438,5 @@ #: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" -msgstr "" +msgstr "Rutas mostradas para:" #. item "Tourism/Map" check "Hiking" @@ -18352,5 +18451,5 @@ #: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" -msgstr "" +msgstr "Bicicleta de montaña" #. item "Tourism/Map" check "Mountainbiking" @@ -18365,5 +18464,5 @@ #: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" -msgstr "" +msgstr "Equitación" #. item "Tourism/Map" check "Riding" @@ -18381,10 +18480,10 @@ #: build/trans_presets.java:1741 msgid "Board Content" -msgstr "" +msgstr "Tablón de anuncios" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1741 msgid "notice" -msgstr "" +msgstr "aviso" #: build/trans_presets.java:1741 @@ -18402,5 +18501,5 @@ #: build/trans_presets.java:1741 msgid "plants" -msgstr "" +msgstr "plantas" #. item "Tourism/Information Board" text "Closer Description" @@ -18418,5 +18517,5 @@ #: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" -msgstr "" +msgstr "Descripción detallada" #: build/trans_presets.java:1769 @@ -18432,5 +18531,5 @@ #: build/trans_presets.java:1780 msgid "Phone number" -msgstr "" +msgstr "Número de teléfono" #. item "Tourism/Audioguide" text "Phone number" @@ -18553,10 +18652,10 @@ #: build/trans_presets.java:1852 msgid "Boundary Stone" -msgstr "" +msgstr "Mojón" #. item #: build/trans_presets.java:1853 msgid "Edit Boundary Stone" -msgstr "" +msgstr "Editar mojón" #. item "Historic Places/Boundary Stone" text "Name" @@ -18597,5 +18696,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1877 build/trans_presets.java:2669 +#: build/trans_presets.java:1877 build/trans_presets.java:2681 msgid "Sports" msgstr "Deportes" @@ -19383,5 +19482,5 @@ #: build/trans_presets.java:2131 build/trans_presets.java:2137 msgid "track" -msgstr "" +msgstr "pista" #: build/trans_presets.java:1935 @@ -19948,6 +20047,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "Religion" msgstr "Religión" @@ -19956,66 +20055,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "bahai" msgstr "bahaísta" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "buddhist" msgstr "budista" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "christian" msgstr "cristiana" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "hindu" msgstr "hindú" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jain" msgstr "jainista" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jewish" msgstr "judía" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "muslim" msgstr "musulmana" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "sikh" msgstr "sijista" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "spiritualist" msgstr "espiritualista" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "taoist" msgstr "taoista" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "unitarian" msgstr "unitarismo" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "zoroastrian" msgstr "zoroástrica" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "Denomination" msgstr "Confesión" @@ -20024,76 +20123,76 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "anglican" msgstr "anglicano" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "baptist" msgstr "baptista" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "catholic" msgstr "católico" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "evangelical" msgstr "evangélico" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "jehovahs_witness" msgstr "testigos de Jehová" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "lutheran" msgstr "luterano" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "methodist" msgstr "metodista" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "mormon" msgstr "mormón" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "orthodox" msgstr "ortodoxo" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "pentecostal" msgstr "pentecostal" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "presbyterian" msgstr "presbiteriano" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "protestant" msgstr "protestante" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "quaker" msgstr "cuáquero" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "shia" msgstr "chiita" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "sunni" msgstr "suní" @@ -20189,25 +20288,49 @@ #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2296 +#, fuzzy +msgid "Tower type" +msgstr "Tipo de ruta" + +#. item "Man Made/Tower" combo "Tower type" +#: build/trans_presets.java:2296 +#, fuzzy +msgid "communication" +msgstr "Conexión" + +#: build/trans_presets.java:2296 +#, fuzzy +msgid "observation" +msgstr "Altitud" + +#. +#: build/trans_presets.java:2298 +#, fuzzy +msgid "Height (meters)" +msgstr "Altura max. (en metros)" + +#. item "Man Made/Tower" text "Operator" +#. +#: build/trans_presets.java:2302 msgid "Water Tower" msgstr "Torre de agua" #. item -#: build/trans_presets.java:2298 +#: build/trans_presets.java:2303 msgid "Edit Water Tower" msgstr "Editar torre de agua" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2307 msgid "Gasometer" msgstr "Gasómetro" #. item -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2308 msgid "Edit Gasometer" msgstr "Editar gasómetro" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2307 +#: build/trans_presets.java:2312 msgid "Lighthouse" msgstr "Faro" @@ -20215,10 +20338,10 @@ #. item #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2314 msgid "Edit Lighthouse" msgstr "Editar faro" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2318 msgid "Windmill" msgstr "Molino de viento" @@ -20226,21 +20349,55 @@ #. item #. -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2320 msgid "Edit Windmill" msgstr "Editar molino de viento" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2319 +#: build/trans_presets.java:2324 msgid "Pipeline" msgstr "Tubería" #. item -#. -#: build/trans_presets.java:2321 +#. +#: build/trans_presets.java:2327 msgid "Edit Pipeline" msgstr "Editar tubería" -#. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2330 +#, fuzzy +msgid "oil" +msgstr "fósil" + +#: build/trans_presets.java:2330 build/trans_presets.java:2372 +msgid "gas" +msgstr "gas" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "sewage" +msgstr "uso" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "heat" +msgstr "monte" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "any substance" +msgstr "A Por distancia" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "underwater" +msgstr "lámina de agua" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "overground" +msgstr "subterráneo" + +#: build/trans_presets.java:2333 msgid "Wastewater Plant" msgstr "Depuradora" @@ -20250,10 +20407,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:2329 +#: build/trans_presets.java:2337 msgid "Edit Wastewater Plant" msgstr "Editar depuradora" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2333 +#: build/trans_presets.java:2341 msgid "Crane" msgstr "Grúa" @@ -20261,10 +20418,10 @@ #. item #. -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2343 msgid "Edit Crane" msgstr "Editar grúa" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2347 msgid "Beacon" msgstr "Baliza" @@ -20272,10 +20429,10 @@ #. item #. -#: build/trans_presets.java:2341 +#: build/trans_presets.java:2349 msgid "Edit Beacon" msgstr "Editar baliza" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2353 msgid "Survey Point" msgstr "Vértice geodésico" @@ -20283,10 +20440,10 @@ #. item #. -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2355 msgid "Edit Survey Point" msgstr "Editar vértice geodésico" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2359 msgid "Surveillance" msgstr "Cámara de vigilacia" @@ -20294,5 +20451,5 @@ #. item #. -#: build/trans_presets.java:2353 +#: build/trans_presets.java:2361 msgid "Edit Surveillance Camera" msgstr "Editar cámara de vigilancia" @@ -20300,5 +20457,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2366 msgid "Power Generator" msgstr "Generador de energía" @@ -20308,39 +20465,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:2362 +#: build/trans_presets.java:2370 msgid "Edit Power Generator" msgstr "Editar generador de energía" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "wind" msgstr "eólico" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "hydro" msgstr "hidráulico" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "fossil" msgstr "fósil" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "nuclear" msgstr "nuclear" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "coal" msgstr "carbón" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "photovoltaic" msgstr "fotovoltaico" -#: build/trans_presets.java:2364 -msgid "gas" -msgstr "gas" - #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2375 msgid "Power Station" msgstr "Central eléctrica" @@ -20349,10 +20502,10 @@ #. -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2378 msgid "Edit Power Station" msgstr "Editar central eléctrica" -#. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2374 +#. item "Man Made/Power Station" text "Reference" +#: build/trans_presets.java:2384 msgid "Power Sub Station" msgstr "Subestación eléctrica" @@ -20361,5 +20514,5 @@ #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2387 msgid "Edit Power Sub Station" msgstr "Editar subestación eléctrica" @@ -20367,10 +20520,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2380 build/trans_presets.java:2396 +#: build/trans_presets.java:2390 build/trans_presets.java:2407 msgid "Line reference" msgstr "Línea de referencia" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2382 +#: build/trans_presets.java:2392 msgid "Power Tower" msgstr "Torre de electricidad" @@ -20381,11 +20534,26 @@ #. 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:2387 +#: build/trans_presets.java:2397 msgid "Edit Power Tower" msgstr "Editar torre de electricidad" -#. item "Man Made/Power Tower" label "Edit Power Tower" -#. -#: build/trans_presets.java:2390 +#. item "Man Made/Power Tower" combo "Type" +#: build/trans_presets.java:2398 +#, fuzzy +msgid "tower" +msgstr "Torre" + +#: build/trans_presets.java:2398 +#, fuzzy +msgid "pole" +msgstr "Función" + +#: build/trans_presets.java:2399 +#, fuzzy +msgid "Tower reference" +msgstr "Línea de referencia" + +#. item "Man Made/Power Tower" text "Tower reference" +#: build/trans_presets.java:2401 msgid "Power Line" msgstr "Tendido eléctrico" @@ -20394,40 +20562,83 @@ #. -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2404 msgid "Edit Power Line" msgstr "Editar tendido eléctrico" +#. item "Man Made/Power Line" label "Edit Power Line" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "Line type" +msgstr "Tipo de pista de esquí" + +#. item "Man Made/Power Line" combo "Line type" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "line" +msgstr "enlazado" + +#: build/trans_presets.java:2405 +#, fuzzy +msgid "minor_line" +msgstr "Acceso a autopista" + #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2408 msgid "Voltage" msgstr "Voltaje" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2398 -msgid "Amount of Wires" +#: build/trans_presets.java:2409 +#, fuzzy +msgid "Amount of Cables" msgstr "Número de cables" -#. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2401 +#. item "Man Made/Power Line" text "Amount of Cables" +#: build/trans_presets.java:2410 +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:2410 +#, fuzzy +msgid "single" +msgstr "Ángulo" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "double" +msgstr "Boule" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "triple" +msgstr "Escalera de paso" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "quad" +msgstr "cuáquero" + +#: build/trans_presets.java:2413 msgid "Amenities" msgstr "Servicios" #. group "Amenities" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2414 msgid "Toilets" msgstr "Baños" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2409 build/trans_presets.java:2525 +#: build/trans_presets.java:2421 build/trans_presets.java:2537 msgid "Note" msgstr "Nota" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2411 +#: build/trans_presets.java:2423 msgid "Post Box" msgstr "Buzón de correos" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2428 msgid "Telephone" msgstr "Teléfono" @@ -20436,5 +20647,5 @@ #. -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2431 msgid "Edit Telephone" msgstr "Editar teléfono" @@ -20442,5 +20653,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2422 build/trans_presets.java:2526 +#: build/trans_presets.java:2434 build/trans_presets.java:2538 msgid "Coins" msgstr "Monedas" @@ -20448,5 +20659,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2423 build/trans_presets.java:2527 +#: build/trans_presets.java:2435 build/trans_presets.java:2539 msgid "Notes" msgstr "Billetes" @@ -20454,5 +20665,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2424 build/trans_presets.java:2528 +#: build/trans_presets.java:2436 build/trans_presets.java:2540 msgid "Electronic purses and Charge cards" msgstr "Tarjetas de recarga y monederos electrónicos" @@ -20460,5 +20671,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2425 build/trans_presets.java:2529 +#: build/trans_presets.java:2437 build/trans_presets.java:2541 msgid "Debit cards" msgstr "Tarjetas de débito" @@ -20466,15 +20677,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2426 build/trans_presets.java:2530 +#: build/trans_presets.java:2438 build/trans_presets.java:2542 msgid "Credit cards" msgstr "Tarjetas de crédito" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2439 msgid "Telephone cards" msgstr "Tarjetas telefónicas" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2429 +#: build/trans_presets.java:2441 msgid "Recycling" msgstr "Reciclaje" @@ -20483,5 +20694,5 @@ #. -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2444 msgid "Edit Recycling station" msgstr "Editar punto limpio" @@ -20489,35 +20700,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2446 msgid "Batteries" msgstr "Baterías" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2435 +#: build/trans_presets.java:2447 msgid "Cans" msgstr "Envases" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2448 msgid "Clothes" msgstr "Ropas" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2437 +#: build/trans_presets.java:2449 msgid "Glass" msgstr "Vidrio" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2450 msgid "Paper" msgstr "Papel" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2451 msgid "Scrap Metal" msgstr "Chatarra" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2453 msgid "Bench" msgstr "Banco" @@ -20526,33 +20737,33 @@ #. #. -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2456 msgid "Backrest" -msgstr "" - -#: build/trans_presets.java:2445 +msgstr "Backrest" + +#: build/trans_presets.java:2457 msgid "Material" -msgstr "" +msgstr "Material" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "stone" -msgstr "" - -#: build/trans_presets.java:2445 +msgstr "piedra" + +#: build/trans_presets.java:2457 msgid "plastic" -msgstr "" - -#: build/trans_presets.java:2446 +msgstr "plástico" + +#: build/trans_presets.java:2458 msgid "Colour" -msgstr "" +msgstr "Color" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "black" -msgstr "" - -#: build/trans_presets.java:2446 +msgstr "negro" + +#: build/trans_presets.java:2458 msgid "brown" -msgstr "" +msgstr "marrón" #. color historic @@ -20621,5 +20832,5 @@ #. #. -#: build/trans_presets.java:2446 build/trans_style.java:3063 +#: build/trans_presets.java:2458 build/trans_style.java:3063 #: build/trans_style.java:3071 build/trans_style.java:3079 #: build/trans_style.java:3087 build/trans_style.java:3135 @@ -20629,27 +20840,27 @@ msgstr "zona verde" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "red" msgstr "red" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "blue" msgstr "azul" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "white" msgstr "blanco" -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2459 msgid "Amount of Seats" -msgstr "" +msgstr "Número de asientos" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2461 msgid "Hunting Stand" msgstr "Apostadero de caza" #. item -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2462 msgid "Edit Hunting Stand" msgstr "Editar apostadero de caza" @@ -20658,30 +20869,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2452 build/trans_presets.java:2914 +#: build/trans_presets.java:2464 build/trans_presets.java:2926 msgid "Height" msgstr "Altura" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "low" msgstr "profundidad" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "half" msgstr "media" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "full" msgstr "total" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2466 msgid "Hide" msgstr "Oculto" -#: build/trans_presets.java:2455 +#: build/trans_presets.java:2467 msgid "Lock" msgstr "Esclusa" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2469 msgid "Fountain" msgstr "Fuente" @@ -20690,10 +20901,10 @@ #. -#: build/trans_presets.java:2460 +#: build/trans_presets.java:2472 msgid "Edit Fountain" msgstr "Editar fuente" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2476 msgid "Drinking Water" msgstr "Agua potable" @@ -20702,10 +20913,10 @@ #. -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2479 msgid "Edit Drinking Water" msgstr "Editar agua potable" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2471 +#: build/trans_presets.java:2483 msgid "Baby Hatch" msgstr "Caja tibia" @@ -20713,33 +20924,33 @@ #. item #. -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2485 msgid "Edit Baby Hatch" msgstr "Editar caja tibia" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2491 msgid "Shops" msgstr "Tiendas" #. group "Shops" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2492 msgid "Supermarket" msgstr "Supermercado" #. item -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2493 msgid "Edit Supermarket" msgstr "Editar supermercado" -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2498 msgid "Chemist" msgstr "Farmacia" #. item -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2499 msgid "Edit Chemist" msgstr "Editar farmacia" -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2504 msgid "Convenience Store" msgstr "Tienda de alimentación" @@ -20747,9 +20958,9 @@ #. item #. -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2506 msgid "Edit Convenience Store" msgstr "Editar tienda de alimentación" -#: build/trans_presets.java:2499 +#: build/trans_presets.java:2511 msgid "Kiosk" msgstr "Kiosco" @@ -20757,27 +20968,27 @@ #. item #. -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2513 msgid "Edit Kiosk" msgstr "Editar kiosco" -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2518 msgid "Book Store" msgstr "Librería" #. item -#: build/trans_presets.java:2507 +#: build/trans_presets.java:2519 msgid "Edit Book Store" msgstr "Editar librería" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2524 msgid "Travel Agency" msgstr "Agencia de viajes" #. item -#: build/trans_presets.java:2513 +#: build/trans_presets.java:2525 msgid "Edit Travel Agency" msgstr "Editar agencia de viajes" -#: build/trans_presets.java:2518 +#: build/trans_presets.java:2530 msgid "Vending machine" msgstr "Máquina expendedora" @@ -20785,5 +20996,5 @@ #. item #. -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2532 msgid "Edit Vending machine" msgstr "Editar máquina expendedora" @@ -20791,88 +21002,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "Vending products" msgstr "Expendedor automático de productos" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_tickets" msgstr "billetes de de transporte público" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_plans" msgstr "abonos de transporte público" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "parking_tickets" msgstr "billetes de aparcamiento" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "food" msgstr "Alimentación" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "drinks" msgstr "Bebidas" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "sweets" msgstr "Caramelos" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "cigarettes" msgstr "Estanco" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "photos" msgstr "fotos" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "animal_food" msgstr "comida para animales" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "news_papers" msgstr "Periódicos" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "toys" msgstr "juguetes" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "stamps" msgstr "sellos" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "SIM-cards" msgstr "Tarjetas SIM" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "telephone_vouchers" msgstr "Tarjetas telefónicas" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "vouchers" msgstr "Bonos" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "condoms" msgstr "condones" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "tampons" msgstr "tampones" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "excrement_bags" msgstr "Bolsas para excrementos" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2543 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:2533 +#: build/trans_presets.java:2545 msgid "Butcher" msgstr "Carnicería" @@ -20880,9 +21091,9 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2547 msgid "Edit Butcher" msgstr "Editar carnicería" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2552 msgid "Baker" msgstr "Panadería" @@ -20890,9 +21101,9 @@ #. item #. -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2554 msgid "Edit Baker" msgstr "Editar panadería" -#: build/trans_presets.java:2547 +#: build/trans_presets.java:2559 msgid "Florist" msgstr "Floristería" @@ -20900,18 +21111,18 @@ #. item #. -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2561 msgid "Edit Florist" msgstr "Editar floristería" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2566 msgid "Organic" msgstr "Tienda de productos orgánicos" #. item -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2567 msgid "Edit Organic Shop" msgstr "Editar tienda de productos orgánicos" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2572 msgid "Alcohol" msgstr "Tienda de bebidas alcohólicas" @@ -20919,54 +21130,54 @@ #. item #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2574 msgid "Edit Alcohol Shop" msgstr "Editar tienda de bebidas alcohólicas" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2579 msgid "Beverages" msgstr "Bebidas" #. item -#: build/trans_presets.java:2568 +#: build/trans_presets.java:2580 msgid "Edit Beverages Shop" msgstr "Editar tienda de bebidas" -#: build/trans_presets.java:2573 +#: build/trans_presets.java:2585 msgid "Computer" msgstr "Tienda de informática" #. item -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2586 msgid "Edit Computer Shop" msgstr "Editar tienda de informática" -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2591 msgid "Electronics" msgstr "Electrónica" #. item -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2592 msgid "Edit Electronics Shop" msgstr "Editar tienda de electrónica" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2597 msgid "Hifi" msgstr "Hifi" #. item -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2598 msgid "Edit Hifi Shop" msgstr "Editar Tienda Hifi" -#: build/trans_presets.java:2591 +#: build/trans_presets.java:2603 msgid "Furniture" msgstr "Muebles" #. item -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2604 msgid "Edit Furniture Shop" msgstr "Editar mueblería" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2609 msgid "Garden Centre" msgstr "Centro de jardinería" @@ -20974,9 +21185,9 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2611 msgid "Edit Garden Centre" msgstr "Editar centro de jardinería" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2616 msgid "Hardware" msgstr "Hardware" @@ -20984,9 +21195,9 @@ #. item #. -#: build/trans_presets.java:2606 +#: build/trans_presets.java:2618 msgid "Edit Hardware Store" msgstr "Editar almacén de hardware" -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2623 msgid "Do-it-yourself-store" msgstr "Almacén de bricolaje" @@ -20994,54 +21205,54 @@ #. item #. -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2625 msgid "Edit Do-it-yourself-store" msgstr "Editar almacén de bricolaje" -#: build/trans_presets.java:2618 +#: build/trans_presets.java:2630 msgid "Stationery" msgstr "Papelería" #. item -#: build/trans_presets.java:2619 +#: build/trans_presets.java:2631 msgid "Edit Stationery Shop" msgstr "Editar papelería" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2636 msgid "Hairdresser" msgstr "Peluquería" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2637 msgid "Edit Hairdresser" msgstr "Editar peluquería" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2642 msgid "Shoes" msgstr "Zapatos" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2643 msgid "Edit Shoe Shop" msgstr "Editar zapatería" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2648 msgid "Toys" msgstr "Juguetes" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2649 msgid "Edit Toy Shop" msgstr "Editar juguetería" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2654 msgid "Video" msgstr "Video" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2655 msgid "Edit Video Shop" msgstr "Editar tienda de videos" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2660 msgid "Dry Cleaning" msgstr "Tintorería" @@ -21049,9 +21260,9 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2662 msgid "Edit Dry Cleaning" msgstr "Editar tintorería" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2667 msgid "Laundry" msgstr "Lavandería" @@ -21059,9 +21270,9 @@ #. item #. -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2669 msgid "Edit Laundry" msgstr "Editar lavandería" -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2674 msgid "Outdoor" msgstr "Tienda de actividades al aire libre" @@ -21069,28 +21280,28 @@ #. item #. -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2676 msgid "Edit Outdoor Shop" msgstr "Editar tienda de actividades al aire libre" #. item -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2682 msgid "Edit Sports Shop" msgstr "Editar tienda de material de deportes" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2687 msgid "Optician" msgstr "Óptica" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2688 msgid "Edit Optician" msgstr "Editar óptica" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2695 msgid "Cash" msgstr "Dinero en efectivo" #. group "Cash" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2696 msgid "Bank" msgstr "Banco" @@ -21098,14 +21309,14 @@ #. item #. -#: build/trans_presets.java:2686 +#: build/trans_presets.java:2698 msgid "Edit Bank" msgstr "Editar banco" -#: build/trans_presets.java:2691 build/trans_presets.java:2700 +#: build/trans_presets.java:2703 build/trans_presets.java:2712 msgid "Automated Teller Machine" msgstr "Cajero automático" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2705 msgid "Money Exchange" msgstr "Cambio de moneda" @@ -21113,5 +21324,5 @@ #. item #. -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2707 msgid "Edit Money Exchange" msgstr "Editar cambio de moneda" @@ -21119,15 +21330,15 @@ #. item #. -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2714 msgid "Edit Automated Teller Machine" msgstr "Editar cajero automático" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2719 msgid "Health" msgstr "Centro médico" #. group "Health" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2720 msgid "Doctors" msgstr "Médico" @@ -21135,18 +21346,18 @@ #. item #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2722 msgid "Edit Doctors" msgstr "Editar médico" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2727 msgid "Dentist" msgstr "Dentista" #. item -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2728 msgid "Edit Dentist" msgstr "Editar dentista" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2733 msgid "Pharmacy" msgstr "Farmacia/Parafarmacia" @@ -21154,5 +21365,5 @@ #. item #. -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2735 msgid "Edit Pharmacy" msgstr "Editar farmacia/parafarmacia" @@ -21160,9 +21371,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2737 msgid "Dispensing" msgstr "Expende con receta médica" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2741 msgid "Hospital" msgstr "Hospital" @@ -21170,10 +21381,10 @@ #. item #. -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2743 msgid "Edit Hospital" msgstr "Editar hospital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2747 msgid "Emergency Access Point" msgstr "Punto de acceso para emergencias" @@ -21182,5 +21393,5 @@ #. -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2750 msgid "Edit Emergency Access Point" msgstr "Editar punto de acceso para emergencias" @@ -21189,20 +21400,20 @@ #. #. -#: build/trans_presets.java:2741 +#: build/trans_presets.java:2753 msgid "Point Number" msgstr "Número de punto" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2742 +#: build/trans_presets.java:2754 msgid "Point Name" msgstr "Nombre del Punto" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2756 msgid "Phone Number" msgstr "Número de teléfono" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2757 msgid "(Use international code, like +12-345-67890)" msgstr "(Utilizar código internacional, como +12-345-67890)" @@ -21210,5 +21421,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2760 msgid "Veterinary" msgstr "Veterinario" @@ -21217,59 +21428,59 @@ #. -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2763 msgid "Edit Veterinary" msgstr "Editar veterinario" -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2770 msgid "Geography" msgstr "Geografía" #. group "Places" -#: build/trans_presets.java:2760 +#: build/trans_presets.java:2772 msgid "Continent" msgstr "Continente" #. item -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2773 msgid "Edit Continent" msgstr "Editar continente" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2766 +#: build/trans_presets.java:2778 msgid "Country" msgstr "País" #. item -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2779 msgid "Edit Country" msgstr "Editar país" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2784 msgid "State" msgstr "Estado/Provincia" #. item -#: build/trans_presets.java:2773 +#: build/trans_presets.java:2785 msgid "Edit State" msgstr "Editar estado/provincia" #. item "Places/State" text "Name" -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2790 msgid "Region" msgstr "Región" #. item -#: build/trans_presets.java:2779 +#: build/trans_presets.java:2791 msgid "Edit Region" msgstr "Editar región" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2796 msgid "County" msgstr "Municipio" #. item -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2797 msgid "Edit County" msgstr "Editar municipio" @@ -21277,15 +21488,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2803 msgid "City" msgstr "Ciudad (>100.000 hab.)" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2804 msgid "Edit City" msgstr "Editar ciudad (>100.00 hab.)" #. item "Places/City" text "Name" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2809 msgid "Town" msgstr "Ciudad (10.000 - 100.000 hab.)" @@ -21293,10 +21504,10 @@ #. item #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2811 msgid "Edit Town" msgstr "Editar ciudad (10.000 - 100.000 hab.)" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2804 +#: build/trans_presets.java:2816 msgid "Suburb" msgstr "" @@ -21306,5 +21517,5 @@ #. item #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2818 msgid "Edit Suburb" msgstr "" @@ -21313,15 +21524,15 @@ #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2823 msgid "Village" msgstr "Población (< 10.000 hab.)" #. item -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2824 msgid "Edit Village" msgstr "Editar población (< 10.000 hab.)" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2817 +#: build/trans_presets.java:2829 msgid "Hamlet" msgstr "" @@ -21329,5 +21540,5 @@ #. item -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2830 msgid "Edit Hamlet" msgstr "" @@ -21337,5 +21548,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2824 +#: build/trans_presets.java:2836 msgid "Locality" msgstr "Paraje" @@ -21343,10 +21554,10 @@ #. item #. -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2838 msgid "Edit Locality" msgstr "Editar paraje" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2843 msgid "Island" msgstr "Isla" @@ -21354,10 +21565,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2845 msgid "Edit Island" msgstr "Editar isla" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2838 +#: build/trans_presets.java:2850 msgid "Islet" msgstr "Islote" @@ -21365,5 +21576,5 @@ #. item #. -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2852 msgid "Edit Islet" msgstr "Editar islote" @@ -21371,5 +21582,5 @@ #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2858 msgid "Cave Entrance" msgstr "Entrada de cueva" @@ -21377,10 +21588,10 @@ #. item #. -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2860 msgid "Edit Cave Entrance" msgstr "Editar entrada de cueva" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2864 msgid "Peak" msgstr "Pico" @@ -21388,10 +21599,10 @@ #. item #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2866 msgid "Edit Peak" msgstr "Editar pico" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2871 msgid "Glacier" msgstr "Glaciar" @@ -21399,10 +21610,10 @@ #. item #. -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2873 msgid "Edit Glacier" msgstr "Editar glaciar" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2878 msgid "Volcano" msgstr "Volcán" @@ -21410,70 +21621,70 @@ #. item #. -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2880 msgid "Edit Volcano" msgstr "Editar volcán" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2886 msgid "Boundaries" msgstr "Fronteras" #. group "Boundaries" -#: build/trans_presets.java:2875 +#: build/trans_presets.java:2887 msgid "National" msgstr "Nacional" #. item -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2888 msgid "Edit National Boundary" msgstr "Editar frontera nacional" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2881 +#: build/trans_presets.java:2893 msgid "Administrative" msgstr "Administrativa" #. item -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2894 msgid "Edit Administrative Boundary" msgstr "Editar frontera administrativa" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2887 +#: build/trans_presets.java:2899 msgid "Civil" msgstr "Civil" #. item -#: build/trans_presets.java:2888 +#: build/trans_presets.java:2900 msgid "Edit Civil Boundary" msgstr "Editar frontera civil" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2893 +#: build/trans_presets.java:2905 msgid "Political" msgstr "Político" #. item -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2906 msgid "Edit Political Boundary" msgstr "Editar frontera política" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2911 msgid "National park" msgstr "Parque Nacional" #. item -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2912 msgid "Edit National Park Boundary" msgstr "Editar límites del parque nacional" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2918 msgid "Land use" msgstr "Uso del suelo" #. group "Land use" -#: build/trans_presets.java:2907 +#: build/trans_presets.java:2919 msgid "Tree" msgstr "Árbol" @@ -21482,15 +21693,15 @@ #. -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2922 msgid "Edit Tree" msgstr "Editar árbol" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2915 +#: build/trans_presets.java:2927 msgid "Botanical Name" msgstr "Nombre botánico" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2929 msgid "Wood" msgstr "Bosque" @@ -21499,5 +21710,5 @@ #. -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2932 msgid "Edit Wood" msgstr "Editar bosque" @@ -21505,17 +21716,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "coniferous" msgstr "conífera" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "deciduous" msgstr "caducifolio" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "mixed" msgstr "mixto" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2937 msgid "Forest" msgstr "Plantación forestal" @@ -21524,14 +21735,14 @@ #. -#: build/trans_presets.java:2928 +#: build/trans_presets.java:2940 msgid "Edit Forest Landuse" msgstr "Editar zona forestal" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2946 msgid "Nature Reserve" msgstr "Reserva natural" #. item -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2947 msgid "Edit Nature Reserve" msgstr "Editar reserva natural" @@ -21539,25 +21750,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2952 msgid "Scree" msgstr "Pedregal" #. item -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2953 msgid "Edit Scree" msgstr "Editar pedregal" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2957 msgid "Scrub" msgstr "Matorral" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:2958 msgid "Edit Scrub" msgstr "Editar matorral" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2962 msgid "Fell" msgstr "Braña" @@ -21565,10 +21776,10 @@ #. item #. -#: build/trans_presets.java:2952 +#: build/trans_presets.java:2964 msgid "Edit Fell" msgstr "Editar braña" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2968 msgid "Heath" msgstr "Brezal o landa" @@ -21576,5 +21787,5 @@ #. item #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2970 msgid "Edit Heath" msgstr "Editar brezal o landa" @@ -21582,5 +21793,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2975 msgid "Farmyard" msgstr "Edificio agrario" @@ -21589,45 +21800,45 @@ #. -#: build/trans_presets.java:2966 +#: build/trans_presets.java:2978 msgid "Edit Farmyard Landuse" msgstr "Editar edificio agrario" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2983 msgid "Farmland" msgstr "Tierra de labranza" #. item -#: build/trans_presets.java:2972 +#: build/trans_presets.java:2984 msgid "Edit Farmland Landuse" msgstr "Editar tierra de labranza" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2977 +#: build/trans_presets.java:2989 msgid "Meadow" msgstr "Prado" #. item -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2990 msgid "Edit Meadow Landuse" msgstr "Editar prado" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:2995 msgid "Vineyard" msgstr "Viñedo" #. item -#: build/trans_presets.java:2984 +#: build/trans_presets.java:2996 msgid "Edit Vineyard Landuse" msgstr "Editar viñedo" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3001 msgid "Allotments" msgstr "Huertos de ocio" #. item -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3002 msgid "Edit Allotments Landuse" msgstr "Editar zona de huertos de ocio" @@ -21635,25 +21846,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3008 msgid "Garden" msgstr "Jardín" #. item -#: build/trans_presets.java:2997 +#: build/trans_presets.java:3009 msgid "Edit Garden" msgstr "Editar jardín" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3013 msgid "Grass" msgstr "Pastizal" #. item -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3014 msgid "Edit Grass Landuse" msgstr "Editar pastizal" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3019 msgid "Village Green" msgstr "Parque municipal" @@ -21661,10 +21872,10 @@ #. item #. -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3021 msgid "Edit Village Green Landuse" msgstr "Editar parque municipal" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3026 msgid "Common" msgstr "Espacio de uso común (plazas, alamedas, bulevares, etc.)" @@ -21672,20 +21883,20 @@ #. item #. -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3028 msgid "Edit Common" msgstr "Editar espacio de uso común" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3032 msgid "Park" msgstr "Parque" #. item -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3033 msgid "Edit Park" msgstr "Editar parque" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3037 msgid "Recreation Ground" msgstr "Área de esparcimiento" @@ -21693,5 +21904,5 @@ #. item #. -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3039 msgid "Edit Recreation Ground Landuse" msgstr "Editar área de esparcimiento" @@ -21699,15 +21910,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3033 +#: build/trans_presets.java:3045 msgid "Residential area" msgstr "Área residencial" #. item -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3046 msgid "Edit Residential Landuse" msgstr "Editar suelo residencial" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3051 msgid "Graveyard" msgstr "Cementario" @@ -21715,9 +21926,9 @@ #. item #. -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3053 msgid "Edit Graveyard" msgstr "Editar cementerio" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3059 msgid "Cemetery" msgstr "Cementerio" @@ -21725,39 +21936,39 @@ #. item #. -#: build/trans_presets.java:3049 +#: build/trans_presets.java:3061 msgid "Edit Cemetery Landuse" msgstr "Editar cementerio" -#: build/trans_presets.java:3056 +#: build/trans_presets.java:3068 msgid "Retail" msgstr "Comercios" #. item -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3069 msgid "Edit Retail Landuse" msgstr "Editar comercios" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3062 +#: build/trans_presets.java:3074 msgid "Commercial" msgstr "Oficinas" #. item -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3075 msgid "Edit Commercial Landuse" msgstr "Editar oficinas" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3068 +#: build/trans_presets.java:3080 msgid "Industrial" msgstr "Industrial" #. item -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3081 msgid "Edit Industrial Landuse" msgstr "Editar suelo industrial" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3086 msgid "Railway land" msgstr "Zona ferroviaria" @@ -21765,15 +21976,15 @@ #. item #. -#: build/trans_presets.java:3076 +#: build/trans_presets.java:3088 msgid "Edit Railway Landuse" msgstr "Editar zona ferroviaria" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3081 +#: build/trans_presets.java:3093 msgid "Military" msgstr "Militar" #. item -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3094 msgid "Edit Military Landuse" msgstr "Editar área militar" @@ -21781,55 +21992,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3100 msgid "Construction area" msgstr "Zona en construcción" #. item -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3101 msgid "Edit Construction Landuse" msgstr "Editar zona en construcción" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3094 +#: build/trans_presets.java:3106 msgid "Brownfield" msgstr "Baldío" #. item -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3107 msgid "Edit Brownfield Landuse" msgstr "Editar terreno baldío" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3100 +#: build/trans_presets.java:3112 msgid "Greenfield" msgstr "Suelo en construcción" #. item -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3113 msgid "Edit Greenfield Landuse" msgstr "Editar suelo en contrucción" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3118 msgid "Landfill" msgstr "Vertedero" #. item -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3119 msgid "Edit Landfill Landuse" msgstr "Editar vertedero" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3124 msgid "Quarry" msgstr "Cantera" #. item -#: build/trans_presets.java:3113 +#: build/trans_presets.java:3125 msgid "Edit Quarry Landuse" msgstr "Editar cantera" #. group "Relations" -#: build/trans_presets.java:3122 +#: build/trans_presets.java:3134 msgid "Multipolygon" msgstr "Multipolígono" @@ -21839,5 +22050,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:3126 +#: build/trans_presets.java:3138 msgid "Edit Multipolygon" msgstr "Editar multipolígono" @@ -21846,10 +22057,10 @@ #. #. -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3144 msgid "outer segment" msgstr "segmento exterior" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3145 msgid "inner segment" msgstr "segmento interior" @@ -21857,5 +22068,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3148 msgid "Turn restriction" msgstr "Restricción de giro" @@ -21864,5 +22075,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3151 msgid "Edit Turn Restriction" msgstr "Editar restricción de giro" @@ -21870,34 +22081,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "Restriction" msgstr "Restricción" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_left_turn" msgstr "prohibido girar a la izquierda" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_right_turn" msgstr "prohibido girar a la derecha" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_straight_on" msgstr "prohibido continuar recto" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_u_turn" msgstr "prohibido giro en U" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_right_turn" msgstr "solo giro a la derecha" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_left_turn" msgstr "solo giro a la izquierda" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_straight_on" msgstr "solo recto" @@ -21906,15 +22117,15 @@ #. #. -#: build/trans_presets.java:3146 +#: build/trans_presets.java:3158 msgid "from way" msgstr "desde la vía" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3159 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:3148 +#: build/trans_presets.java:3160 msgid "to way" msgstr "a la vía" @@ -21922,5 +22133,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3151 +#: build/trans_presets.java:3163 msgid "Route" msgstr "Ruta" @@ -21929,5 +22140,5 @@ #. -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3166 msgid "Edit Route" msgstr "Editar ruta" @@ -21935,5 +22146,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "Route type" msgstr "Tipo de ruta" @@ -22005,5 +22216,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:233 +#: build/trans_presets.java:3168 build/trans_style.java:233 #: build/trans_style.java:683 build/trans_style.java:906 #: build/trans_style.java:914 build/trans_style.java:922 @@ -22012,17 +22223,17 @@ msgstr "bicicleta" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "road" msgstr "carretera" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ferry" msgstr "ferry" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ski" msgstr "ski" @@ -22075,5 +22286,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:247 +#: build/trans_presets.java:3168 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -22082,13 +22293,13 @@ msgstr "pie" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "hiking" msgstr "senderismo" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "tram" msgstr "tranvía" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "detour" msgstr "desvío" @@ -22102,10 +22313,10 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:1206 +#: build/trans_presets.java:3168 build/trans_style.java:1206 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3159 +#: build/trans_presets.java:3171 msgid "Symbol description" msgstr "Descripción del símbolo" @@ -22113,31 +22324,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3174 msgid "Network" msgstr "Red" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "Route state" msgstr "Ruta estatal" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "proposed" msgstr "Propuesto" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "alternate" msgstr "Suplente" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "temporary" msgstr "temporal" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "connection" msgstr "Conexión" -#: build/trans_presets.java:3165 +#: build/trans_presets.java:3177 msgid "Color (hex)" msgstr "Color (hex)" @@ -22146,30 +22357,30 @@ #. #. -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3180 msgid "route segment" msgstr "segmento de la ruta" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3181 msgid "forward segment" msgstr "segmento siguiente" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3170 +#: build/trans_presets.java:3182 msgid "backward segment" msgstr "segmento anterior" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3183 msgid "halt point" msgstr "punto de detención" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3172 +#: build/trans_presets.java:3184 msgid "forward halt point" msgstr "próximo punto de parada" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3173 +#: build/trans_presets.java:3185 msgid "backward halt point" msgstr "anterior punto de parada" @@ -26306,4 +26517,30 @@ msgid "Czech UHUL:ORTOFOTO" msgstr "" + +#~ msgid "Combine ways with different memberships?" +#~ msgstr "¿Combinar vías con diferentes relaciones?" + +#~ msgid "Combine Anyway" +#~ msgstr "Combinar de todos modos" + +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "" +#~ "Las vías seleccionadas tienen diferentes relaciones. ¿Aún quiere " +#~ "combinarlas?" + +#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +#~ msgstr "" +#~ "Error de cabecera \"{0}\" no coincide con el patrón esperado \"{1}\"" + +#~ msgid "Purging 1 primitive" +#~ msgstr "Purgando 1 primitiva" + +#~ msgid "removing reference from way {0}" +#~ msgstr "eliminando referencia de la vía {0}" + +#~ msgid "Empty member in relation." +#~ msgstr "Miembro vacío en la relación." #~ msgid "Move" @@ -26869,7 +27106,4 @@ #~ msgstr "Imagen con la ruta {0} no existe o no puede ser leida." -#~ msgid "linked" -#~ msgstr "enlazado" - #~ msgid "" #~ "The projection \"{0}\" is designed for\n" Index: /applications/editors/josm/i18n/po/et.po =================================================================== --- /applications/editors/josm/i18n/po/et.po (revision 17821) +++ /applications/editors/josm/i18n/po/et.po (revision 17822) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-22 17:52+0200\n" -"PO-Revision-Date: 2009-09-22 14:51+0000\n" +"POT-Creation-Date: 2009-09-28 16:38+0200\n" +"PO-Revision-Date: 2009-09-22 18:09+0000\n" "Last-Translator: lyyser \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: 2009-09-22 15:46+0000\n" +"X-Launchpad-Export-Date: 2009-09-28 14:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -66,8 +66,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250 @@ -90,9 +90,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -141,7 +141,7 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:172 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 @@ -154,5 +154,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 @@ -329,6 +328,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -338,6 +336,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 @@ -347,5 +345,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -356,5 +354,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180 @@ -363,5 +361,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -454,9 +452,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -488,10 +486,9 @@ msgstr "Palun vali vähemalt neli sõlme." -#. FIXME: not sure whether this fits in a dialog #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:85 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -601,5 +598,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 #, java-format msgid "File: {0}" @@ -621,37 +618,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine Way" msgstr "Sobita tee" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 msgid "Combine several ways into one." msgstr "Sobita mitu teed üheks." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 -msgid "Combine ways with different memberships?" -msgstr "Sobita erinevate kuuluvustega teed?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -msgid "Combine Anyway" -msgstr "Sobita ikkagi." - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" -"Valitud teedel on erinevad kuuluvusseosed. Kas Sa oled sobitamises kindel?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 msgid "Change directions?" msgstr "Muuda suundi?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Reverse and Combine" msgstr "Pööra ja sobita." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -661,5 +643,5 @@ "pöörata?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -667,10 +649,10 @@ msgstr "Ei saa teid ühendada. Ei saa liita üheks sõlmejadaks." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 #, java-format msgid "Combine {0} ways" msgstr "Ühenda {0} teed." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 msgid "Please select at least two ways to combine." msgstr "Palun vali vähemalt kaks teed, mida sobitada." @@ -715,6 +697,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -779,5 +760,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -808,5 +789,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307 #, java-format msgid "There were {0} conflicts during import." @@ -824,5 +804,4 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Duplicate" @@ -853,10 +832,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:209 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Ekspordi GPX-i..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:208 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Ekspordi andmed GPX faili." @@ -867,8 +846,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -933,5 +912,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 @@ -974,6 +953,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1061,22 +1039,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge Nodes" msgstr "Liida sõlmed." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 msgid "Merge nodes into the oldest one." msgstr "Liida sõlmed vanimaks." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 msgid "Please select at least two nodes to merge." msgstr "Palun vali vähemalt kaks sõlme mida liita." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "Ei saa sõlmi liita: tuleb kustutada tee, mis on endiselt kasutusel." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 #, java-format msgid "Merge {0} nodes" @@ -1148,5 +1126,4 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350 msgid "New" msgstr "Uus" @@ -1324,10 +1301,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Salvesta" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Salvesta praegused andmed" @@ -1384,10 +1361,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Salvesta nimega..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Salvesta need andmed uude faili." @@ -1429,5 +1406,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:961 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888 @@ -1673,14 +1650,14 @@ msgstr "Tühi valik" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 msgid "Upload to OSM..." msgstr "Lae OSMi serverisse" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload all changes to the OSM server." msgstr "Lae kõik muudatused OSM serverisse üles." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 #, java-format msgid "" @@ -1689,23 +1666,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Midagi pole üles laadida. Hangi esmalt andmeid." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:171 msgid "No changes to upload." msgstr "Pole muudatusi mida üles laadida." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223 #, java-format msgid "Synchronize {0} {1} only" msgstr "Sünkroniseeri ainult {0} {1}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 msgid "Synchronize entire dataset" msgstr "Sünkroniseeri kogu andmekogu" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:228 #, java-format msgid "" @@ -1719,17 +1696,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:283 msgid "Conflict detected" msgstr "Avastatud konflikt" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:257 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 #, java-format msgid "Unexpected return value. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:272 #, java-format msgid "" @@ -1740,5 +1717,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:306 #, java-format msgid "" @@ -1748,34 +1725,39 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 msgid "Changeset closed" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:425 #, java-format msgid "Uploading failed.
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:434 msgid "Upload to OSM API failed" msgstr "Laadimine OSM API-le ebaõnnestus" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457 msgid "Updating primitive" msgstr "Primitiivi uuendamine" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:514 #, java-format msgid "Uploading data for layer ''{0}''" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." msgstr "" @@ -1864,13 +1846,13 @@ msgstr "Aeglasemalt edasi" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34 msgid "Downloading GPS data" msgstr "GPS andmete allalaadimine" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57 msgid "Downloaded GPX Data" msgstr "Alla laetud GPX andmed" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87 msgid "Raw GPS data" msgstr "Toored GPS andmed" @@ -1884,4 +1866,8 @@ msgid "" "Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 +msgid "No data found in this area." msgstr "" @@ -2568,9 +2554,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 +#, java-format +msgid "" +"Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -2619,5 +2605,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Delete from relation" msgstr "" @@ -2667,14 +2653,15 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 -msgid "Purging 1 primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 -#, java-format -msgid "removing reference from way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 +#, fuzzy, java-format +msgid "Purged object ''{0}''" +msgstr "Liiguta objektid {0}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 +#, fuzzy, java-format +msgid "Purged {0} objects" +msgstr "Muuda {0} objekt" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 #, java-format msgid "" @@ -2683,12 +2670,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203 -#, java-format -msgid "removing reference from relation {0}" -msgstr "" +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 +#, fuzzy, java-format +msgid "Removing reference from relation {0}" +msgstr "Tõesti soovid kustutada valikut seosest {0}?" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 #, java-format msgid "Resolve conflicts in member list of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -3030,24 +3022,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Error: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Warning: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3055,5 +3047,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3079,6 +3071,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:244 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3134,120 +3126,113 @@ msgstr "" -#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed -#. TODO Remove useless nullcheck when RelationMember.member is encalupsed -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855 -msgid "Empty member in relation." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:850 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:861 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:607 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:613 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627 msgid "More than one \"via\" found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:632 +#, java-format +msgid "Unknown role ''{0}''." +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 #, java-format -msgid "Unknown role ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638 -#, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:641 msgid "No \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:649 msgid "No \"via\" node or way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:658 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:662 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693 -msgid "The \"from\" way doesn't start or end at the \"via\" way." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:870 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:882 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:940 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1029 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1041 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1094 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1120 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1324 msgid "untagged" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1325 msgid "text" msgstr "" @@ -3269,5 +3254,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:249 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 @@ -3278,5 +3263,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 @@ -3305,5 +3290,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:169 msgid "background" msgstr "taust" @@ -3395,5 +3380,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "railway" msgstr "" @@ -3449,9 +3434,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +msgid "Not Found" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 msgid "Unknown host" msgstr "Tundmatu host" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:247 msgid "Primitive already deleted" msgstr "Primitiiv on juba kustutatud" @@ -4756,5 +4745,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -4968,43 +4957,43 @@ msgstr "On liikmeks järgnevas" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 msgid "Add Properties" msgstr "Lisa seaded" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 msgid "Add a new key/value pair to all objects" msgstr "Lisa uus võtme/väärtuse paar kõikidele objektidele" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 msgid "Edit Properties" msgstr "Seadete muutmine" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 msgid "Edit the value of the selected key for all objects" msgstr "Muuda kõikide valitud objektide võtme väärtust" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Seaded: {0} / Liikmelisus: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 msgid "Properties / Memberships" msgstr "Seaded / Liikmelisus" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 msgid "Change relation" msgstr "Muuda seost" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Tõesti soovid kustutada valikut seosest {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:855 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 msgid "Delete the selected key in all objects" msgstr "Kustuta valitud võti kõkides objektides" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 msgid "Delete Properties" msgstr "Kustuda seadeid" @@ -5014,6 +5003,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168 -#: build/trans_presets.java:3121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 +#: build/trans_presets.java:3133 msgid "Relations" msgstr "Seosed" @@ -5023,25 +5012,30 @@ msgstr "Ava kõikide seoste nimekiri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:174 #, java-format msgid "Relations: {0}" msgstr "Seosed: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 msgid "Open an editor for the selected relation" msgstr "Ava toimetajas valitud seos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:325 msgid "Delete the selected relation" msgstr "Kustuta valitud seos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:363 msgid "Create a new relation" msgstr "Loo uus seos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:400 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280 msgid "Create a copy of this relation and open it in another editor window" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 +#, fuzzy +msgid "Set the current selection to the list of selected relations" +msgstr "Valik ei ole lahutamiseks sobiv." #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5082,9 +5076,9 @@ msgstr "Valik: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 msgid "Undock the panel" msgstr "Lase paneel vabaks" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5092,5 +5086,5 @@ "Sulge see paneel. Te saate selle uuesti avada nupust vasakul tööriistaribal." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 msgid "Click to minimize/maximize the panel content" msgstr "Vajuta et minimeerida/maksimeerida paneeli sisu" @@ -5599,5 +5593,5 @@ #. group "Geography" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2771 msgid "Places" msgstr "Asukohad" @@ -6271,6 +6265,4 @@ #. item "Man Made/Windmill" label "Edit Windmill" #. -#. item "Man Made/Pipeline" label "Edit Pipeline" -#. #. item "Man Made/Wastewater Plant" label "Edit Wastewater Plant" #. @@ -6283,4 +6275,6 @@ #. item "Man Made/Surveillance" label "Edit Surveillance Camera" #. +#. item "Man Made/Power Station" label "Edit Power Station" +#. #. item "Amenities/Fountain" label "Edit Fountain" #. @@ -6605,57 +6599,57 @@ #: build/trans_presets.java:2250 build/trans_presets.java:2258 #: build/trans_presets.java:2290 build/trans_presets.java:2295 -#: build/trans_presets.java:2300 build/trans_presets.java:2305 -#: build/trans_presets.java:2311 build/trans_presets.java:2317 -#: build/trans_presets.java:2323 build/trans_presets.java:2331 -#: build/trans_presets.java:2337 build/trans_presets.java:2343 -#: build/trans_presets.java:2349 build/trans_presets.java:2355 -#: build/trans_presets.java:2365 build/trans_presets.java:2462 -#: build/trans_presets.java:2469 build/trans_presets.java:2483 -#: build/trans_presets.java:2489 build/trans_presets.java:2496 -#: build/trans_presets.java:2503 build/trans_presets.java:2509 -#: build/trans_presets.java:2515 build/trans_presets.java:2537 -#: build/trans_presets.java:2544 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2305 build/trans_presets.java:2310 +#: build/trans_presets.java:2316 build/trans_presets.java:2322 +#: build/trans_presets.java:2339 build/trans_presets.java:2345 +#: build/trans_presets.java:2351 build/trans_presets.java:2357 +#: build/trans_presets.java:2363 build/trans_presets.java:2373 +#: build/trans_presets.java:2380 build/trans_presets.java:2474 +#: build/trans_presets.java:2481 build/trans_presets.java:2495 +#: build/trans_presets.java:2501 build/trans_presets.java:2508 +#: build/trans_presets.java:2515 build/trans_presets.java:2521 +#: build/trans_presets.java:2527 build/trans_presets.java:2549 +#: build/trans_presets.java:2556 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2576 #: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2594 build/trans_presets.java:2601 -#: build/trans_presets.java:2608 build/trans_presets.java:2615 -#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2594 build/trans_presets.java:2600 +#: build/trans_presets.java:2606 build/trans_presets.java:2613 +#: build/trans_presets.java:2620 build/trans_presets.java:2627 #: build/trans_presets.java:2633 build/trans_presets.java:2639 -#: build/trans_presets.java:2645 build/trans_presets.java:2652 -#: build/trans_presets.java:2659 build/trans_presets.java:2666 -#: build/trans_presets.java:2672 build/trans_presets.java:2678 -#: build/trans_presets.java:2688 build/trans_presets.java:2697 -#: build/trans_presets.java:2712 build/trans_presets.java:2718 -#: build/trans_presets.java:2726 build/trans_presets.java:2733 -#: build/trans_presets.java:2753 build/trans_presets.java:2764 -#: build/trans_presets.java:2770 build/trans_presets.java:2776 +#: build/trans_presets.java:2645 build/trans_presets.java:2651 +#: build/trans_presets.java:2657 build/trans_presets.java:2664 +#: build/trans_presets.java:2671 build/trans_presets.java:2678 +#: build/trans_presets.java:2684 build/trans_presets.java:2690 +#: build/trans_presets.java:2700 build/trans_presets.java:2709 +#: build/trans_presets.java:2724 build/trans_presets.java:2730 +#: build/trans_presets.java:2738 build/trans_presets.java:2745 +#: build/trans_presets.java:2765 build/trans_presets.java:2776 #: build/trans_presets.java:2782 build/trans_presets.java:2788 -#: build/trans_presets.java:2795 build/trans_presets.java:2802 -#: build/trans_presets.java:2809 build/trans_presets.java:2815 -#: build/trans_presets.java:2821 build/trans_presets.java:2829 -#: build/trans_presets.java:2836 build/trans_presets.java:2843 -#: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2879 build/trans_presets.java:2885 +#: build/trans_presets.java:2794 build/trans_presets.java:2800 +#: build/trans_presets.java:2807 build/trans_presets.java:2814 +#: build/trans_presets.java:2821 build/trans_presets.java:2827 +#: build/trans_presets.java:2833 build/trans_presets.java:2841 +#: build/trans_presets.java:2848 build/trans_presets.java:2855 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2875 build/trans_presets.java:2882 #: build/trans_presets.java:2891 build/trans_presets.java:2897 -#: build/trans_presets.java:2903 build/trans_presets.java:2912 -#: build/trans_presets.java:2922 build/trans_presets.java:2931 -#: build/trans_presets.java:2937 build/trans_presets.java:2943 -#: build/trans_presets.java:2948 build/trans_presets.java:2954 -#: build/trans_presets.java:2960 build/trans_presets.java:2969 -#: build/trans_presets.java:2975 build/trans_presets.java:2981 +#: build/trans_presets.java:2903 build/trans_presets.java:2909 +#: build/trans_presets.java:2915 build/trans_presets.java:2924 +#: build/trans_presets.java:2934 build/trans_presets.java:2943 +#: build/trans_presets.java:2949 build/trans_presets.java:2955 +#: build/trans_presets.java:2960 build/trans_presets.java:2966 +#: build/trans_presets.java:2972 build/trans_presets.java:2981 #: build/trans_presets.java:2987 build/trans_presets.java:2993 #: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3012 build/trans_presets.java:3018 -#: build/trans_presets.java:3023 build/trans_presets.java:3030 -#: build/trans_presets.java:3037 build/trans_presets.java:3043 -#: build/trans_presets.java:3052 build/trans_presets.java:3060 -#: build/trans_presets.java:3066 build/trans_presets.java:3072 -#: build/trans_presets.java:3079 build/trans_presets.java:3085 -#: build/trans_presets.java:3092 build/trans_presets.java:3098 +#: build/trans_presets.java:3011 build/trans_presets.java:3017 +#: build/trans_presets.java:3024 build/trans_presets.java:3030 +#: build/trans_presets.java:3035 build/trans_presets.java:3042 +#: build/trans_presets.java:3049 build/trans_presets.java:3055 +#: build/trans_presets.java:3064 build/trans_presets.java:3072 +#: build/trans_presets.java:3078 build/trans_presets.java:3084 +#: build/trans_presets.java:3091 build/trans_presets.java:3097 #: build/trans_presets.java:3104 build/trans_presets.java:3110 -#: build/trans_presets.java:3116 build/trans_presets.java:3129 -#: build/trans_presets.java:3143 build/trans_presets.java:3157 +#: build/trans_presets.java:3116 build/trans_presets.java:3122 +#: build/trans_presets.java:3128 build/trans_presets.java:3141 +#: build/trans_presets.java:3155 build/trans_presets.java:3169 msgid "Name" msgstr "Nimi" @@ -6718,5 +6712,4 @@ msgstr "" -#. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 msgid "Close the selected open changesets" @@ -6744,25 +6737,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "Yes" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "No" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47 #, java-format msgid "Layer ''{0}'' has modifications which should be uploaded to the server." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49 #, java-format msgid "Layer ''{0}'' has no modifications to be uploaded." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60 #, java-format msgid "" @@ -6771,29 +6764,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62 #, java-format msgid "Layer ''{0}'' has no modifications to be saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80 msgid "No file associated with this layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:83 msgid "Please select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:86 #, java-format msgid "Layer ''{0}'' is not backed by a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:101 #, java-format msgid "File ''{0}'' is not writable. Please enter another file name." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:115 #, java-format msgid "Select to upload layer ''{0}'' to the server ''{1}''" @@ -6886,5 +6879,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -msgid "Save and Exit" +#, fuzzy +msgid "Save/Upload and Exit" msgstr "Salvesta ja välju" @@ -6894,5 +6888,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -msgid "Save and Delete" +msgid "Save/Upload and Delete" msgstr "" @@ -6909,5 +6903,5 @@ msgid "" "An upload and/or save operation of one layer with modifications
was " -"cancelled or has been failed." +"cancelled or has failed." msgstr "" @@ -6993,6 +6987,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:891 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:921 msgid "Tags of new changeset" msgstr "" @@ -7091,7 +7085,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:909 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:933 #, java-format msgid "Tags of changeset {0}" @@ -7099,48 +7092,48 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:949 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:963 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1011 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106 msgid "Preparing primitives to upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325 msgid "No images with readable timestamps found." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format @@ -7148,29 +7141,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:402 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246 msgid "Geotagged Images" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:587 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "GPS start: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 #, java-format msgid "GPS end: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594 #, java-format msgid "current delta: {0}s" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595 msgid "timezone difference: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284 msgid "image" @@ -7179,14 +7172,14 @@ msgstr[1] "pildid" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #, java-format msgid "{0} within the track." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680 msgid "Sync clock" msgstr "Sünkroniseeri kell" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7194,32 +7187,32 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:734 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 msgid "Image" msgstr "Pilt" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:752 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759 msgid "GPS unit timezone (difference to photo)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:767 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771 msgid "Synchronize Time with GPS Unit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:790 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 msgid "Time entered could not be parsed." msgstr "" @@ -7303,5 +7296,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 #, java-format msgid "Name: {0}" @@ -7324,5 +7317,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3160 +#: build/trans_presets.java:3172 msgid "Description" msgstr "" @@ -7378,5 +7371,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:587 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 @@ -7437,42 +7430,65 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:105 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:107 #, java-format msgid "Data Layer {0}" msgstr "Andmekiht {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 msgid "outside downloaded area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:252 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:289 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:290 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 +#, fuzzy, java-format +msgid "There was {0} conflict detected." +msgid_plural "There were {0} conflicts detected." +msgstr[0] "Impordi ajal leidis aset {0} konflikti." +msgstr[1] "Impordi ajal leidis aset {0} konflikti." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 +#, java-format +msgid "" +"{0} object has been purged from the local dataset because it is deleted on " +"the server." +msgid_plural "" +"{0} objects have been purged from the local dataset because they are deleted " +"on the server." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 +#, fuzzy +msgid "Conflicts detected" +msgstr "Avastatud konflikt" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 #, java-format msgid "{0} consists of:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:476 #, java-format msgid " ({0} deleted.)" msgstr " ({0} kustutatud.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:501 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:584 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" @@ -7820,5 +7836,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:412 #: ../plugins/terracer/src/terracer/TerracerAction.java:430 @@ -8546,5 +8562,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261 msgid "More information about this feature" msgstr "Rohkem teavet sellest funktsioonist" @@ -8593,5 +8609,5 @@ msgstr "Elemente tüübist {0} toetatakse." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:700 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -8601,18 +8617,18 @@ msgstr[1] "Muuda {0} objekti" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Midagi pole valitud!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788 msgid "Change Properties" msgstr "Muuda seadeid" @@ -8896,44 +8912,44 @@ msgstr "Sulgen muutustekogumit..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 msgid "Preparing..." msgstr "Ettevalmistus..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 msgid "Uploading..." msgstr "Üleslaadimine..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9162,5 +9178,5 @@ msgid "" "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}''," -"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." +"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." msgstr "" @@ -9277,6 +9293,6 @@ #, java-format msgid "" -"Relation with external id ''{0}'' refers to missing primitive with external " -"id ''{1}''." +"Relation with external id ''{0}'' refers to a missing primitive with " +"external id ''{1}''." msgstr "" @@ -9371,32 +9387,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:73 msgid "Starting to upload with one request per primitive ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Starting to upload in one request ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 +#, fuzzy, java-format +msgid "Parameter ''{0}'' must not be null" +msgstr "parameeter ''{0}'' ei tohi olla null" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 msgid "Uploading data ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 msgid "" "WARNING: no API version defined for data to upload. Falling back to version " @@ -9404,5 +9425,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:153 #, java-format msgid "" @@ -9620,5 +9641,5 @@ #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:202 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:324 build/trans_presets.java:325 @@ -9640,6 +9661,6 @@ #: build/trans_presets.java:789 build/trans_presets.java:1333 #: build/trans_presets.java:1400 build/trans_presets.java:1401 -#: build/trans_presets.java:1402 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 +#: build/trans_presets.java:1402 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 msgid "unknown" msgstr "tundmatu" @@ -9780,5 +9801,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:192 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:182 +#, java-format +msgid "" +"The OSM server ''{0}'' doesn't know about an object
you tried to read, " +"update, or delete. Either the respective object
doesn''t exist on the " +"server or you''re using an invalid URL to access
it. Please carefully " +"check the servers address ''{1}'' for typos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:209 #, java-format msgid "" @@ -9788,5 +9818,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:262 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:279 #, java-format msgid "" @@ -10045,17 +10075,15 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35 msgid "Define Address Interpolation" msgstr "" -#. Whether to re-trigger data changed for relation #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:413 #: ../plugins/terracer/src/terracer/TerracerAction.java:437 @@ -10063,99 +10091,99 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 msgid "Alphabetic" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161 #, java-format msgid "Relation: {0}" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173 msgid "Associate with street using:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184 msgid "Numbering Scheme:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 msgid "Starting #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188 msgid "Ending #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 #, java-format msgid "Will associate {0} additional house number nodes" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 msgid "Starting address number must be less than ending address number" msgstr "" @@ -10881,4 +10909,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52 +#: build/trans_presets.java:2331 msgid "Location" msgstr "" @@ -11418,4 +11447,5 @@ msgstr "" +#. item "Man Made/Pipeline" combo "Type" #. color highway_track #. @@ -11461,7 +11491,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:990 build/trans_style.java:1007 -#: build/trans_style.java:1023 build/trans_style.java:3400 -#: build/trans_style.java:3408 +#: build/trans_presets.java:2330 build/trans_style.java:990 +#: build/trans_style.java:1007 build/trans_style.java:1023 +#: build/trans_style.java:3400 build/trans_style.java:3408 msgid "water" msgstr "" @@ -13986,9 +14016,11 @@ #. item "Public Transport/Airport" text "Name" #. +#. item "Man Made/Power Station" text "Operator" #. item "Relations/Route" text "Name" #: build/trans_presets.java:65 build/trans_presets.java:101 #: build/trans_presets.java:121 build/trans_presets.java:141 #: build/trans_presets.java:178 build/trans_presets.java:198 -#: build/trans_presets.java:1560 build/trans_presets.java:3158 +#: build/trans_presets.java:1560 build/trans_presets.java:2382 +#: build/trans_presets.java:3170 msgid "Reference" msgstr "" @@ -14550,5 +14582,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 msgid "metal" msgstr "" @@ -14568,5 +14600,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 #: build/trans_style.java:3375 msgid "wood" @@ -14855,7 +14887,7 @@ #: build/trans_presets.java:1401 build/trans_presets.java:1402 #: build/trans_presets.java:1767 build/trans_presets.java:1777 -#: build/trans_presets.java:2408 build/trans_presets.java:2444 -#: build/trans_presets.java:2453 build/trans_presets.java:2454 -#: build/trans_presets.java:2455 build/trans_presets.java:2725 +#: build/trans_presets.java:2420 build/trans_presets.java:2456 +#: build/trans_presets.java:2465 build/trans_presets.java:2466 +#: build/trans_presets.java:2467 build/trans_presets.java:2737 msgid "yes" msgstr "" @@ -15004,8 +15036,8 @@ #: build/trans_presets.java:1400 build/trans_presets.java:1401 #: build/trans_presets.java:1402 build/trans_presets.java:1767 -#: build/trans_presets.java:1777 build/trans_presets.java:2408 -#: build/trans_presets.java:2444 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 -#: build/trans_presets.java:2725 +#: build/trans_presets.java:1777 build/trans_presets.java:2420 +#: build/trans_presets.java:2456 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 +#: build/trans_presets.java:2737 msgid "no" msgstr "" @@ -15143,6 +15175,8 @@ #. item "Water/Wetland" text "Name" #. item "Car/Parking" text "Reference number" +#. item "Man Made/Pipeline" text "Operator" #. item "Man Made/Power Generator" label "Edit Power Generator" #. +#. item "Man Made/Power Tower" label "Edit Power Tower" #. item "Land use/Tree" text "Name" #. item "Land use/Wood" text "Name" @@ -15150,7 +15184,8 @@ #: build/trans_presets.java:350 build/trans_presets.java:649 #: build/trans_presets.java:789 build/trans_presets.java:1137 -#: build/trans_presets.java:1395 build/trans_presets.java:2364 -#: build/trans_presets.java:2913 build/trans_presets.java:2923 -#: build/trans_presets.java:2932 +#: build/trans_presets.java:1395 build/trans_presets.java:2330 +#: build/trans_presets.java:2372 build/trans_presets.java:2398 +#: build/trans_presets.java:2925 build/trans_presets.java:2935 +#: build/trans_presets.java:2944 msgid "Type" msgstr "" @@ -15700,10 +15735,10 @@ #. item "Tourism/Information Terminal" text "Closer description" #. item "Tourism/Audioguide" text "Closer description" -#. item "Man Made/Power Station" label "Edit Power Station" -#. +#. item "Man Made/Tower" text "Height (meters)" +#. item "Man Made/Pipeline" label "Edit Pipeline" +#. +#. item "Man Made/Power Station" text "Name" #. item "Man Made/Power Sub Station" label "Edit Power Sub Station" #. -#. item "Man Made/Power Line" label "Edit Power Line" -#. #. item #. #: build/trans_presets.java:1535 build/trans_presets.java:1789 -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2465 msgid "Shelter" msgstr "" @@ -18061,5 +18098,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1877 build/trans_presets.java:2669 +#: build/trans_presets.java:1877 build/trans_presets.java:2681 msgid "Sports" msgstr "Sport" @@ -19412,6 +19449,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "Religion" msgstr "Religioon" @@ -19420,66 +19457,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "bahai" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "buddhist" msgstr "budist" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "christian" msgstr "kristlane" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "hindu" msgstr "hindu" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jain" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jewish" msgstr "juudi" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "muslim" msgstr "moslem" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "spiritualist" msgstr "spiritualist" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "taoist" msgstr "taoist" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "zoroastrian" msgstr "zoroastrism (pärsia)" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "Denomination" msgstr "Usutunnistus" @@ -19488,76 +19525,76 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "anglican" msgstr "anglikaan" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "baptist" msgstr "baptist" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "catholic" msgstr "katoliku" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "evangelical" msgstr "evangeelne" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "jehovahs_witness" msgstr "jehoovatunnistajad" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "lutheran" msgstr "luterlane" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "methodist" msgstr "metodist" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "mormon" msgstr "mormoon" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "orthodox" msgstr "ortodoksne" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "pentecostal" msgstr "nelipühalane" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "presbyterian" msgstr "presbüterlane" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "protestant" msgstr "protestantlik" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "quaker" msgstr "kveeker" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "shia" msgstr "šiia" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "sunni" msgstr "" @@ -19653,25 +19690,48 @@ #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2296 +#, fuzzy +msgid "Tower type" +msgstr "teekonna tüüp" + +#. item "Man Made/Tower" combo "Tower type" +#: build/trans_presets.java:2296 +#, fuzzy +msgid "communication" +msgstr "ühendus" + +#: build/trans_presets.java:2296 +#, fuzzy +msgid "observation" +msgstr "Elektrijaam" + +#. +#: build/trans_presets.java:2298 +msgid "Height (meters)" +msgstr "" + +#. item "Man Made/Tower" text "Operator" +#. +#: build/trans_presets.java:2302 msgid "Water Tower" msgstr "Veetorn" #. item -#: build/trans_presets.java:2298 +#: build/trans_presets.java:2303 msgid "Edit Water Tower" msgstr "Vali veetorn" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2307 msgid "Gasometer" msgstr "Gaasimahuti" #. item -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2308 msgid "Edit Gasometer" msgstr "Vali gaasimahuti" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2307 +#: build/trans_presets.java:2312 msgid "Lighthouse" msgstr "Majakas" @@ -19679,10 +19739,10 @@ #. item #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2314 msgid "Edit Lighthouse" msgstr "Vali majakas" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2318 msgid "Windmill" msgstr "Tuuleveski" @@ -19690,21 +19750,53 @@ #. item #. -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2320 msgid "Edit Windmill" msgstr "Vali tuuleveski" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2319 +#: build/trans_presets.java:2324 msgid "Pipeline" msgstr "Torustik" #. item -#. -#: build/trans_presets.java:2321 +#. +#: build/trans_presets.java:2327 msgid "Edit Pipeline" msgstr "Vali torustik" -#. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2330 +#, fuzzy +msgid "oil" +msgstr "fosiil" + +#: build/trans_presets.java:2330 build/trans_presets.java:2372 +msgid "gas" +msgstr "gaas" + +#: build/trans_presets.java:2330 +msgid "sewage" +msgstr "" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "heat" +msgstr "nõmm" + +#: build/trans_presets.java:2330 +msgid "any substance" +msgstr "" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "underwater" +msgstr "Lasteaed" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "overground" +msgstr "taust" + +#: build/trans_presets.java:2333 msgid "Wastewater Plant" msgstr "" @@ -19714,10 +19806,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:2329 +#: build/trans_presets.java:2337 msgid "Edit Wastewater Plant" msgstr "" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2333 +#: build/trans_presets.java:2341 msgid "Crane" msgstr "Kraana" @@ -19725,10 +19817,10 @@ #. item #. -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2343 msgid "Edit Crane" msgstr "Vali kraana" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2347 msgid "Beacon" msgstr "Tuletorn" @@ -19736,10 +19828,10 @@ #. item #. -#: build/trans_presets.java:2341 +#: build/trans_presets.java:2349 msgid "Edit Beacon" msgstr "Vali tuletorn" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2353 msgid "Survey Point" msgstr "Geodeetiline punkt" @@ -19747,10 +19839,10 @@ #. item #. -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2355 msgid "Edit Survey Point" msgstr "Vali ülevaatlus punkt" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2359 msgid "Surveillance" msgstr "järelvalve" @@ -19758,5 +19850,5 @@ #. item #. -#: build/trans_presets.java:2353 +#: build/trans_presets.java:2361 msgid "Edit Surveillance Camera" msgstr "Vali järelvalve kaamera" @@ -19764,5 +19856,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2366 msgid "Power Generator" msgstr "Elektri generaator" @@ -19772,39 +19864,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:2362 +#: build/trans_presets.java:2370 msgid "Edit Power Generator" msgstr "Vali elektri generaator" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "wind" msgstr "tuul" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "hydro" msgstr "hüdro" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "fossil" msgstr "fosiil" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "nuclear" msgstr "tuuma" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "coal" msgstr "süsi" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "photovoltaic" msgstr "" -#: build/trans_presets.java:2364 -msgid "gas" -msgstr "gaas" - #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2375 msgid "Power Station" msgstr "Elektrijaam" @@ -19813,10 +19901,10 @@ #. -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2378 msgid "Edit Power Station" msgstr "Vali elektrijaam" -#. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2374 +#. item "Man Made/Power Station" text "Reference" +#: build/trans_presets.java:2384 msgid "Power Sub Station" msgstr "Elektrialajaam" @@ -19825,5 +19913,5 @@ #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2387 msgid "Edit Power Sub Station" msgstr "Vali elektri alajaam" @@ -19831,10 +19919,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2380 build/trans_presets.java:2396 +#: build/trans_presets.java:2390 build/trans_presets.java:2407 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2382 +#: build/trans_presets.java:2392 msgid "Power Tower" msgstr "" @@ -19845,11 +19933,26 @@ #. 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:2387 +#: build/trans_presets.java:2397 msgid "Edit Power Tower" msgstr "" -#. item "Man Made/Power Tower" label "Edit Power Tower" -#. -#: build/trans_presets.java:2390 +#. item "Man Made/Power Tower" combo "Type" +#: build/trans_presets.java:2398 +#, fuzzy +msgid "tower" +msgstr "Torn" + +#: build/trans_presets.java:2398 +#, fuzzy +msgid "pole" +msgstr "Roll" + +#: build/trans_presets.java:2399 +#, fuzzy +msgid "Tower reference" +msgstr "Eelistused" + +#. item "Man Made/Power Tower" text "Tower reference" +#: build/trans_presets.java:2401 msgid "Power Line" msgstr "" @@ -19858,40 +19961,81 @@ #. -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2404 msgid "Edit Power Line" msgstr "" +#. item "Man Made/Power Line" label "Edit Power Line" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "Line type" +msgstr "teekonna tüüp" + +#. item "Man Made/Power Line" combo "Line type" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "line" +msgstr "Torustik" + +#: build/trans_presets.java:2405 +msgid "minor_line" +msgstr "" + #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2408 msgid "Voltage" msgstr "Pinge" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2398 -msgid "Amount of Wires" -msgstr "" - -#. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2409 +msgid "Amount of Cables" +msgstr "" + +#. item "Man Made/Power Line" text "Amount of Cables" +#: build/trans_presets.java:2410 +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:2410 +#, fuzzy +msgid "single" +msgstr "tekst" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "double" +msgstr "Roll" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "triple" +msgstr "Fail" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "quad" +msgstr "kveeker" + +#: build/trans_presets.java:2413 msgid "Amenities" msgstr "Teenused" #. group "Amenities" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2414 msgid "Toilets" msgstr "Tualetid" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2409 build/trans_presets.java:2525 +#: build/trans_presets.java:2421 build/trans_presets.java:2537 msgid "Note" msgstr "Märkus" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2411 +#: build/trans_presets.java:2423 msgid "Post Box" msgstr "" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2428 msgid "Telephone" msgstr "Telefon" @@ -19900,5 +20044,5 @@ #. -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2431 msgid "Edit Telephone" msgstr "" @@ -19906,5 +20050,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2422 build/trans_presets.java:2526 +#: build/trans_presets.java:2434 build/trans_presets.java:2538 msgid "Coins" msgstr "Mündid" @@ -19912,5 +20056,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2423 build/trans_presets.java:2527 +#: build/trans_presets.java:2435 build/trans_presets.java:2539 msgid "Notes" msgstr "Märkused" @@ -19918,5 +20062,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2424 build/trans_presets.java:2528 +#: build/trans_presets.java:2436 build/trans_presets.java:2540 msgid "Electronic purses and Charge cards" msgstr "" @@ -19924,5 +20068,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2425 build/trans_presets.java:2529 +#: build/trans_presets.java:2437 build/trans_presets.java:2541 msgid "Debit cards" msgstr "Deebetkaart" @@ -19930,15 +20074,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2426 build/trans_presets.java:2530 +#: build/trans_presets.java:2438 build/trans_presets.java:2542 msgid "Credit cards" msgstr "Krediitkaart" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2439 msgid "Telephone cards" msgstr "Telefoni kaart" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2429 +#: build/trans_presets.java:2441 msgid "Recycling" msgstr "Jäätmekäitlus" @@ -19947,5 +20091,5 @@ #. -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2444 msgid "Edit Recycling station" msgstr "Muuda jäätmekäitlusjaam" @@ -19953,35 +20097,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2446 msgid "Batteries" msgstr "Battareid" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2435 +#: build/trans_presets.java:2447 msgid "Cans" msgstr "" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2448 msgid "Clothes" msgstr "Riided" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2437 +#: build/trans_presets.java:2449 msgid "Glass" msgstr "Klaas" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2450 msgid "Paper" msgstr "Paber" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2451 msgid "Scrap Metal" msgstr "Vanaraud" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2453 msgid "Bench" msgstr "" @@ -19990,31 +20134,31 @@ #. #. -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2456 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "stone" msgstr "" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "plastic" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "black" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "brown" msgstr "" @@ -20085,5 +20229,5 @@ #. #. -#: build/trans_presets.java:2446 build/trans_style.java:3063 +#: build/trans_presets.java:2458 build/trans_style.java:3063 #: build/trans_style.java:3071 build/trans_style.java:3079 #: build/trans_style.java:3087 build/trans_style.java:3135 @@ -20093,27 +20237,27 @@ msgstr "roheala" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "red" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "blue" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "white" msgstr "" -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2459 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2461 msgid "Hunting Stand" msgstr "Jahikantsel" #. item -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2462 msgid "Edit Hunting Stand" msgstr "Muuda jahiala" @@ -20122,30 +20266,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2452 build/trans_presets.java:2914 +#: build/trans_presets.java:2464 build/trans_presets.java:2926 msgid "Height" msgstr "Kõrgus" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "low" msgstr "madal" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "half" msgstr "pool" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "full" msgstr "täis" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2466 msgid "Hide" msgstr "Peida" -#: build/trans_presets.java:2455 +#: build/trans_presets.java:2467 msgid "Lock" msgstr "Lukusta" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2469 msgid "Fountain" msgstr "Purskaev" @@ -20154,10 +20298,10 @@ #. -#: build/trans_presets.java:2460 +#: build/trans_presets.java:2472 msgid "Edit Fountain" msgstr "Vali purskaev" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2476 msgid "Drinking Water" msgstr "Joogi vesi" @@ -20166,10 +20310,10 @@ #. -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2479 msgid "Edit Drinking Water" msgstr "Vali joogivee asukoht" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2471 +#: build/trans_presets.java:2483 msgid "Baby Hatch" msgstr "" @@ -20177,33 +20321,33 @@ #. item #. -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2485 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2491 msgid "Shops" msgstr "Poed" #. group "Shops" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2492 msgid "Supermarket" msgstr "Supermarket" #. item -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2493 msgid "Edit Supermarket" msgstr "Vali Supermarket" -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2498 msgid "Chemist" msgstr "" #. item -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2499 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2504 msgid "Convenience Store" msgstr "Nurgakauplus" @@ -20211,9 +20355,9 @@ #. item #. -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2506 msgid "Edit Convenience Store" msgstr "Vali nurgakauplus" -#: build/trans_presets.java:2499 +#: build/trans_presets.java:2511 msgid "Kiosk" msgstr "Kiosk" @@ -20221,27 +20365,27 @@ #. item #. -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2513 msgid "Edit Kiosk" msgstr "Vali kiosk" -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2518 msgid "Book Store" msgstr "" #. item -#: build/trans_presets.java:2507 +#: build/trans_presets.java:2519 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2524 msgid "Travel Agency" msgstr "" #. item -#: build/trans_presets.java:2513 +#: build/trans_presets.java:2525 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2518 +#: build/trans_presets.java:2530 msgid "Vending machine" msgstr "" @@ -20249,5 +20393,5 @@ #. item #. -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2532 msgid "Edit Vending machine" msgstr "" @@ -20255,88 +20399,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "Vending products" msgstr "" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_tickets" msgstr "ühistranspordi_piletid" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_plans" msgstr "ühistranspordi_plaanid" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "parking_tickets" msgstr "parkimis_pilet" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "food" msgstr "toit" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "drinks" msgstr "joogid" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "sweets" msgstr "maiustused" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "cigarettes" msgstr "suitsud" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "photos" msgstr "fotod" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "animal_food" msgstr "looma_toit" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "news_papers" msgstr "ajalehed" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "toys" msgstr "mänguasjad" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "stamps" msgstr "templid" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "SIM-cards" msgstr "SIM-kaardid" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "telephone_vouchers" msgstr "telefoni_kaardid" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "condoms" msgstr "kondoomid" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "tampons" msgstr "tampoonid" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "excrement_bags" msgstr "" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2543 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2545 msgid "Butcher" msgstr "Lihunik" @@ -20344,9 +20488,9 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2547 msgid "Edit Butcher" msgstr "Vali lihunik" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2552 msgid "Baker" msgstr "Pagar" @@ -20354,9 +20498,9 @@ #. item #. -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2554 msgid "Edit Baker" msgstr "Vali pagar" -#: build/trans_presets.java:2547 +#: build/trans_presets.java:2559 msgid "Florist" msgstr "Lilleseadja" @@ -20364,18 +20508,18 @@ #. item #. -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2561 msgid "Edit Florist" msgstr "Vali lilleseadja" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2566 msgid "Organic" msgstr "Ökokaubad" #. item -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2567 msgid "Edit Organic Shop" msgstr "Redigeeri ökopoodi" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2572 msgid "Alcohol" msgstr "Alkohol" @@ -20383,54 +20527,54 @@ #. item #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2574 msgid "Edit Alcohol Shop" msgstr "Redigeeri alkoholi poode" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2579 msgid "Beverages" msgstr "Joogipood" #. item -#: build/trans_presets.java:2568 +#: build/trans_presets.java:2580 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2573 +#: build/trans_presets.java:2585 msgid "Computer" msgstr "Arvuti" #. item -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2586 msgid "Edit Computer Shop" msgstr "Vali arvutipood" -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2591 msgid "Electronics" msgstr "Elektroonika" #. item -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2592 msgid "Edit Electronics Shop" msgstr "Vali elektroonika pood" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2597 msgid "Hifi" msgstr "" #. item -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2598 msgid "Edit Hifi Shop" msgstr "" -#: build/trans_presets.java:2591 +#: build/trans_presets.java:2603 msgid "Furniture" msgstr "Mööbel" #. item -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2604 msgid "Edit Furniture Shop" msgstr "Vali mööblipood" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2609 msgid "Garden Centre" msgstr "Aiakeskus" @@ -20438,9 +20582,9 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2611 msgid "Edit Garden Centre" msgstr "Vali aiakeskus" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2616 msgid "Hardware" msgstr "Riistvara" @@ -20448,9 +20592,9 @@ #. item #. -#: build/trans_presets.java:2606 +#: build/trans_presets.java:2618 msgid "Edit Hardware Store" msgstr "Vali riistvara pood" -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2623 msgid "Do-it-yourself-store" msgstr "" @@ -20458,54 +20602,54 @@ #. item #. -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2625 msgid "Edit Do-it-yourself-store" msgstr "" -#: build/trans_presets.java:2618 +#: build/trans_presets.java:2630 msgid "Stationery" msgstr "Kirjatarbed" #. item -#: build/trans_presets.java:2619 +#: build/trans_presets.java:2631 msgid "Edit Stationery Shop" msgstr "Vali kirjatarvete pood" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2636 msgid "Hairdresser" msgstr "Juuksur" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2637 msgid "Edit Hairdresser" msgstr "Vali juuksur" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2642 msgid "Shoes" msgstr "Jalatsid" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2643 msgid "Edit Shoe Shop" msgstr "Vali jalatsi pood" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2648 msgid "Toys" msgstr "Mänguasjad" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2649 msgid "Edit Toy Shop" msgstr "Vali mänguasja pood" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2654 msgid "Video" msgstr "Video" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2655 msgid "Edit Video Shop" msgstr "Vali video pood" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2660 msgid "Dry Cleaning" msgstr "Kuiir puhastus" @@ -20513,9 +20657,9 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2662 msgid "Edit Dry Cleaning" msgstr "Vali kiirpuhastus" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2667 msgid "Laundry" msgstr "Pesumaja" @@ -20523,9 +20667,9 @@ #. item #. -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2669 msgid "Edit Laundry" msgstr "Vali pesumaja" -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2674 msgid "Outdoor" msgstr "Välisuks" @@ -20533,28 +20677,28 @@ #. item #. -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2676 msgid "Edit Outdoor Shop" msgstr "Vali välisukse pood" #. item -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2682 msgid "Edit Sports Shop" msgstr "Vali spordi pood" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2687 msgid "Optician" msgstr "Optik" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2688 msgid "Edit Optician" msgstr "Vali optika" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2695 msgid "Cash" msgstr "Sularaha" #. group "Cash" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2696 msgid "Bank" msgstr "Pank" @@ -20562,14 +20706,14 @@ #. item #. -#: build/trans_presets.java:2686 +#: build/trans_presets.java:2698 msgid "Edit Bank" msgstr "Vali Pank" -#: build/trans_presets.java:2691 build/trans_presets.java:2700 +#: build/trans_presets.java:2703 build/trans_presets.java:2712 msgid "Automated Teller Machine" msgstr "Sularaha automaat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2705 msgid "Money Exchange" msgstr "Raha vahetus" @@ -20577,5 +20721,5 @@ #. item #. -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2707 msgid "Edit Money Exchange" msgstr "Vali rahavahetus punkt" @@ -20583,15 +20727,15 @@ #. item #. -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2714 msgid "Edit Automated Teller Machine" msgstr "Vali sularaha automaat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2719 msgid "Health" msgstr "Tervis" #. group "Health" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2720 msgid "Doctors" msgstr "Arstid" @@ -20599,18 +20743,18 @@ #. item #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2722 msgid "Edit Doctors" msgstr "Vali arstid" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2727 msgid "Dentist" msgstr "Hambaarst" #. item -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2728 msgid "Edit Dentist" msgstr "Vali hambaarst" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2733 msgid "Pharmacy" msgstr "Apteek" @@ -20618,5 +20762,5 @@ #. item #. -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2735 msgid "Edit Pharmacy" msgstr "Vali Apteek" @@ -20624,9 +20768,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2737 msgid "Dispensing" msgstr "Retseptuur" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2741 msgid "Hospital" msgstr "Haigla" @@ -20634,10 +20778,10 @@ #. item #. -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2743 msgid "Edit Hospital" msgstr "Vali haigla" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2747 msgid "Emergency Access Point" msgstr "Hädaabi tugijaam" @@ -20646,5 +20790,5 @@ #. -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2750 msgid "Edit Emergency Access Point" msgstr "Vali hädaabi tugijaam" @@ -20653,20 +20797,20 @@ #. #. -#: build/trans_presets.java:2741 +#: build/trans_presets.java:2753 msgid "Point Number" msgstr "Punkti number" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2742 +#: build/trans_presets.java:2754 msgid "Point Name" msgstr "Punkti nimi" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2756 msgid "Phone Number" msgstr "Telefoninumber" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2757 msgid "(Use international code, like +12-345-67890)" msgstr "" @@ -20674,5 +20818,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2760 msgid "Veterinary" msgstr "Loomaarst" @@ -20681,59 +20825,59 @@ #. -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2763 msgid "Edit Veterinary" msgstr "Vali loomaarst" -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2770 msgid "Geography" msgstr "" #. group "Places" -#: build/trans_presets.java:2760 +#: build/trans_presets.java:2772 msgid "Continent" msgstr "Kontinent" #. item -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2773 msgid "Edit Continent" msgstr "Vali kontinent" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2766 +#: build/trans_presets.java:2778 msgid "Country" msgstr "Maa" #. item -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2779 msgid "Edit Country" msgstr "Vali maa" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2784 msgid "State" msgstr "Riik" #. item -#: build/trans_presets.java:2773 +#: build/trans_presets.java:2785 msgid "Edit State" msgstr "Vali riik" #. item "Places/State" text "Name" -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2790 msgid "Region" msgstr "Regioon" #. item -#: build/trans_presets.java:2779 +#: build/trans_presets.java:2791 msgid "Edit Region" msgstr "Vali regioon" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2796 msgid "County" msgstr "Maakond" #. item -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2797 msgid "Edit County" msgstr "Vali maakond" @@ -20741,15 +20885,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2803 msgid "City" msgstr "Linn" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2804 msgid "Edit City" msgstr "Vali linn" #. item "Places/City" text "Name" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2809 msgid "Town" msgstr "Linn" @@ -20757,10 +20901,10 @@ #. item #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2811 msgid "Edit Town" msgstr "Muuda linna" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2804 +#: build/trans_presets.java:2816 msgid "Suburb" msgstr "Linnaosa" @@ -20768,25 +20912,25 @@ #. item #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2818 msgid "Edit Suburb" msgstr "Muuda linnaosa" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2823 msgid "Village" msgstr "Küla/Alevik/Alev" #. item -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2824 msgid "Edit Village" msgstr "Muuda küla/alevik/alev" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2817 +#: build/trans_presets.java:2829 msgid "Hamlet" msgstr "Küla" #. item -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2830 msgid "Edit Hamlet" msgstr "Muuda küla" @@ -20794,5 +20938,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2824 +#: build/trans_presets.java:2836 msgid "Locality" msgstr "Asustamata koht" @@ -20800,10 +20944,10 @@ #. item #. -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2838 msgid "Edit Locality" msgstr "Muuda asustamata kohta" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2843 msgid "Island" msgstr "Saar" @@ -20811,10 +20955,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2845 msgid "Edit Island" msgstr "Muuda saart" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2838 +#: build/trans_presets.java:2850 msgid "Islet" msgstr "" @@ -20822,5 +20966,5 @@ #. item #. -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2852 msgid "Edit Islet" msgstr "" @@ -20828,5 +20972,5 @@ #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2858 msgid "Cave Entrance" msgstr "Koobas" @@ -20834,10 +20978,10 @@ #. item #. -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2860 msgid "Edit Cave Entrance" msgstr "Muuda koobast" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2864 msgid "Peak" msgstr "Mäetipp" @@ -20845,10 +20989,10 @@ #. item #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2866 msgid "Edit Peak" msgstr "Muuda mäetippu" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2871 msgid "Glacier" msgstr "Liustik" @@ -20856,10 +21000,10 @@ #. item #. -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2873 msgid "Edit Glacier" msgstr "Muuda liustikku" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2878 msgid "Volcano" msgstr "Vulkaan" @@ -20867,70 +21011,70 @@ #. item #. -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2880 msgid "Edit Volcano" msgstr "Muuda vulkaani" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2886 msgid "Boundaries" msgstr "Piirid" #. group "Boundaries" -#: build/trans_presets.java:2875 +#: build/trans_presets.java:2887 msgid "National" msgstr "Riiklikud" #. item -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2888 msgid "Edit National Boundary" msgstr "Muuda riiklikke piire" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2881 +#: build/trans_presets.java:2893 msgid "Administrative" msgstr "Administratiivpiir" #. item -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2894 msgid "Edit Administrative Boundary" msgstr "Muuda administratiivpiire" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2887 +#: build/trans_presets.java:2899 msgid "Civil" msgstr "Omavalitsus" #. item -#: build/trans_presets.java:2888 +#: build/trans_presets.java:2900 msgid "Edit Civil Boundary" msgstr "Muuda omavalitsuse piire" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2893 +#: build/trans_presets.java:2905 msgid "Political" msgstr "Valimisringkond" #. item -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2906 msgid "Edit Political Boundary" msgstr "Muuda valimisringkonda" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2911 msgid "National park" msgstr "Rahvuspark" #. item -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2912 msgid "Edit National Park Boundary" msgstr "Muuda rahvuspargi piire" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2918 msgid "Land use" msgstr "Maakasutus" #. group "Land use" -#: build/trans_presets.java:2907 +#: build/trans_presets.java:2919 msgid "Tree" msgstr "Üksik puu" @@ -20939,15 +21083,15 @@ #. -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2922 msgid "Edit Tree" msgstr "Muuda puud" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2915 +#: build/trans_presets.java:2927 msgid "Botanical Name" msgstr "Botaaniline nimi" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2929 msgid "Wood" msgstr "Mets" @@ -20956,5 +21100,5 @@ #. -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2932 msgid "Edit Wood" msgstr "Muuda metsa" @@ -20962,17 +21106,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "coniferous" msgstr "okasmets" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "deciduous" msgstr "lehtmets" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "mixed" msgstr "segamets" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2937 msgid "Forest" msgstr "Kultuurmets" @@ -20981,14 +21125,14 @@ #. -#: build/trans_presets.java:2928 +#: build/trans_presets.java:2940 msgid "Edit Forest Landuse" msgstr "Muuda kultuurmetsa" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2946 msgid "Nature Reserve" msgstr "Looduskaitseala" #. item -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2947 msgid "Edit Nature Reserve" msgstr "Muuda looduskaitseala" @@ -20996,25 +21140,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2952 msgid "Scree" msgstr "klibu, rusukalle" #. item -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2953 msgid "Edit Scree" msgstr "Muuda rusukallet" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2957 msgid "Scrub" msgstr "Võsa" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:2958 msgid "Edit Scrub" msgstr "Muuda võsa" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2962 msgid "Fell" msgstr "Langus" @@ -21022,10 +21166,10 @@ #. item #. -#: build/trans_presets.java:2952 +#: build/trans_presets.java:2964 msgid "Edit Fell" msgstr "Muuda langust" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2968 msgid "Heath" msgstr "Nõmm" @@ -21033,5 +21177,5 @@ #. item #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2970 msgid "Edit Heath" msgstr "Muuda nõmme" @@ -21039,5 +21183,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2975 msgid "Farmyard" msgstr "Taluõu" @@ -21046,45 +21190,45 @@ #. -#: build/trans_presets.java:2966 +#: build/trans_presets.java:2978 msgid "Edit Farmyard Landuse" msgstr "Muuda taluõue" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2983 msgid "Farmland" msgstr "Talumaa" #. item -#: build/trans_presets.java:2972 +#: build/trans_presets.java:2984 msgid "Edit Farmland Landuse" msgstr "Muuda talumaad" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2977 +#: build/trans_presets.java:2989 msgid "Meadow" msgstr "Niit/Karjamaa" #. item -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2990 msgid "Edit Meadow Landuse" msgstr "Muuta niitu" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:2995 msgid "Vineyard" msgstr "Viinapuuistandus" #. item -#: build/trans_presets.java:2984 +#: build/trans_presets.java:2996 msgid "Edit Vineyard Landuse" msgstr "Muuda viinapuuistandust" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3001 msgid "Allotments" msgstr "Eraldised" #. item -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3002 msgid "Edit Allotments Landuse" msgstr "Muuda eraldisi" @@ -21092,25 +21236,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3008 msgid "Garden" msgstr "Aed" #. item -#: build/trans_presets.java:2997 +#: build/trans_presets.java:3009 msgid "Edit Garden" msgstr "Muuda aeda" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3013 msgid "Grass" msgstr "Muru" #. item -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3014 msgid "Edit Grass Landuse" msgstr "Muuda muru" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3019 msgid "Village Green" msgstr "Külatanum" @@ -21118,10 +21262,10 @@ #. item #. -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3021 msgid "Edit Village Green Landuse" msgstr "Muuda külatanumat" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3026 msgid "Common" msgstr "Avalik maa" @@ -21129,20 +21273,20 @@ #. item #. -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3028 msgid "Edit Common" msgstr "Muuda avalikku maad" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3032 msgid "Park" msgstr "Park" #. item -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3033 msgid "Edit Park" msgstr "Muuda parki" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3037 msgid "Recreation Ground" msgstr "Puhkeala" @@ -21150,5 +21294,5 @@ #. item #. -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3039 msgid "Edit Recreation Ground Landuse" msgstr "Muuda puhkeala" @@ -21156,15 +21300,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3033 +#: build/trans_presets.java:3045 msgid "Residential area" msgstr "Elamurajoon" #. item -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3046 msgid "Edit Residential Landuse" msgstr "Muuda elamurajooni" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3051 msgid "Graveyard" msgstr "Matmispaik" @@ -21172,9 +21316,9 @@ #. item #. -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3053 msgid "Edit Graveyard" msgstr "Muuda matmispaika" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3059 msgid "Cemetery" msgstr "Kalmistu" @@ -21182,39 +21326,39 @@ #. item #. -#: build/trans_presets.java:3049 +#: build/trans_presets.java:3061 msgid "Edit Cemetery Landuse" msgstr "Muuda kalmistut" -#: build/trans_presets.java:3056 +#: build/trans_presets.java:3068 msgid "Retail" msgstr "Kaubandus" #. item -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3069 msgid "Edit Retail Landuse" msgstr "Muuda kaubandust" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3062 +#: build/trans_presets.java:3074 msgid "Commercial" msgstr "Kommerts" #. item -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3075 msgid "Edit Commercial Landuse" msgstr "Muuda kommertspiirkonda" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3068 +#: build/trans_presets.java:3080 msgid "Industrial" msgstr "Tööstus" #. item -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3081 msgid "Edit Industrial Landuse" msgstr "Muuda tööstuspiirkonda" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3086 msgid "Railway land" msgstr "Raudtee" @@ -21222,15 +21366,15 @@ #. item #. -#: build/trans_presets.java:3076 +#: build/trans_presets.java:3088 msgid "Edit Railway Landuse" msgstr "Muuda raudteed" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3081 +#: build/trans_presets.java:3093 msgid "Military" msgstr "Militaarala" #. item -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3094 msgid "Edit Military Landuse" msgstr "Muuda militaarala" @@ -21238,55 +21382,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3100 msgid "Construction area" msgstr "Ehitustanner" #. item -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3101 msgid "Edit Construction Landuse" msgstr "Muuda ehitustandrit" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3094 +#: build/trans_presets.java:3106 msgid "Brownfield" msgstr "Jäätmaa" #. item -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3107 msgid "Edit Brownfield Landuse" msgstr "Muuda jäätmaad" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3100 +#: build/trans_presets.java:3112 msgid "Greenfield" msgstr "Roheala" #. item -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3113 msgid "Edit Greenfield Landuse" msgstr "Muuda roheala" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3118 msgid "Landfill" msgstr "Prügimägi" #. item -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3119 msgid "Edit Landfill Landuse" msgstr "Muuda prügimäge" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3124 msgid "Quarry" msgstr "Kivimurd" #. item -#: build/trans_presets.java:3113 +#: build/trans_presets.java:3125 msgid "Edit Quarry Landuse" msgstr "Muuda kivimurdu" #. group "Relations" -#: build/trans_presets.java:3122 +#: build/trans_presets.java:3134 msgid "Multipolygon" msgstr "Hulknurk" @@ -21296,5 +21440,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:3126 +#: build/trans_presets.java:3138 msgid "Edit Multipolygon" msgstr "Muuda hulknurka" @@ -21303,10 +21447,10 @@ #. #. -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3144 msgid "outer segment" msgstr "väline osa" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3145 msgid "inner segment" msgstr "siseosa" @@ -21314,5 +21458,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3148 msgid "Turn restriction" msgstr "Pöördekeelud" @@ -21321,5 +21465,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3151 msgid "Edit Turn Restriction" msgstr "Muuda pöördekeelde" @@ -21327,34 +21471,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "Restriction" msgstr "Keelud" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_left_turn" msgstr "vasakpöörde keeld" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_right_turn" msgstr "parempöörde keeld" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_straight_on" msgstr "ei tohi otse sõita" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_u_turn" msgstr "ei tohi tagasi pöörata" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_right_turn" msgstr "ainult parempööre" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_left_turn" msgstr "ainult vaskpööre" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_straight_on" msgstr "ainult otsesõit" @@ -21363,15 +21507,15 @@ #. #. -#: build/trans_presets.java:3146 +#: build/trans_presets.java:3158 msgid "from way" msgstr "teelt" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3159 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:3148 +#: build/trans_presets.java:3160 msgid "to way" msgstr "teele" @@ -21379,5 +21523,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3151 +#: build/trans_presets.java:3163 msgid "Route" msgstr "Teekond" @@ -21386,5 +21530,5 @@ #. -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3166 msgid "Edit Route" msgstr "Muuda teekonda" @@ -21392,5 +21536,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "Route type" msgstr "teekonna tüüp" @@ -21462,5 +21606,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:233 +#: build/trans_presets.java:3168 build/trans_style.java:233 #: build/trans_style.java:683 build/trans_style.java:906 #: build/trans_style.java:914 build/trans_style.java:922 @@ -21469,17 +21613,17 @@ msgstr "jalgrattaga" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "bus" msgstr "buss" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "road" msgstr "tee" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ferry" msgstr "praam" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ski" msgstr "suusad" @@ -21532,5 +21676,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:247 +#: build/trans_presets.java:3168 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -21539,13 +21683,13 @@ msgstr "jalgsi" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "hiking" msgstr "matkamine" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "tram" msgstr "tramm" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "detour" msgstr "ümbersõit" @@ -21559,10 +21703,10 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:1206 +#: build/trans_presets.java:3168 build/trans_style.java:1206 msgid "subway" msgstr "metroo" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3159 +#: build/trans_presets.java:3171 msgid "Symbol description" msgstr "sümboolne kirjeldus" @@ -21570,31 +21714,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3174 msgid "Network" msgstr "Võrk" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "proposed" msgstr "planeeritud" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "alternate" msgstr "täiendav" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "temporary" msgstr "ajutine" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "connection" msgstr "ühendus" -#: build/trans_presets.java:3165 +#: build/trans_presets.java:3177 msgid "Color (hex)" msgstr "Värv (hex)" @@ -21603,30 +21747,30 @@ #. #. -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3180 msgid "route segment" msgstr "teekonna osa" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3181 msgid "forward segment" msgstr "edasisuunaline osa" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3170 +#: build/trans_presets.java:3182 msgid "backward segment" msgstr "tagasisuunaline osa" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3183 msgid "halt point" msgstr "peatuspunkt" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3172 +#: build/trans_presets.java:3184 msgid "forward halt point" msgstr "edasisuunaline peatuspunkt" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3173 +#: build/trans_presets.java:3185 msgid "backward halt point" msgstr "tagasisuunaline peatuspunkt" @@ -25764,4 +25908,16 @@ msgstr "" +#~ msgid "Combine ways with different memberships?" +#~ msgstr "Sobita erinevate kuuluvustega teed?" + +#~ msgid "Combine Anyway" +#~ msgstr "Sobita ikkagi." + +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "" +#~ "Valitud teedel on erinevad kuuluvusseosed. Kas Sa oled sobitamises kindel?" + #~ msgid "Move" #~ msgstr "Liiguta" Index: /applications/editors/josm/i18n/po/fi.po =================================================================== --- /applications/editors/josm/i18n/po/fi.po (revision 17821) +++ /applications/editors/josm/i18n/po/fi.po (revision 17822) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-22 17:52+0200\n" -"PO-Revision-Date: 2009-09-22 14:33+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-09-28 16:38+0200\n" +"PO-Revision-Date: 2009-09-26 04:55+0000\n" +"Last-Translator: Teemu Koskinen \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: 2009-09-22 15:45+0000\n" +"X-Launchpad-Export-Date: 2009-09-28 14:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -66,8 +66,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250 @@ -90,9 +90,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -141,7 +141,7 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:172 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 @@ -154,5 +154,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 @@ -329,6 +328,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -338,6 +336,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 @@ -347,5 +345,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -356,5 +354,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180 @@ -363,5 +361,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -454,9 +452,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -488,10 +486,9 @@ msgstr "Valitse ainakin neljä pistettä." -#. FIXME: not sure whether this fits in a dialog #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:85 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -601,5 +598,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 #, java-format msgid "File: {0}" @@ -621,38 +618,22 @@ msgstr "Ladataan avonaiset muutoskokoelmat..." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine Way" msgstr "Yhdistä polkuja" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 msgid "Combine several ways into one." msgstr "Yhdistää monta polkua yhdeksi." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 -msgid "Combine ways with different memberships?" -msgstr "Yhdistetäänkö polut, joilla on eriävät jäsenyydet?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -msgid "Combine Anyway" -msgstr "Yhdistä silti" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" -"Valituilla poluilla on eriävät relaatiojäsenyydet. Haluatko silti yhdistää " -"ne?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 msgid "Change directions?" msgstr "Vaihdetaanko suuntia?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Reverse and Combine" msgstr "Käännä ja yhdistä" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -661,5 +642,5 @@ "Polkuja ei voi yhdistää nykyisessä suunnassa. Haluatko kääntää osan niistä?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -668,10 +649,10 @@ "Polkuja ei voitu yhdistää. (Niitä ei voitu yhdistää yhdeksi pistejonoksi)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 #, java-format msgid "Combine {0} ways" msgstr "Yhdistä {0} polkua" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 msgid "Please select at least two ways to combine." msgstr "Valitse ainakin kaksi yhdistettävää polkua." @@ -717,6 +698,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -781,5 +761,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -810,5 +790,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307 #, java-format msgid "There were {0} conflicts during import." @@ -822,9 +801,8 @@ #, java-format msgid "({0}/{1}) Loading parents of primitive {2}" -msgstr "" +msgstr "({0}/{1}) Ladataan objektiin {2} viittaavia objekteja" #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Duplicate" @@ -855,10 +833,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:209 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "GPX-vienti..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:208 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Vie data GPX-tiedostoon." @@ -869,8 +847,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -935,5 +913,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 @@ -976,6 +954,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1027,5 +1004,5 @@ #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16 msgid "Display history information about OSM ways, nodes, or relations." -msgstr "" +msgstr "Näytä historiatietoja OSM-poluista, -pisteistä ja -relaatioista." #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15 @@ -1036,5 +1013,5 @@ #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16 msgid "Display object information about OSM nodes, ways, or relations." -msgstr "" +msgstr "Näytä tietoja OSM-pisteistä, -poluista tai -relaatioista." #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29 @@ -1063,22 +1040,22 @@ msgstr "Liitä nykyinen taso toiseen tasoon" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge Nodes" msgstr "Yhdistä pisteet" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 msgid "Merge nodes into the oldest one." msgstr "Yhdistää pisteet vanhimpaan." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 msgid "Please select at least two nodes to merge." msgstr "Valitse vähintään kaksi yhdistettävää pistettä." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "Pisteitä ei voitu yhdistää. Käytössä oleva polku tulisi poistaa ensin." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 #, java-format msgid "Merge {0} nodes" @@ -1150,5 +1127,4 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350 msgid "New" msgstr "Uusi" @@ -1261,6 +1237,6 @@ msgid "Pasting {0} tag" msgid_plural "Pasting {0} tags" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Liitetään {0} tagi" +msgstr[1] "Liitetään {0} tagia" #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 @@ -1268,6 +1244,6 @@ msgid "to {0} primitive" msgid_plural "to {0} primtives" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{0} objektiin" +msgstr[1] "{0} objektiin" #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31 @@ -1327,10 +1303,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Tallenna" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Tallenna tämänhetkinen data." @@ -1387,10 +1363,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Tallenna nimellä..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Tallenna data uuteen tiedostoon." @@ -1433,5 +1409,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:961 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888 @@ -1500,4 +1476,6 @@ "should verify this and correct it when necessary." msgstr "" +"Relaation jäsenyys kopioitiin kaikkiin uusin polkuihin.
Sinun " +"tulisi tarkistaa että jäsenyydet ovat oikein." #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351 @@ -1663,13 +1641,13 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 msgid "Update Selection" -msgstr "" +msgstr "Päivitä valinta" #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" -msgstr "" +msgstr "Päivittää valitut objektit palvelimelta" #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." -msgstr "" +msgstr "Päivitettäviä objekteja ei valittuna." #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 @@ -1677,14 +1655,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 msgid "Upload to OSM..." msgstr "Lähetä OSM-palvelimelle..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload all changes to the OSM server." msgstr "Lähetä kaikki muutokset OSM-palvelimelle..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 #, java-format msgid "" @@ -1693,23 +1671,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Ei mitään lähetettävää. Hae ensin dataa." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:171 msgid "No changes to upload." msgstr "Ei lähetettäviä muutoksia." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223 #, java-format msgid "Synchronize {0} {1} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 msgid "Synchronize entire dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:228 #, java-format msgid "" @@ -1723,17 +1701,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:283 msgid "Conflict detected" msgstr "" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:257 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 #, java-format msgid "Unexpected return value. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:272 #, java-format msgid "" @@ -1744,5 +1722,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:306 #, java-format msgid "" @@ -1752,34 +1730,39 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 msgid "Changeset closed" msgstr "Muutoskokoelma suljettu" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:425 #, java-format msgid "Uploading failed.
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:434 msgid "Upload to OSM API failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457 msgid "Updating primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:514 #, java-format msgid "Uploading data for layer ''{0}''" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." msgstr "" @@ -1868,13 +1851,13 @@ msgstr "Hitaammin eteenpäin" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34 msgid "Downloading GPS data" msgstr "Ladataan GPS-dataa" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57 msgid "Downloaded GPX Data" msgstr "Ladattu GPX-data" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87 msgid "Raw GPS data" msgstr "Raaka GPS-data" @@ -1888,4 +1871,8 @@ msgid "" "Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 +msgid "No data found in this area." msgstr "" @@ -2582,9 +2569,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 +#, java-format +msgid "" +"Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -2633,5 +2620,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Delete from relation" msgstr "Poista relaatiosta" @@ -2684,14 +2671,15 @@ msgstr[1] "Siirrä {0} pistettä" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 -msgid "Purging 1 primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 -#, java-format -msgid "removing reference from way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 +#, fuzzy, java-format +msgid "Purged object ''{0}''" +msgstr "Siirrä objektit {0}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 +#, fuzzy, java-format +msgid "Purged {0} objects" +msgstr "Muuta {0} objekti" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 #, java-format msgid "" @@ -2700,12 +2688,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203 -#, java-format -msgid "removing reference from relation {0}" -msgstr "" +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 +#, fuzzy, java-format +msgid "Removing reference from relation {0}" +msgstr "Poistetaanko valinta relaatiosta {0}?" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 #, java-format msgid "Resolve conflicts in member list of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -3049,24 +3042,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Error: {0}" msgstr "Virhe: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Warning: {0}" msgstr "Varoitus: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3074,5 +3067,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3098,6 +3091,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:244 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3153,121 +3146,114 @@ msgstr "" -#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed -#. TODO Remove useless nullcheck when RelationMember.member is encalupsed -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855 -msgid "Empty member in relation." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:850 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Poistettu jäsen \"{0}\" relaatiossa." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:861 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Polussa \"{0}\" on vähemmän kuin kaksi pistettä." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 msgid "More than one \"from\" way found." msgstr "Löytyi enemmän kuin yksi \"from\" -polku" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:607 msgid "More than one \"to\" way found." msgstr "Löytyi enemmän kuin yksi \"to\" -polku" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:613 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627 msgid "More than one \"via\" found." msgstr "Useita \"via\" -jäseniä." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:632 #, java-format msgid "Unknown role ''{0}''." msgstr "Tuntematon rooli \"{0}\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:641 msgid "No \"from\" way found." msgstr "Ei \"from\"-roolin tietä." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645 msgid "No \"to\" way found." msgstr "Ei \"to\"-roolin tietä." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:649 msgid "No \"via\" node or way found." msgstr "Ei löytynyt pistettä tai tietä \"via\"-roolissa." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:658 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" "\"via\" -roolin piste ei ole \"from\" -tien ensimmäinen eikä viimeinen." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:662 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "\"via\" -roolin piste ei ole \"to\" -tien ensimmäinen eikä viimeinen." +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693 -msgid "The \"from\" way doesn't start or end at the \"via\" way." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816 #, java-format msgid "Style for restriction {0} not found." msgstr "Kiellolle {0} ei löydy piirtotyyliä." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:870 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:882 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Multipolygonissa jäsenenä muu kuin tie: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:940 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Multipolygonilta \"{0}\" puuttuu jäsen \"outer\"-roolista." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1029 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1041 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Inner-roolin tie \"{0}\" relaation teistä uloimpana." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1094 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1120 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1324 msgid "untagged" msgstr "ei tageja" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1325 msgid "text" msgstr "teksti" @@ -3289,5 +3275,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:249 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 @@ -3298,5 +3284,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 @@ -3325,5 +3311,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:169 msgid "background" msgstr "tausta" @@ -3415,5 +3401,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "railway" msgstr "rata" @@ -3469,9 +3455,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +#, fuzzy +msgid "Not Found" +msgstr "Tiedostoa ei löytynyt" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 msgid "Unknown host" msgstr "Tuntematon palvelin" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:247 msgid "Primitive already deleted" msgstr "" @@ -4770,5 +4761,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -4982,43 +4973,43 @@ msgstr "Jäsenyydet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 msgid "Add Properties" msgstr "Lisää ominaisuuksia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 msgid "Add a new key/value pair to all objects" msgstr "Lisää uusi arvo/avain-pari kaikkiin objekteihin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 msgid "Edit Properties" msgstr "Muokkaa ominaisuuksia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 msgid "Edit the value of the selected key for all objects" msgstr "Muokkaa valitun avaimen arvoa kaikissa objekteissa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Ominaisuudet: {0} / Jäsenyydet: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 msgid "Properties / Memberships" msgstr "Ominaisuudet / Jäsenyydet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 msgid "Change relation" msgstr "Muuta relaatiota" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Poistetaanko valinta relaatiosta {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:855 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 msgid "Delete the selected key in all objects" msgstr "Poista valittu avain kaikista objekteista" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 msgid "Delete Properties" msgstr "Poista asetukset" @@ -5028,6 +5019,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168 -#: build/trans_presets.java:3121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 +#: build/trans_presets.java:3133 msgid "Relations" msgstr "Relaatiot" @@ -5037,25 +5028,30 @@ msgstr "Avaa lista kaikista relaatioista." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:174 #, java-format msgid "Relations: {0}" msgstr "Relaatiot: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 msgid "Open an editor for the selected relation" msgstr "Avaa valittu relaatio muokkaimeen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:325 msgid "Delete the selected relation" msgstr "Poista valittu relaatio" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:363 msgid "Create a new relation" msgstr "Luo uusi relaatio" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:400 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280 msgid "Create a copy of this relation and open it in another editor window" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 +#, fuzzy +msgid "Set the current selection to the list of selected relations" +msgstr "Valintaa ei voida käyttää jakamiseen." #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5096,9 +5092,9 @@ msgstr "Valinta: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 msgid "Undock the panel" msgstr "Irroita paneeli" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5107,5 +5103,5 @@ "työkalupalkin napista." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 msgid "Click to minimize/maximize the panel content" msgstr "Napsauta pienentääksesi/suurentaaksesi paneelin sisällön" @@ -5385,13 +5381,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090 msgid "Apply the current updates" -msgstr "" +msgstr "Tee muutokset" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123 msgid "Apply the updates and close the dialog" -msgstr "" +msgstr "Tee muutokset ja sulje tämä ikkuna" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 msgid "Cancel the updates and close the dialog" -msgstr "" +msgstr "Peruuta muutokset ja sulje tämä ikkuna" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174 @@ -5616,5 +5612,5 @@ #. group "Geography" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2771 msgid "Places" msgstr "Paikat" @@ -6288,6 +6284,4 @@ #. item "Man Made/Windmill" label "Edit Windmill" #. -#. item "Man Made/Pipeline" label "Edit Pipeline" -#. #. item "Man Made/Wastewater Plant" label "Edit Wastewater Plant" #. @@ -6300,4 +6294,6 @@ #. item "Man Made/Surveillance" label "Edit Surveillance Camera" #. +#. item "Man Made/Power Station" label "Edit Power Station" +#. #. item "Amenities/Fountain" label "Edit Fountain" #. @@ -6622,57 +6618,57 @@ #: build/trans_presets.java:2250 build/trans_presets.java:2258 #: build/trans_presets.java:2290 build/trans_presets.java:2295 -#: build/trans_presets.java:2300 build/trans_presets.java:2305 -#: build/trans_presets.java:2311 build/trans_presets.java:2317 -#: build/trans_presets.java:2323 build/trans_presets.java:2331 -#: build/trans_presets.java:2337 build/trans_presets.java:2343 -#: build/trans_presets.java:2349 build/trans_presets.java:2355 -#: build/trans_presets.java:2365 build/trans_presets.java:2462 -#: build/trans_presets.java:2469 build/trans_presets.java:2483 -#: build/trans_presets.java:2489 build/trans_presets.java:2496 -#: build/trans_presets.java:2503 build/trans_presets.java:2509 -#: build/trans_presets.java:2515 build/trans_presets.java:2537 -#: build/trans_presets.java:2544 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2305 build/trans_presets.java:2310 +#: build/trans_presets.java:2316 build/trans_presets.java:2322 +#: build/trans_presets.java:2339 build/trans_presets.java:2345 +#: build/trans_presets.java:2351 build/trans_presets.java:2357 +#: build/trans_presets.java:2363 build/trans_presets.java:2373 +#: build/trans_presets.java:2380 build/trans_presets.java:2474 +#: build/trans_presets.java:2481 build/trans_presets.java:2495 +#: build/trans_presets.java:2501 build/trans_presets.java:2508 +#: build/trans_presets.java:2515 build/trans_presets.java:2521 +#: build/trans_presets.java:2527 build/trans_presets.java:2549 +#: build/trans_presets.java:2556 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2576 #: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2594 build/trans_presets.java:2601 -#: build/trans_presets.java:2608 build/trans_presets.java:2615 -#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2594 build/trans_presets.java:2600 +#: build/trans_presets.java:2606 build/trans_presets.java:2613 +#: build/trans_presets.java:2620 build/trans_presets.java:2627 #: build/trans_presets.java:2633 build/trans_presets.java:2639 -#: build/trans_presets.java:2645 build/trans_presets.java:2652 -#: build/trans_presets.java:2659 build/trans_presets.java:2666 -#: build/trans_presets.java:2672 build/trans_presets.java:2678 -#: build/trans_presets.java:2688 build/trans_presets.java:2697 -#: build/trans_presets.java:2712 build/trans_presets.java:2718 -#: build/trans_presets.java:2726 build/trans_presets.java:2733 -#: build/trans_presets.java:2753 build/trans_presets.java:2764 -#: build/trans_presets.java:2770 build/trans_presets.java:2776 +#: build/trans_presets.java:2645 build/trans_presets.java:2651 +#: build/trans_presets.java:2657 build/trans_presets.java:2664 +#: build/trans_presets.java:2671 build/trans_presets.java:2678 +#: build/trans_presets.java:2684 build/trans_presets.java:2690 +#: build/trans_presets.java:2700 build/trans_presets.java:2709 +#: build/trans_presets.java:2724 build/trans_presets.java:2730 +#: build/trans_presets.java:2738 build/trans_presets.java:2745 +#: build/trans_presets.java:2765 build/trans_presets.java:2776 #: build/trans_presets.java:2782 build/trans_presets.java:2788 -#: build/trans_presets.java:2795 build/trans_presets.java:2802 -#: build/trans_presets.java:2809 build/trans_presets.java:2815 -#: build/trans_presets.java:2821 build/trans_presets.java:2829 -#: build/trans_presets.java:2836 build/trans_presets.java:2843 -#: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2879 build/trans_presets.java:2885 +#: build/trans_presets.java:2794 build/trans_presets.java:2800 +#: build/trans_presets.java:2807 build/trans_presets.java:2814 +#: build/trans_presets.java:2821 build/trans_presets.java:2827 +#: build/trans_presets.java:2833 build/trans_presets.java:2841 +#: build/trans_presets.java:2848 build/trans_presets.java:2855 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2875 build/trans_presets.java:2882 #: build/trans_presets.java:2891 build/trans_presets.java:2897 -#: build/trans_presets.java:2903 build/trans_presets.java:2912 -#: build/trans_presets.java:2922 build/trans_presets.java:2931 -#: build/trans_presets.java:2937 build/trans_presets.java:2943 -#: build/trans_presets.java:2948 build/trans_presets.java:2954 -#: build/trans_presets.java:2960 build/trans_presets.java:2969 -#: build/trans_presets.java:2975 build/trans_presets.java:2981 +#: build/trans_presets.java:2903 build/trans_presets.java:2909 +#: build/trans_presets.java:2915 build/trans_presets.java:2924 +#: build/trans_presets.java:2934 build/trans_presets.java:2943 +#: build/trans_presets.java:2949 build/trans_presets.java:2955 +#: build/trans_presets.java:2960 build/trans_presets.java:2966 +#: build/trans_presets.java:2972 build/trans_presets.java:2981 #: build/trans_presets.java:2987 build/trans_presets.java:2993 #: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3012 build/trans_presets.java:3018 -#: build/trans_presets.java:3023 build/trans_presets.java:3030 -#: build/trans_presets.java:3037 build/trans_presets.java:3043 -#: build/trans_presets.java:3052 build/trans_presets.java:3060 -#: build/trans_presets.java:3066 build/trans_presets.java:3072 -#: build/trans_presets.java:3079 build/trans_presets.java:3085 -#: build/trans_presets.java:3092 build/trans_presets.java:3098 +#: build/trans_presets.java:3011 build/trans_presets.java:3017 +#: build/trans_presets.java:3024 build/trans_presets.java:3030 +#: build/trans_presets.java:3035 build/trans_presets.java:3042 +#: build/trans_presets.java:3049 build/trans_presets.java:3055 +#: build/trans_presets.java:3064 build/trans_presets.java:3072 +#: build/trans_presets.java:3078 build/trans_presets.java:3084 +#: build/trans_presets.java:3091 build/trans_presets.java:3097 #: build/trans_presets.java:3104 build/trans_presets.java:3110 -#: build/trans_presets.java:3116 build/trans_presets.java:3129 -#: build/trans_presets.java:3143 build/trans_presets.java:3157 +#: build/trans_presets.java:3116 build/trans_presets.java:3122 +#: build/trans_presets.java:3128 build/trans_presets.java:3141 +#: build/trans_presets.java:3155 build/trans_presets.java:3169 msgid "Name" msgstr "Nimi" @@ -6737,5 +6733,4 @@ msgstr "Sulje muutoskokoelmat" -#. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 msgid "Close the selected open changesets" @@ -6763,25 +6758,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "Yes" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "No" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47 #, java-format msgid "Layer ''{0}'' has modifications which should be uploaded to the server." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49 #, java-format msgid "Layer ''{0}'' has no modifications to be uploaded." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60 #, java-format msgid "" @@ -6790,29 +6785,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62 #, java-format msgid "Layer ''{0}'' has no modifications to be saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80 msgid "No file associated with this layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:83 msgid "Please select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:86 #, java-format msgid "Layer ''{0}'' is not backed by a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:101 #, java-format msgid "File ''{0}'' is not writable. Please enter another file name." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:115 #, java-format msgid "Select to upload layer ''{0}'' to the server ''{1}''" @@ -6827,8 +6822,12 @@ msgid "Unsaved changes - Save/Upload before exiting?" msgstr "" +"Tallentamattomia muutoksia - Tallenna tai lähetä serverille ennen ohjelman " +"sulkemista?" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119 msgid "Unsaved changes - Save/Upload before deleting?" msgstr "" +"Tallentamattomia muutoksia - Tallenna tai lähetä serverille ennen " +"poistamista?" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139 @@ -6902,8 +6901,9 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Delete layers without saving. Unsaved changes are lost." -msgstr "" +msgstr "Poista tasoja tallentamatta. Tallentamattomat muutokset katoavat." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -msgid "Save and Exit" +#, fuzzy +msgid "Save/Upload and Exit" msgstr "Tallenna ja poistu" @@ -6913,6 +6913,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -msgid "Save and Delete" -msgstr "" +#, fuzzy +msgid "Save/Upload and Delete" +msgstr "Lähetys peruttu" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 @@ -6928,5 +6929,5 @@ msgid "" "An upload and/or save operation of one layer with modifications
was " -"cancelled or has been failed." +"cancelled or has failed." msgstr "" @@ -7012,6 +7013,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:891 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:921 msgid "Tags of new changeset" msgstr "Uuden muutoskokoelman tagit" @@ -7072,5 +7073,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606 msgid "Upload all changes in one request" -msgstr "" +msgstr "Lähetä kaikki muutokset yhtenä pyyntönä" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607 @@ -7110,7 +7111,6 @@ "Valitse muutoskokoelman sulkemiseksi seuraavan datan lähetyksen jälkeen" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:909 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:933 #, java-format msgid "Tags of changeset {0}" @@ -7118,48 +7118,48 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:949 msgid "Load the list of your open changesets from the server" msgstr "Lataa lista avonaisista muutoskokoelmista palvelimelta" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:963 msgid "Close the currently selected open changeset" msgstr "Sulje valittuna oleva avoin muutoskokoelma" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1011 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106 msgid "Preparing primitives to upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "Lue GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Ei aikaleimaa pisteelle {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Aikaleimaa \"{0}\" ei voitu lukea pisteestä {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325 msgid "No images with readable timestamps found." msgstr "Ei löytynyt aikaleimallisia kuvia." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format @@ -7167,29 +7167,29 @@ msgstr "Luetaan {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:402 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246 msgid "Geotagged Images" msgstr "Geo-merkityt kuvat" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:587 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "GPS start: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 #, java-format msgid "GPS end: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594 #, java-format msgid "current delta: {0}s" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595 msgid "timezone difference: " msgstr "aikavyöhyke-ero: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284 msgid "image" @@ -7198,14 +7198,14 @@ msgstr[1] "kuvat" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #, java-format msgid "{0} within the track." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680 msgid "Sync clock" msgstr "Tahdista kello" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7213,32 +7213,32 @@ msgstr "JPEG-kuvat (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:734 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Päivämäärää tiedostosta \"{0}\" ei voitu tulkita." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Tiedostossa \"{0}\" ei ole EXIF-aikaleimaa." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 msgid "Image" msgstr "Kuva" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:752 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Syötä näytetty päivämäärä (kk/pp/vvvv TT:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759 msgid "GPS unit timezone (difference to photo)" msgstr "GPS-yksikön aikavyöhyke (ero kuvaan)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:767 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771 msgid "Synchronize Time with GPS Unit" msgstr "Tahdista aika GPS-yksikön kanssa" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:790 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 msgid "Time entered could not be parsed." msgstr "Syötettyä aikaa ei voitu tulkita oikein." @@ -7322,5 +7322,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 #, java-format msgid "Name: {0}" @@ -7343,5 +7343,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3160 +#: build/trans_presets.java:3172 msgid "Description" msgstr "Kuvaus" @@ -7397,5 +7397,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:587 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 @@ -7456,42 +7456,65 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:105 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:107 #, java-format msgid "Data Layer {0}" msgstr "Datataso {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 msgid "outside downloaded area" msgstr "ladatun alueen ulkopuolella" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:252 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:289 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:290 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 +#, fuzzy, java-format +msgid "There was {0} conflict detected." +msgid_plural "There were {0} conflicts detected." +msgstr[0] "Tuonnin aikana oli {0} konfliktia." +msgstr[1] "Tuonnin aikana oli {0} konfliktia." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 +#, java-format +msgid "" +"{0} object has been purged from the local dataset because it is deleted on " +"the server." +msgid_plural "" +"{0} objects have been purged from the local dataset because they are deleted " +"on the server." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 +#, fuzzy +msgid "Conflicts detected" +msgstr "Ristiriidat" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 #, java-format msgid "{0} consists of:" msgstr "{0} koostuu:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:476 #, java-format msgid " ({0} deleted.)" msgstr " ({0} poistettu)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:501 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:584 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" @@ -7839,5 +7862,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:412 #: ../plugins/terracer/src/terracer/TerracerAction.java:430 @@ -8587,5 +8610,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261 msgid "More information about this feature" msgstr "Lisää tietoja tästä ominaisuudesta" @@ -8634,5 +8657,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:700 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -8642,18 +8665,18 @@ msgstr[1] "Muuta {0} objektia" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Ei mitään valittuna!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 msgid "Selection unsuitable!" msgstr "Valinta ei ole sopiva!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788 msgid "Change Properties" msgstr "Muuta ominaisuuksia" @@ -8939,44 +8962,44 @@ msgstr "Suljetaan muutoskokoelma..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 msgid "Preparing..." msgstr "Valmistellaan..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 msgid "Uploading..." msgstr "Lähetetään..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9205,5 +9228,5 @@ msgid "" "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}''," -"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." +"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." msgstr "" @@ -9320,6 +9343,6 @@ #, java-format msgid "" -"Relation with external id ''{0}'' refers to missing primitive with external " -"id ''{1}''." +"Relation with external id ''{0}'' refers to a missing primitive with " +"external id ''{1}''." msgstr "" @@ -9414,32 +9437,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:73 msgid "Starting to upload with one request per primitive ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Starting to upload in one request ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 +#, fuzzy, java-format +msgid "Parameter ''{0}'' must not be null" +msgstr "parametri ''{0}'' ei saa olla tyhjä" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 msgid "Uploading data ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 msgid "" "WARNING: no API version defined for data to upload. Falling back to version " @@ -9447,5 +9475,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:153 #, java-format msgid "" @@ -9517,5 +9545,5 @@ #, java-format msgid "Plugin {0} requires JOSM update to version {1}." -msgstr "" +msgstr "Liitännäinen {0} tarvitsee vähintään version {1} JOSM:sta" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108 @@ -9631,5 +9659,5 @@ #, java-format msgid "Plug-in named {0} is not available. Update skipped." -msgstr "" +msgstr "Liitännäinen {0} ei ole saatavilla." #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103 @@ -9669,5 +9697,5 @@ #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:202 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:324 build/trans_presets.java:325 @@ -9689,6 +9717,6 @@ #: build/trans_presets.java:789 build/trans_presets.java:1333 #: build/trans_presets.java:1400 build/trans_presets.java:1401 -#: build/trans_presets.java:1402 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 +#: build/trans_presets.java:1402 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 msgid "unknown" msgstr "tuntematon" @@ -9838,5 +9866,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:192 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:182 +#, java-format +msgid "" +"The OSM server ''{0}'' doesn't know about an object
you tried to read, " +"update, or delete. Either the respective object
doesn''t exist on the " +"server or you''re using an invalid URL to access
it. Please carefully " +"check the servers address ''{1}'' for typos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:209 #, java-format msgid "" @@ -9846,5 +9883,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:262 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:279 #, java-format msgid "" @@ -10103,17 +10140,15 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35 msgid "Define Address Interpolation" msgstr "" -#. Whether to re-trigger data changed for relation #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:413 #: ../plugins/terracer/src/terracer/TerracerAction.java:437 @@ -10121,99 +10156,99 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 msgid "Alphabetic" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161 #, java-format msgid "Relation: {0}" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173 msgid "Associate with street using:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184 msgid "Numbering Scheme:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 msgid "Starting #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188 msgid "Ending #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 #, java-format msgid "Will associate {0} additional house number nodes" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 msgid "Starting address number must be less than ending address number" msgstr "" @@ -10948,4 +10983,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52 +#: build/trans_presets.java:2331 msgid "Location" msgstr "" @@ -11485,4 +11521,5 @@ msgstr "kaakko" +#. item "Man Made/Pipeline" combo "Type" #. color highway_track #. @@ -11528,7 +11565,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:990 build/trans_style.java:1007 -#: build/trans_style.java:1023 build/trans_style.java:3400 -#: build/trans_style.java:3408 +#: build/trans_presets.java:2330 build/trans_style.java:990 +#: build/trans_style.java:1007 build/trans_style.java:1023 +#: build/trans_style.java:3400 build/trans_style.java:3408 msgid "water" msgstr "vesi" @@ -12937,5 +12974,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:86 msgid "Similarly named ways" -msgstr "Nimeämättömät polut" +msgstr "Lähes samannimiset polut" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39 @@ -14102,9 +14139,11 @@ #. item "Public Transport/Airport" text "Name" #. +#. item "Man Made/Power Station" text "Operator" #. item "Relations/Route" text "Name" #: build/trans_presets.java:65 build/trans_presets.java:101 #: build/trans_presets.java:121 build/trans_presets.java:141 #: build/trans_presets.java:178 build/trans_presets.java:198 -#: build/trans_presets.java:1560 build/trans_presets.java:3158 +#: build/trans_presets.java:1560 build/trans_presets.java:2382 +#: build/trans_presets.java:3170 msgid "Reference" msgstr "Numero" @@ -14666,5 +14705,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 msgid "metal" msgstr "" @@ -14684,5 +14723,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 #: build/trans_style.java:3375 msgid "wood" @@ -14971,7 +15010,7 @@ #: build/trans_presets.java:1401 build/trans_presets.java:1402 #: build/trans_presets.java:1767 build/trans_presets.java:1777 -#: build/trans_presets.java:2408 build/trans_presets.java:2444 -#: build/trans_presets.java:2453 build/trans_presets.java:2454 -#: build/trans_presets.java:2455 build/trans_presets.java:2725 +#: build/trans_presets.java:2420 build/trans_presets.java:2456 +#: build/trans_presets.java:2465 build/trans_presets.java:2466 +#: build/trans_presets.java:2467 build/trans_presets.java:2737 msgid "yes" msgstr "kyllä" @@ -15120,8 +15159,8 @@ #: build/trans_presets.java:1400 build/trans_presets.java:1401 #: build/trans_presets.java:1402 build/trans_presets.java:1767 -#: build/trans_presets.java:1777 build/trans_presets.java:2408 -#: build/trans_presets.java:2444 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 -#: build/trans_presets.java:2725 +#: build/trans_presets.java:1777 build/trans_presets.java:2420 +#: build/trans_presets.java:2456 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 +#: build/trans_presets.java:2737 msgid "no" msgstr "ei" @@ -15259,6 +15298,8 @@ #. item "Water/Wetland" text "Name" #. item "Car/Parking" text "Reference number" +#. item "Man Made/Pipeline" text "Operator" #. item "Man Made/Power Generator" label "Edit Power Generator" #. +#. item "Man Made/Power Tower" label "Edit Power Tower" #. item "Land use/Tree" text "Name" #. item "Land use/Wood" text "Name" @@ -15266,7 +15307,8 @@ #: build/trans_presets.java:350 build/trans_presets.java:649 #: build/trans_presets.java:789 build/trans_presets.java:1137 -#: build/trans_presets.java:1395 build/trans_presets.java:2364 -#: build/trans_presets.java:2913 build/trans_presets.java:2923 -#: build/trans_presets.java:2932 +#: build/trans_presets.java:1395 build/trans_presets.java:2330 +#: build/trans_presets.java:2372 build/trans_presets.java:2398 +#: build/trans_presets.java:2925 build/trans_presets.java:2935 +#: build/trans_presets.java:2944 msgid "Type" msgstr "Tyyppi" @@ -15816,10 +15858,10 @@ #. item "Tourism/Information Terminal" text "Closer description" #. item "Tourism/Audioguide" text "Closer description" -#. item "Man Made/Power Station" label "Edit Power Station" -#. +#. item "Man Made/Tower" text "Height (meters)" +#. item "Man Made/Pipeline" label "Edit Pipeline" +#. +#. item "Man Made/Power Station" text "Name" #. item "Man Made/Power Sub Station" label "Edit Power Sub Station" #. -#. item "Man Made/Power Line" label "Edit Power Line" -#. #. item #. #: build/trans_presets.java:1535 build/trans_presets.java:1789 -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2465 msgid "Shelter" msgstr "" @@ -18177,5 +18221,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1877 build/trans_presets.java:2669 +#: build/trans_presets.java:1877 build/trans_presets.java:2681 msgid "Sports" msgstr "" @@ -19528,6 +19572,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "Religion" msgstr "Uskonto" @@ -19536,66 +19580,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "bahai" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "buddhist" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "christian" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "hindu" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jain" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jewish" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "muslim" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "sikh" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "spiritualist" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "taoist" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "zoroastrian" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "Denomination" msgstr "" @@ -19604,76 +19648,76 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "anglican" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "baptist" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "catholic" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "evangelical" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "jehovahs_witness" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "lutheran" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "methodist" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "mormon" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "orthodox" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "pentecostal" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "presbyterian" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "protestant" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "quaker" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "shia" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "sunni" msgstr "" @@ -19769,25 +19813,49 @@ #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2296 +#, fuzzy +msgid "Tower type" +msgstr "Torni" + +#. item "Man Made/Tower" combo "Tower type" +#: build/trans_presets.java:2296 +#, fuzzy +msgid "communication" +msgstr "Liittymä" + +#: build/trans_presets.java:2296 +#, fuzzy +msgid "observation" +msgstr "Tiedot" + +#. +#: build/trans_presets.java:2298 +#, fuzzy +msgid "Height (meters)" +msgstr "Enimmäispituus (metreinä)" + +#. item "Man Made/Tower" text "Operator" +#. +#: build/trans_presets.java:2302 msgid "Water Tower" msgstr "Vesitorni" #. item -#: build/trans_presets.java:2298 +#: build/trans_presets.java:2303 msgid "Edit Water Tower" msgstr "Muokkaa vesitornin ominaisuuksia" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2307 msgid "Gasometer" msgstr "Kaasukello" #. item -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2308 msgid "Edit Gasometer" msgstr "Muokkaa kaasukellon ominaisuuksia" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2307 +#: build/trans_presets.java:2312 msgid "Lighthouse" msgstr "Majakka" @@ -19795,10 +19863,10 @@ #. item #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2314 msgid "Edit Lighthouse" msgstr "Muokkaa majakan ominaisuuksia" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2318 msgid "Windmill" msgstr "Tuulimylly" @@ -19806,21 +19874,54 @@ #. item #. -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2320 msgid "Edit Windmill" msgstr "Muokkaa tuulimyllyn ominaisuuksia" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2319 +#: build/trans_presets.java:2324 msgid "Pipeline" msgstr "Putki" #. item -#. -#: build/trans_presets.java:2321 +#. +#: build/trans_presets.java:2327 msgid "Edit Pipeline" msgstr "Muokkaa putken ominaisuuksia" -#. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2330 +#, fuzzy +msgid "oil" +msgstr "fossiilinen polttoaine" + +#: build/trans_presets.java:2330 build/trans_presets.java:2372 +msgid "gas" +msgstr "kaasu" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "sewage" +msgstr "käyttö" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "heat" +msgstr "nummi" + +#: build/trans_presets.java:2330 +msgid "any substance" +msgstr "" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "underwater" +msgstr "vesi" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "overground" +msgstr "maanalainen" + +#: build/trans_presets.java:2333 msgid "Wastewater Plant" msgstr "Vedenpuhdistuslaitos" @@ -19830,10 +19931,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:2329 +#: build/trans_presets.java:2337 msgid "Edit Wastewater Plant" msgstr "Muokkaa vedenpuhdistuslaitoksen ominaisuuksia" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2333 +#: build/trans_presets.java:2341 msgid "Crane" msgstr "Nosturi" @@ -19841,10 +19942,10 @@ #. item #. -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2343 msgid "Edit Crane" msgstr "Muokkaa nosturin ominaisuuksia" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2347 msgid "Beacon" msgstr "Loisto" @@ -19852,10 +19953,10 @@ #. item #. -#: build/trans_presets.java:2341 +#: build/trans_presets.java:2349 msgid "Edit Beacon" msgstr "" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2353 msgid "Survey Point" msgstr "" @@ -19863,10 +19964,10 @@ #. item #. -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2355 msgid "Edit Survey Point" msgstr "" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2359 msgid "Surveillance" msgstr "Valvontakamera" @@ -19874,5 +19975,5 @@ #. item #. -#: build/trans_presets.java:2353 +#: build/trans_presets.java:2361 msgid "Edit Surveillance Camera" msgstr "Muokkaa valvontakameran ominaisuuksia" @@ -19880,5 +19981,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2366 msgid "Power Generator" msgstr "" @@ -19888,39 +19989,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:2362 +#: build/trans_presets.java:2370 msgid "Edit Power Generator" msgstr "" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "wind" msgstr "tuuli" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "hydro" msgstr "vesivoima" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "fossil" msgstr "fossiilinen polttoaine" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "nuclear" msgstr "ydinvoima" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "coal" msgstr "kivihiili" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "photovoltaic" msgstr "" -#: build/trans_presets.java:2364 -msgid "gas" -msgstr "kaasu" - #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2375 msgid "Power Station" msgstr "" @@ -19929,10 +20026,10 @@ #. -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2378 msgid "Edit Power Station" msgstr "" -#. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2374 +#. item "Man Made/Power Station" text "Reference" +#: build/trans_presets.java:2384 msgid "Power Sub Station" msgstr "Muuntamoasema" @@ -19941,5 +20038,5 @@ #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2387 msgid "Edit Power Sub Station" msgstr "Muokkaa muuntamoaseman ominaisuuksia" @@ -19947,10 +20044,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2380 build/trans_presets.java:2396 +#: build/trans_presets.java:2390 build/trans_presets.java:2407 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2382 +#: build/trans_presets.java:2392 msgid "Power Tower" msgstr "Korkeajännitelinjan torni" @@ -19961,11 +20058,26 @@ #. 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:2387 +#: build/trans_presets.java:2397 msgid "Edit Power Tower" msgstr "Muokkaa korkeajännitelinjan tornin ominaisuuksia" -#. item "Man Made/Power Tower" label "Edit Power Tower" -#. -#: build/trans_presets.java:2390 +#. item "Man Made/Power Tower" combo "Type" +#: build/trans_presets.java:2398 +#, fuzzy +msgid "tower" +msgstr "Torni" + +#: build/trans_presets.java:2398 +#, fuzzy +msgid "pole" +msgstr "Rooli" + +#: build/trans_presets.java:2399 +#, fuzzy +msgid "Tower reference" +msgstr "Asetukset" + +#. item "Man Made/Power Tower" text "Tower reference" +#: build/trans_presets.java:2401 msgid "Power Line" msgstr "Sähkölinja" @@ -19974,40 +20086,83 @@ #. -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2404 msgid "Edit Power Line" msgstr "Muokkaa sähkölinjan ominaisuuksia" +#. item "Man Made/Power Line" label "Edit Power Line" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "Line type" +msgstr "tyyppi" + +#. item "Man Made/Power Line" combo "Line type" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "line" +msgstr "Putki" + +#: build/trans_presets.java:2405 +#, fuzzy +msgid "minor_line" +msgstr "moottoritien_ramppi" + #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2408 msgid "Voltage" msgstr "Jännite" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2398 -msgid "Amount of Wires" +#: build/trans_presets.java:2409 +#, fuzzy +msgid "Amount of Cables" msgstr "Johtojen määrä" -#. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2401 +#. item "Man Made/Power Line" text "Amount of Cables" +#: build/trans_presets.java:2410 +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:2410 +#, fuzzy +msgid "single" +msgstr "Kulma" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "double" +msgstr "Kuulapeli" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "triple" +msgstr "Tiedosto" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "quad" +msgstr "louhos" + +#: build/trans_presets.java:2413 msgid "Amenities" msgstr "" #. group "Amenities" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2414 msgid "Toilets" msgstr "Käymälä" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2409 build/trans_presets.java:2525 +#: build/trans_presets.java:2421 build/trans_presets.java:2537 msgid "Note" msgstr "" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2411 +#: build/trans_presets.java:2423 msgid "Post Box" msgstr "Postilaatikko" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2428 msgid "Telephone" msgstr "Puhelin" @@ -20016,5 +20171,5 @@ #. -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2431 msgid "Edit Telephone" msgstr "Muokkaa puhelimen ominaisuuksia" @@ -20022,5 +20177,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2422 build/trans_presets.java:2526 +#: build/trans_presets.java:2434 build/trans_presets.java:2538 msgid "Coins" msgstr "Kolikot" @@ -20028,5 +20183,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2423 build/trans_presets.java:2527 +#: build/trans_presets.java:2435 build/trans_presets.java:2539 msgid "Notes" msgstr "" @@ -20034,5 +20189,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2424 build/trans_presets.java:2528 +#: build/trans_presets.java:2436 build/trans_presets.java:2540 msgid "Electronic purses and Charge cards" msgstr "" @@ -20040,5 +20195,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2425 build/trans_presets.java:2529 +#: build/trans_presets.java:2437 build/trans_presets.java:2541 msgid "Debit cards" msgstr "" @@ -20046,15 +20201,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2426 build/trans_presets.java:2530 +#: build/trans_presets.java:2438 build/trans_presets.java:2542 msgid "Credit cards" msgstr "Luottokortit" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2439 msgid "Telephone cards" msgstr "Puhelinkortit" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2429 +#: build/trans_presets.java:2441 msgid "Recycling" msgstr "Kierrätys" @@ -20063,5 +20218,5 @@ #. -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2444 msgid "Edit Recycling station" msgstr "Muokkaa kierrätyspisteen ominaisuuksia" @@ -20069,35 +20224,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2446 msgid "Batteries" msgstr "Paristot" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2435 +#: build/trans_presets.java:2447 msgid "Cans" msgstr "Peltitölkit" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2448 msgid "Clothes" msgstr "Vaatteet" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2437 +#: build/trans_presets.java:2449 msgid "Glass" msgstr "Lasi" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2450 msgid "Paper" msgstr "Paperi" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2451 msgid "Scrap Metal" msgstr "Romumetalli" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2453 msgid "Bench" msgstr "Penkki" @@ -20106,31 +20261,31 @@ #. #. -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2456 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "stone" msgstr "" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "plastic" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "black" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "brown" msgstr "" @@ -20201,5 +20356,5 @@ #. #. -#: build/trans_presets.java:2446 build/trans_style.java:3063 +#: build/trans_presets.java:2458 build/trans_style.java:3063 #: build/trans_style.java:3071 build/trans_style.java:3079 #: build/trans_style.java:3087 build/trans_style.java:3135 @@ -20209,27 +20364,27 @@ msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "red" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "blue" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "white" msgstr "" -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2459 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2461 msgid "Hunting Stand" msgstr "Metsästyslava" #. item -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2462 msgid "Edit Hunting Stand" msgstr "Muokkaa metsästyslavan ominaisuuksia" @@ -20238,30 +20393,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2452 build/trans_presets.java:2914 +#: build/trans_presets.java:2464 build/trans_presets.java:2926 msgid "Height" msgstr "Korkeus" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "low" msgstr "" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "half" msgstr "" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "full" msgstr "täysi" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2466 msgid "Hide" msgstr "" -#: build/trans_presets.java:2455 +#: build/trans_presets.java:2467 msgid "Lock" msgstr "" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2469 msgid "Fountain" msgstr "Lähde" @@ -20270,10 +20425,10 @@ #. -#: build/trans_presets.java:2460 +#: build/trans_presets.java:2472 msgid "Edit Fountain" msgstr "Muokkaa lähteen ominaisuuksia" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2476 msgid "Drinking Water" msgstr "Juomavesi" @@ -20282,10 +20437,10 @@ #. -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2479 msgid "Edit Drinking Water" msgstr "Muokkaa juomaveden ominaisuuksia" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2471 +#: build/trans_presets.java:2483 msgid "Baby Hatch" msgstr "" @@ -20293,33 +20448,33 @@ #. item #. -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2485 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2491 msgid "Shops" msgstr "Kaupat" #. group "Shops" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2492 msgid "Supermarket" msgstr "" #. item -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2493 msgid "Edit Supermarket" msgstr "" -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2498 msgid "Chemist" msgstr "" #. item -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2499 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2504 msgid "Convenience Store" msgstr "Lähikauppa" @@ -20327,9 +20482,9 @@ #. item #. -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2506 msgid "Edit Convenience Store" msgstr "Muokkaa lähikaupan tietoja" -#: build/trans_presets.java:2499 +#: build/trans_presets.java:2511 msgid "Kiosk" msgstr "Kioski" @@ -20337,27 +20492,27 @@ #. item #. -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2513 msgid "Edit Kiosk" msgstr "Muokkaa kioskin ominaisuuksia" -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2518 msgid "Book Store" msgstr "" #. item -#: build/trans_presets.java:2507 +#: build/trans_presets.java:2519 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2524 msgid "Travel Agency" msgstr "" #. item -#: build/trans_presets.java:2513 +#: build/trans_presets.java:2525 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2518 +#: build/trans_presets.java:2530 msgid "Vending machine" msgstr "Automaatti" @@ -20365,5 +20520,5 @@ #. item #. -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2532 msgid "Edit Vending machine" msgstr "Muokkaa automaatin tietoja" @@ -20371,88 +20526,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "Vending products" msgstr "Automaatin tuotteet" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_tickets" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "parking_tickets" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "food" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "drinks" msgstr "juomat" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "sweets" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "cigarettes" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "photos" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "animal_food" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "news_papers" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "toys" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "stamps" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "SIM-cards" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "telephone_vouchers" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "condoms" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "tampons" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "excrement_bags" msgstr "" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2543 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2545 msgid "Butcher" msgstr "Lihakauppa" @@ -20460,9 +20615,9 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2547 msgid "Edit Butcher" msgstr "Muokkaa lihakaupan ominaisuuksia" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2552 msgid "Baker" msgstr "Leipomo" @@ -20470,9 +20625,9 @@ #. item #. -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2554 msgid "Edit Baker" msgstr "Muokkaa leipomon ominaisuuksia" -#: build/trans_presets.java:2547 +#: build/trans_presets.java:2559 msgid "Florist" msgstr "" @@ -20480,18 +20635,18 @@ #. item #. -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2561 msgid "Edit Florist" msgstr "" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2566 msgid "Organic" msgstr "Luomukauppa" #. item -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2567 msgid "Edit Organic Shop" msgstr "Muokkaa luomukaupan ominaisuuksia" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2572 msgid "Alcohol" msgstr "" @@ -20499,54 +20654,54 @@ #. item #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2574 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2579 msgid "Beverages" msgstr "" #. item -#: build/trans_presets.java:2568 +#: build/trans_presets.java:2580 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2573 +#: build/trans_presets.java:2585 msgid "Computer" msgstr "" #. item -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2586 msgid "Edit Computer Shop" msgstr "" -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2591 msgid "Electronics" msgstr "" #. item -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2592 msgid "Edit Electronics Shop" msgstr "" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2597 msgid "Hifi" msgstr "" #. item -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2598 msgid "Edit Hifi Shop" msgstr "" -#: build/trans_presets.java:2591 +#: build/trans_presets.java:2603 msgid "Furniture" msgstr "" #. item -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2604 msgid "Edit Furniture Shop" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2609 msgid "Garden Centre" msgstr "" @@ -20554,9 +20709,9 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2611 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2616 msgid "Hardware" msgstr "" @@ -20564,9 +20719,9 @@ #. item #. -#: build/trans_presets.java:2606 +#: build/trans_presets.java:2618 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2623 msgid "Do-it-yourself-store" msgstr "Tee-se-itse-kauppa" @@ -20574,54 +20729,54 @@ #. item #. -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2625 msgid "Edit Do-it-yourself-store" msgstr "Muokkaa tee-se-itse-kaupan ominaisuuksia" -#: build/trans_presets.java:2618 +#: build/trans_presets.java:2630 msgid "Stationery" msgstr "" #. item -#: build/trans_presets.java:2619 +#: build/trans_presets.java:2631 msgid "Edit Stationery Shop" msgstr "" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2636 msgid "Hairdresser" msgstr "Kampaamo" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2637 msgid "Edit Hairdresser" msgstr "Muokkaa kampaamon ominaisuuksia" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2642 msgid "Shoes" msgstr "" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2643 msgid "Edit Shoe Shop" msgstr "" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2648 msgid "Toys" msgstr "" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2649 msgid "Edit Toy Shop" msgstr "" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2654 msgid "Video" msgstr "" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2655 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2660 msgid "Dry Cleaning" msgstr "Kuivapesula" @@ -20629,9 +20784,9 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2662 msgid "Edit Dry Cleaning" msgstr "Muokkaa kuivapesulan ominaisuuksia" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2667 msgid "Laundry" msgstr "Pesula" @@ -20639,9 +20794,9 @@ #. item #. -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2669 msgid "Edit Laundry" msgstr "Muokkaa pesulan ominaisuuksia" -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2674 msgid "Outdoor" msgstr "" @@ -20649,28 +20804,28 @@ #. item #. -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2676 msgid "Edit Outdoor Shop" msgstr "" #. item -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2682 msgid "Edit Sports Shop" msgstr "" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2687 msgid "Optician" msgstr "" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2688 msgid "Edit Optician" msgstr "Muokkaa optikon ominaisuuksia" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2695 msgid "Cash" msgstr "Raha" #. group "Cash" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2696 msgid "Bank" msgstr "Pankki" @@ -20678,14 +20833,14 @@ #. item #. -#: build/trans_presets.java:2686 +#: build/trans_presets.java:2698 msgid "Edit Bank" msgstr "Muokkaa pankin ominaisuuksia" -#: build/trans_presets.java:2691 build/trans_presets.java:2700 +#: build/trans_presets.java:2703 build/trans_presets.java:2712 msgid "Automated Teller Machine" msgstr "Pankkiautomaatti" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2705 msgid "Money Exchange" msgstr "Rahanvaihto" @@ -20693,5 +20848,5 @@ #. item #. -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2707 msgid "Edit Money Exchange" msgstr "Muokkaa rahanvaihdon ominaisuuksia" @@ -20699,15 +20854,15 @@ #. item #. -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2714 msgid "Edit Automated Teller Machine" msgstr "Muokkaa pankkiautomaatin ominaisuuksia" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2719 msgid "Health" msgstr "Terveys" #. group "Health" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2720 msgid "Doctors" msgstr "Lääkäri" @@ -20715,18 +20870,18 @@ #. item #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2722 msgid "Edit Doctors" msgstr "Muokkaa lääkärin ominaisuuksia" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2727 msgid "Dentist" msgstr "Hammaslääkäri" #. item -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2728 msgid "Edit Dentist" msgstr "Muokkaa hammaslääkärin ominaisuuksia" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2733 msgid "Pharmacy" msgstr "Apteekki" @@ -20734,5 +20889,5 @@ #. item #. -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2735 msgid "Edit Pharmacy" msgstr "Muokkaa apteekin ominaisuuksia" @@ -20740,9 +20895,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2737 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2741 msgid "Hospital" msgstr "Sairaala" @@ -20750,10 +20905,10 @@ #. item #. -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2743 msgid "Edit Hospital" msgstr "Muokkaa sairaalan ominaisuuksia" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2747 msgid "Emergency Access Point" msgstr "" @@ -20762,5 +20917,5 @@ #. -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2750 msgid "Edit Emergency Access Point" msgstr "" @@ -20769,20 +20924,20 @@ #. #. -#: build/trans_presets.java:2741 +#: build/trans_presets.java:2753 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2742 +#: build/trans_presets.java:2754 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2756 msgid "Phone Number" msgstr "Puhelinnumero" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2757 msgid "(Use international code, like +12-345-67890)" msgstr "" @@ -20790,5 +20945,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2760 msgid "Veterinary" msgstr "Eläinlääkäri" @@ -20797,59 +20952,59 @@ #. -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2763 msgid "Edit Veterinary" msgstr "Muokkaa eläinlääkärin ominaisuuksia" -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2770 msgid "Geography" msgstr "" #. group "Places" -#: build/trans_presets.java:2760 +#: build/trans_presets.java:2772 msgid "Continent" msgstr "Maanosa" #. item -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2773 msgid "Edit Continent" msgstr "Muokkaa maanosan ominaisuuksia" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2766 +#: build/trans_presets.java:2778 msgid "Country" msgstr "Maa" #. item -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2779 msgid "Edit Country" msgstr "Muokkaa maan ominaisuuksia" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2784 msgid "State" msgstr "Osavaltio" #. item -#: build/trans_presets.java:2773 +#: build/trans_presets.java:2785 msgid "Edit State" msgstr "Muokkaa osavaltion ominaisuuksia" #. item "Places/State" text "Name" -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2790 msgid "Region" msgstr "Seutu" #. item -#: build/trans_presets.java:2779 +#: build/trans_presets.java:2791 msgid "Edit Region" msgstr "" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2796 msgid "County" msgstr "" #. item -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2797 msgid "Edit County" msgstr "" @@ -20857,15 +21012,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2803 msgid "City" msgstr "Iso kaupunki" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2804 msgid "Edit City" msgstr "Muokkaa kaupungin ominaisuuksia" #. item "Places/City" text "Name" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2809 msgid "Town" msgstr "Kaupunki" @@ -20873,10 +21028,10 @@ #. item #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2811 msgid "Edit Town" msgstr "Muokkaa kaupungin ominaisuuksia" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2804 +#: build/trans_presets.java:2816 msgid "Suburb" msgstr "Kaupunginosa" @@ -20884,25 +21039,25 @@ #. item #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2818 msgid "Edit Suburb" msgstr "Muokkaa kaupunginosan ominaisuuksia" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2823 msgid "Village" msgstr "Kunta" #. item -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2824 msgid "Edit Village" msgstr "Muokkaa kunnan ominaisuuksia" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2817 +#: build/trans_presets.java:2829 msgid "Hamlet" msgstr "Kylä" #. item -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2830 msgid "Edit Hamlet" msgstr "Muokkaa kylän ominaisuuksia" @@ -20910,5 +21065,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2824 +#: build/trans_presets.java:2836 msgid "Locality" msgstr "" @@ -20916,10 +21071,10 @@ #. item #. -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2838 msgid "Edit Locality" msgstr "" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2843 msgid "Island" msgstr "Saari" @@ -20927,10 +21082,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2845 msgid "Edit Island" msgstr "Muokkaa saaren ominaisuuksia" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2838 +#: build/trans_presets.java:2850 msgid "Islet" msgstr "" @@ -20938,5 +21093,5 @@ #. item #. -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2852 msgid "Edit Islet" msgstr "" @@ -20944,5 +21099,5 @@ #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2858 msgid "Cave Entrance" msgstr "Luolan suuaukko" @@ -20950,10 +21105,10 @@ #. item #. -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2860 msgid "Edit Cave Entrance" msgstr "Muokkaa luolan suuaukon ominaisuuksia" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2864 msgid "Peak" msgstr "Huippu" @@ -20961,10 +21116,10 @@ #. item #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2866 msgid "Edit Peak" msgstr "Muokkaa huipun ominaisuuksia" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2871 msgid "Glacier" msgstr "Jäätikkö" @@ -20972,10 +21127,10 @@ #. item #. -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2873 msgid "Edit Glacier" msgstr "Muokkaa jäätikön ominaisuuksia" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2878 msgid "Volcano" msgstr "Tulivuori" @@ -20983,70 +21138,70 @@ #. item #. -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2880 msgid "Edit Volcano" msgstr "Muokkaa tulivuoren ominaisuuksia" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2886 msgid "Boundaries" msgstr "Rajat" #. group "Boundaries" -#: build/trans_presets.java:2875 +#: build/trans_presets.java:2887 msgid "National" msgstr "Kansallinen" #. item -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2888 msgid "Edit National Boundary" msgstr "Muokkaa kansallisen rajan ominaisuuksia" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2881 +#: build/trans_presets.java:2893 msgid "Administrative" msgstr "Hallinnollinen" #. item -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2894 msgid "Edit Administrative Boundary" msgstr "Muokkaa hallinnollisen rajan ominaisuuksia" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2887 +#: build/trans_presets.java:2899 msgid "Civil" msgstr "" #. item -#: build/trans_presets.java:2888 +#: build/trans_presets.java:2900 msgid "Edit Civil Boundary" msgstr "" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2893 +#: build/trans_presets.java:2905 msgid "Political" msgstr "" #. item -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2906 msgid "Edit Political Boundary" msgstr "Muokkaa poliittisen rajan ominaisuuksia" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2911 msgid "National park" msgstr "" #. item -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2912 msgid "Edit National Park Boundary" msgstr "Muokkaa kansallispuiston rajan ominaisuuksia" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2918 msgid "Land use" msgstr "Maankäyttö" #. group "Land use" -#: build/trans_presets.java:2907 +#: build/trans_presets.java:2919 msgid "Tree" msgstr "Puu" @@ -21055,15 +21210,15 @@ #. -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2922 msgid "Edit Tree" msgstr "Muokkaa puun ominaisuuksia" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2915 +#: build/trans_presets.java:2927 msgid "Botanical Name" msgstr "Kasvitieteellinen nimi" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2929 msgid "Wood" msgstr "Metsä" @@ -21072,5 +21227,5 @@ #. -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2932 msgid "Edit Wood" msgstr "Muokkaa metsän ominaisuuksia" @@ -21078,17 +21233,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "coniferous" msgstr "havumetsä" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "deciduous" msgstr "lehtimetsä" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "mixed" msgstr "sekametsä" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2937 msgid "Forest" msgstr "Talousmetsä" @@ -21097,14 +21252,14 @@ #. -#: build/trans_presets.java:2928 +#: build/trans_presets.java:2940 msgid "Edit Forest Landuse" msgstr "Muokkaa talousmetsän ominaisuuksia" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2946 msgid "Nature Reserve" msgstr "Luonnonsuojelualue" #. item -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2947 msgid "Edit Nature Reserve" msgstr "" @@ -21112,25 +21267,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2952 msgid "Scree" msgstr "Kivikko, rakka" #. item -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2953 msgid "Edit Scree" msgstr "Muokkaa kivikon ominaisuuksia" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2957 msgid "Scrub" msgstr "Pusikko" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:2958 msgid "Edit Scrub" msgstr "Muokkaa pusikon ominaisuuksia" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2962 msgid "Fell" msgstr "Tunturi" @@ -21138,10 +21293,10 @@ #. item #. -#: build/trans_presets.java:2952 +#: build/trans_presets.java:2964 msgid "Edit Fell" msgstr "Muokkaa tunturin ominaisuuksia" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2968 msgid "Heath" msgstr "Nummi" @@ -21149,5 +21304,5 @@ #. item #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2970 msgid "Edit Heath" msgstr "Muokkaa nummen ominaisuuksia" @@ -21155,5 +21310,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2975 msgid "Farmyard" msgstr "Maatilan piha/työskentelyalue (muu kuin pelto)" @@ -21162,45 +21317,45 @@ #. -#: build/trans_presets.java:2966 +#: build/trans_presets.java:2978 msgid "Edit Farmyard Landuse" msgstr "Muokkaa maatilan pihan ominaisuuksia" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2983 msgid "Farmland" msgstr "Peltoalueet" #. item -#: build/trans_presets.java:2972 +#: build/trans_presets.java:2984 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2977 +#: build/trans_presets.java:2989 msgid "Meadow" msgstr "" #. item -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2990 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:2995 msgid "Vineyard" msgstr "Viinitarha" #. item -#: build/trans_presets.java:2984 +#: build/trans_presets.java:2996 msgid "Edit Vineyard Landuse" msgstr "Muokkaa viinitarhan ominaisuuksia" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3001 msgid "Allotments" msgstr "Siirtolapuutarha" #. item -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3002 msgid "Edit Allotments Landuse" msgstr "Muokkaa siirtolapuutarhan ominaisuuksia" @@ -21208,25 +21363,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3008 msgid "Garden" msgstr "Puutarha" #. item -#: build/trans_presets.java:2997 +#: build/trans_presets.java:3009 msgid "Edit Garden" msgstr "" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3013 msgid "Grass" msgstr "Ruoho" #. item -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3014 msgid "Edit Grass Landuse" msgstr "Muokkaa ruohon ominaisuuksia" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3019 msgid "Village Green" msgstr "" @@ -21234,10 +21389,10 @@ #. item #. -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3021 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3026 msgid "Common" msgstr "" @@ -21245,20 +21400,20 @@ #. item #. -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3028 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3032 msgid "Park" msgstr "Puisto" #. item -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3033 msgid "Edit Park" msgstr "Muokkaa puiston ominaisuuksia" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3037 msgid "Recreation Ground" msgstr "" @@ -21266,5 +21421,5 @@ #. item #. -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3039 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -21272,15 +21427,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3033 +#: build/trans_presets.java:3045 msgid "Residential area" msgstr "Asuinalue" #. item -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3046 msgid "Edit Residential Landuse" msgstr "Muokkaa asuinalueen ominaisuuksia" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3051 msgid "Graveyard" msgstr "Hautausmaa (pieni)" @@ -21288,9 +21443,9 @@ #. item #. -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3053 msgid "Edit Graveyard" msgstr "Muokkaa pienen hautausmaan ominaisuuksia" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3059 msgid "Cemetery" msgstr "Hautausmaa" @@ -21298,39 +21453,39 @@ #. item #. -#: build/trans_presets.java:3049 +#: build/trans_presets.java:3061 msgid "Edit Cemetery Landuse" msgstr "Muokkaa hautausmaan ominaisuuksia" -#: build/trans_presets.java:3056 +#: build/trans_presets.java:3068 msgid "Retail" msgstr "Kaupallinen" #. item -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3069 msgid "Edit Retail Landuse" msgstr "Muokkaa kaupallisen alueen ominaisuuksia" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3062 +#: build/trans_presets.java:3074 msgid "Commercial" msgstr "Toimistoalue" #. item -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3075 msgid "Edit Commercial Landuse" msgstr "Muokkaa toimistoalueen ominaisuuksia" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3068 +#: build/trans_presets.java:3080 msgid "Industrial" msgstr "Teollisuusalue" #. item -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3081 msgid "Edit Industrial Landuse" msgstr "Muokkaa teollisuusalueen ominaisuuksia" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3086 msgid "Railway land" msgstr "Rata-alue" @@ -21338,15 +21493,15 @@ #. item #. -#: build/trans_presets.java:3076 +#: build/trans_presets.java:3088 msgid "Edit Railway Landuse" msgstr "Muokkaa rata-alueen ominaisuuksia" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3081 +#: build/trans_presets.java:3093 msgid "Military" msgstr "Sotilasvoimat" #. item -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3094 msgid "Edit Military Landuse" msgstr "Muokkaa sotilasvoimien maa-alueen ominaisuuksia" @@ -21354,55 +21509,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3100 msgid "Construction area" msgstr "Rakennustyömaa" #. item -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3101 msgid "Edit Construction Landuse" msgstr "Muokkaa rakennustyömaan ominaisuuksia" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3094 +#: build/trans_presets.java:3106 msgid "Brownfield" msgstr "Purettuja rakennuksia" #. item -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3107 msgid "Edit Brownfield Landuse" msgstr "Muokkaa purettujen rakennusten alueen ominaisuuksia" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3100 +#: build/trans_presets.java:3112 msgid "Greenfield" msgstr "Rakentamiselle raivattu alue" #. item -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3113 msgid "Edit Greenfield Landuse" msgstr "Muokkaa rakentamiselle raivatun alueen ominaisuuksia" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3118 msgid "Landfill" msgstr "Kaatopaikka" #. item -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3119 msgid "Edit Landfill Landuse" msgstr "Muokkaa kaatopaikan ominaisuuksia" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3124 msgid "Quarry" msgstr "Louhos" #. item -#: build/trans_presets.java:3113 +#: build/trans_presets.java:3125 msgid "Edit Quarry Landuse" msgstr "Muokkaa louhoksen ominaisuuksia" #. group "Relations" -#: build/trans_presets.java:3122 +#: build/trans_presets.java:3134 msgid "Multipolygon" msgstr "" @@ -21412,5 +21567,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:3126 +#: build/trans_presets.java:3138 msgid "Edit Multipolygon" msgstr "" @@ -21419,10 +21574,10 @@ #. #. -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3144 msgid "outer segment" msgstr "" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3145 msgid "inner segment" msgstr "" @@ -21430,5 +21585,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3148 msgid "Turn restriction" msgstr "" @@ -21437,5 +21592,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3151 msgid "Edit Turn Restriction" msgstr "" @@ -21443,34 +21598,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "Restriction" msgstr "Kielto" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_straight_on" msgstr "" @@ -21479,15 +21634,15 @@ #. #. -#: build/trans_presets.java:3146 +#: build/trans_presets.java:3158 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3159 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3148 +#: build/trans_presets.java:3160 msgid "to way" msgstr "" @@ -21495,5 +21650,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3151 +#: build/trans_presets.java:3163 msgid "Route" msgstr "" @@ -21502,5 +21657,5 @@ #. -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3166 msgid "Edit Route" msgstr "" @@ -21508,5 +21663,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "Route type" msgstr "" @@ -21578,5 +21733,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:233 +#: build/trans_presets.java:3168 build/trans_style.java:233 #: build/trans_style.java:683 build/trans_style.java:906 #: build/trans_style.java:914 build/trans_style.java:922 @@ -21585,17 +21740,17 @@ msgstr "polkupyörä" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "bus" msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "road" msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ferry" msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ski" msgstr "" @@ -21648,5 +21803,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:247 +#: build/trans_presets.java:3168 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -21655,13 +21810,13 @@ msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "hiking" msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "tram" msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "detour" msgstr "" @@ -21675,10 +21830,10 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:1206 +#: build/trans_presets.java:3168 build/trans_style.java:1206 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3159 +#: build/trans_presets.java:3171 msgid "Symbol description" msgstr "" @@ -21686,31 +21841,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3174 msgid "Network" msgstr "" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "proposed" msgstr "" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "alternate" msgstr "" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "temporary" msgstr "" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "connection" msgstr "" -#: build/trans_presets.java:3165 +#: build/trans_presets.java:3177 msgid "Color (hex)" msgstr "" @@ -21719,30 +21874,30 @@ #. #. -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3180 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3181 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3170 +#: build/trans_presets.java:3182 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3183 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3172 +#: build/trans_presets.java:3184 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3173 +#: build/trans_presets.java:3185 msgid "backward halt point" msgstr "" @@ -25722,5 +25877,5 @@ #: build/trans_validator.java:47 msgid "Unnamed unclassified highway" -msgstr "" +msgstr "Nimetön tie" #. way : W : highway == unclassified && name != * @@ -25801,5 +25956,5 @@ #: build/trans_validator.java:79 msgid "unusual tag combination" -msgstr "" +msgstr "poikkeuksellinen tagiyhdistelmä" #. FORMAT @@ -25879,4 +26034,17 @@ msgid "Czech UHUL:ORTOFOTO" msgstr "" + +#~ msgid "Combine ways with different memberships?" +#~ msgstr "Yhdistetäänkö polut, joilla on eriävät jäsenyydet?" + +#~ msgid "Combine Anyway" +#~ msgstr "Yhdistä silti" + +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "" +#~ "Valituilla poluilla on eriävät relaatiojäsenyydet. Haluatko silti " +#~ "yhdistää ne?" #~ msgid "Unknown version" Index: /applications/editors/josm/i18n/po/fr.po =================================================================== --- /applications/editors/josm/i18n/po/fr.po (revision 17821) +++ /applications/editors/josm/i18n/po/fr.po (revision 17822) @@ -6,7 +6,7 @@ "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-22 17:52+0200\n" -"PO-Revision-Date: 2009-09-22 14:32+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-09-28 16:38+0200\n" +"PO-Revision-Date: 2009-09-25 17:27+0000\n" +"Last-Translator: François Blondel \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: 2009-09-22 15:45+0000\n" +"X-Launchpad-Export-Date: 2009-09-28 14:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Language: French\n" @@ -65,8 +65,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250 @@ -89,9 +89,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -124,6 +124,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -140,7 +140,7 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:172 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 @@ -153,5 +153,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 @@ -182,5 +181,5 @@ #, java-format msgid "Ignoring malformed file URL: \"{0}\"" -msgstr "Ignorant l URL malformée du fichier : \"{0}\"" +msgstr "URL malformée ignorée dans le fichier : \"{0}\"" #: ../core/src/org/openstreetmap/josm/Main.java:459 @@ -192,4 +191,6 @@ msgid "Could not read file ''{0}''.
Error is:
{1}" msgstr "" +"Impossible de lire le fichier ''{0}''.
L’erreur est :
{1}" #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73 @@ -337,6 +338,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -346,6 +346,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 @@ -355,5 +355,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -364,5 +364,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180 @@ -371,5 +371,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -464,9 +464,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -498,10 +498,9 @@ msgstr "Veuillez sélectionner au moins quatre nœuds." -#. FIXME: not sure whether this fits in a dialog #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:85 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -611,5 +610,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 #, java-format msgid "File: {0}" @@ -631,39 +630,22 @@ msgstr "Téléchargement des ensembles de changements ouverts" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine Way" msgstr "Fusionner des chemins" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 msgid "Combine several ways into one." msgstr "Fusionner plusieurs chemins en un seul." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 -msgid "Combine ways with different memberships?" -msgstr "" -"Fusionner des chemins qui ne sont pas les mêmes membres d’une relation ?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -msgid "Combine Anyway" -msgstr "Fusionner quand même" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" -"Les chemins sélectionnés ne sont pas les mêmes membres d’une relation. " -"Voulez-vous encore les fusionner ?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 msgid "Change directions?" msgstr "Changer les directions ?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Reverse and Combine" msgstr "Inverser et fusionner" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -673,5 +655,5 @@ "la même direction. En retourner certaines ?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -681,10 +663,10 @@ "une seule chaîne de nœuds)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 #, java-format msgid "Combine {0} ways" msgstr "Fusionner {0} voies" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 msgid "Please select at least two ways to combine." msgstr "Veuillez sélectionner au moins deux chemins à fusionner." @@ -731,6 +713,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -795,5 +776,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -826,5 +807,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307 #, java-format msgid "There were {0} conflicts during import." @@ -842,5 +822,4 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Duplicate" @@ -871,10 +850,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:209 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Exporter en GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:208 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Exporter les données vers un fichier GPX." @@ -885,8 +864,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -951,5 +930,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 @@ -992,6 +971,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1082,18 +1060,18 @@ msgstr "Fusionne le calque courant avec un autre calque" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge Nodes" msgstr "Fusionner les nœuds" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 msgid "Merge nodes into the oldest one." msgstr "Fusionner les nœuds sur le plus ancien" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 msgid "Please select at least two nodes to merge." msgstr "Veuillez sélectionner au moins deux nœuds à fusionner." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -1101,5 +1079,5 @@ "encore utilisé" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 #, java-format msgid "Merge {0} nodes" @@ -1171,5 +1149,4 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350 msgid "New" msgstr "Nouveau" @@ -1277,10 +1254,10 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" -msgstr "Coller les étiquettes" +msgstr "Coller les attributs" #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." msgstr "" -"Appliquer les étiquettes de la mémoire tampon aux éléments sélectionnés." +"Appliquer les attributs de la mémoire tampon aux éléments sélectionnés." #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 @@ -1354,10 +1331,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Sauvegarder" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Sauvegarder les données actuelles." @@ -1414,10 +1391,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Enregistrer sous…" #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Sauvegarder les données actuelles dans un nouveau fichier." @@ -1462,5 +1439,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:961 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888 @@ -1711,14 +1688,14 @@ msgstr "La sélection est vide" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 msgid "Upload to OSM..." msgstr "Chargement vers OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload all changes to the OSM server." msgstr "Envoyer tous les changements sur le serveur OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 #, java-format msgid "" @@ -1729,23 +1706,23 @@ "les résoudre d'abord." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Rien à envoyer. Obtenez d’abord des données." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:171 msgid "No changes to upload." msgstr "Aucun changement à envoyer." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223 #, java-format msgid "Synchronize {0} {1} only" msgstr "Synchroniser {0} {1} seulement" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 msgid "Synchronize entire dataset" msgstr "Synchroniser tout le jeu de données" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:228 #, java-format msgid "" @@ -1767,17 +1744,17 @@ "
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:283 msgid "Conflict detected" msgstr "Conflit détecté" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:257 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 #, java-format msgid "Unexpected return value. Got {0}." msgstr "valeur inattendue retournée. Reçue {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:272 #, java-format msgid "" @@ -1793,5 +1770,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:306 #, java-format msgid "" @@ -1801,9 +1778,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 msgid "Changeset closed" msgstr "Ensemble de changement fermé" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" @@ -1811,26 +1788,31 @@ "Attention : erreur d’en-tête \"{0}\" ne correspond pas à la forme \"{1}\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "Erreur : l’en-tête \"{0}\" ne correspond pas au modèle \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:425 #, java-format msgid "Uploading failed.
{0}" msgstr "L’envoi a échoué.
{0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:434 msgid "Upload to OSM API failed" msgstr "L’envoi vers l’API OSM a échoué" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457 msgid "Updating primitive" msgstr "Mise à jour des primitives" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:514 #, java-format msgid "Uploading data for layer ''{0}''" msgstr "Envoi des données pour le calque ''{0}''" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1918,13 +1900,13 @@ msgstr "Avancer plus lentement" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34 msgid "Downloading GPS data" msgstr "Téléchargement des données GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57 msgid "Downloaded GPX Data" msgstr "Données GPX téléchargées" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87 msgid "Raw GPS data" msgstr "Données GPS brutes" @@ -1941,4 +1923,9 @@ "Ignore l'exception car le téléchargement a été annulé. L'exception était : " "{0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 +#, fuzzy +msgid "No data found in this area." +msgstr "Pas de données sur le périphérique" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2561,5 +2548,5 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53 msgid "Relation ..." -msgstr "" +msgstr "Relation ..." #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54 @@ -2569,5 +2556,5 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87 msgid "Cycling dependencies" -msgstr "" +msgstr "Dépendances cycliques." #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 @@ -2668,9 +2655,9 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 -#, fuzzy, java-format +#, java-format msgid "" "Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitive ''{1}''." -msgstr "un conflit est déjà enregistré pour la primitive \"{0}\"" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70 @@ -2679,9 +2666,9 @@ msgstr "Ajouter conflit pour ''{0}''" -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 +#, fuzzy, java-format +msgid "" +"Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" "Impossible d’annuler la commande \"{0}\" car le calque \"{1}\" n’est plus " @@ -2732,5 +2719,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Delete from relation" msgstr "Supprimer de la relation" @@ -2787,14 +2774,15 @@ msgstr[1] "Déplacer {0} nœuds" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 -msgid "Purging 1 primitive" -msgstr "Suppression d’une primitive" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 -#, java-format -msgid "removing reference from way {0}" -msgstr "suppression de la référence du chemin {0}" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 +#, fuzzy, java-format +msgid "Purged object ''{0}''" +msgstr "Déplacer des objets {0}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 +#, fuzzy, java-format +msgid "Purged {0} objects" +msgstr "Changer {0} objet." + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 #, java-format msgid "" @@ -2805,7 +2793,7 @@ "inférieur à 2. Il est actuellement de {1}" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203 -#, java-format -msgid "removing reference from relation {0}" +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 +#, fuzzy, java-format +msgid "Removing reference from relation {0}" msgstr "suppression de la référence de la relation {0}" @@ -2814,4 +2802,11 @@ msgid "Resolve conflicts in member list of relation {0}" msgstr "Résoudre les conflits de la liste des membres de la relation {0}" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +msgstr "" +"Impossible d’annuler la commande \"{0}\" car le calque \"{1}\" n’est plus " +"présent." #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 @@ -2950,5 +2945,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:144 msgid "Automatic tag correction" -msgstr "Correction automatique d’étiquette" +msgstr "Correction automatique d’attribut" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:263 @@ -3161,24 +3156,24 @@ msgstr "F" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Error: {0}" msgstr "Erreur : {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Warning: {0}" msgstr "Attention : {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3186,5 +3181,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3210,6 +3205,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:244 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3268,107 +3263,100 @@ msgstr "Le multipolygone \"{0}\" n'est pas fermé." -#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed -#. TODO Remove useless nullcheck when RelationMember.member is encalupsed -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855 -msgid "Empty member in relation." -msgstr "Membre vide dans la relation." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:850 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Membre \"{0}\" supprimé de la relation." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:861 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Chemin \"{0}\" comporte moins de deux points." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 msgid "More than one \"from\" way found." msgstr "Plus d'un chemin d'origine trouvé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:607 msgid "More than one \"to\" way found." msgstr "Plus d'un chemin \"destination\" trouvé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:613 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627 msgid "More than one \"via\" found." msgstr "Plus d'un \"via\" trouvé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:632 #, java-format msgid "Unknown role ''{0}''." msgstr "Rôle inconnu \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Type de membre inconnu pour \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:641 msgid "No \"from\" way found." msgstr "Pas de chemin d'origine trouvé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645 msgid "No \"to\" way found." msgstr "Pas de chemin \"destination\" trouvé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:649 msgid "No \"via\" node or way found." msgstr "Pas de noeud ou de chemin \"via\" trouvé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:658 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" "Le chemin d'origine ne commence ou fini pas par un nœud \"de passage\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:662 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "Le chemin \"to\" ne commence ou ne fini pas à un noeud \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Le chemin \"from\" ne commence ou ne fini pas par le chemin \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "Le chemin \"to\" ne commence ou ne fini pas par le chemin \"via\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816 #, java-format msgid "Style for restriction {0} not found." msgstr "Le style de la restriction {0} n'a pas été trouvé." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:870 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Pas de rôle utile \"{0}\" pour le chemin \"{1}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:882 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Non-chemin \"{0}\" dans le multipolygone." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:940 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Pas de chemin extérieur pour le multipolygone \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1029 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Intersection entre les chemins \"{0}\" et \"{1}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1041 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Le chemin intérieur \"{0}\" est à l'extérieur." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1094 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." @@ -3376,14 +3364,14 @@ "Le style du chemin intérieur \"{0}\" est équivalent à un multipolygone." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1120 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Le style du chemin extérieur \"{0}\" ne concorde pas." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1324 msgid "untagged" msgstr "non étiqueté" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1325 msgid "text" msgstr "texte" @@ -3408,5 +3396,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:249 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 @@ -3417,5 +3405,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 @@ -3444,5 +3432,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:169 msgid "background" msgstr "arrière-plan" @@ -3539,5 +3527,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "railway" msgstr "voie ferrée" @@ -3593,9 +3581,14 @@ msgstr "Requête incorrecte" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +#, fuzzy +msgid "Not Found" +msgstr "Pas connecté" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 msgid "Unknown host" msgstr "Hôte inconnu" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:247 msgid "Primitive already deleted" msgstr "Primitive déjà supprimée" @@ -4015,5 +4008,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" -msgstr "Aucun conflit d’étiquette n'est résolu" +msgstr "Aucun conflit d’attribut n'est résolu" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 @@ -4025,5 +4018,5 @@ #, java-format msgid "{0} pending tag conflicts to be resolved" -msgstr "{0} étiquette(s) en conflit à résoudre" +msgstr "{0} conflit(s) d’attribut à résoudre" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 @@ -4550,5 +4543,5 @@ msgid "The merged dataset will not include a tag with key {0}" msgstr "" -"Le jeu de données de la fusion n’incluera pas d’étiquette avec la clé {0}" +"Le jeu de données de la fusion n’inclura pas d’attribut avec la clé {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48 @@ -4556,5 +4549,5 @@ #, java-format msgid "My dataset does not include a tag with key {0}" -msgstr "Mon jeu de données n’inclue pas d’étiquette avec la clé {0}" +msgstr "Mon jeu de données n’inclue pas d’attribut avec la clé {0}" #. setting up the properties table @@ -4589,6 +4582,4 @@ msgid "Cannot apply undecided tag merge item." msgstr "" -"impossible de fusionner un élément dont le conflit d’étiquette n’a pas été " -"résolu" #. should not happen, but just in case @@ -4955,5 +4946,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -5168,43 +5159,43 @@ msgstr "Membre de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 msgid "Add Properties" msgstr "Ajouter des Propriétés" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 msgid "Add a new key/value pair to all objects" msgstr "Ajouter une nouvelle paire clé/valeur à tous les objets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 msgid "Edit Properties" msgstr "Éditer les propriétés" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 msgid "Edit the value of the selected key for all objects" msgstr "Éditer la valeur de la clé selectionnée pour tous les objets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Propriétés : {0} / Appartenances : {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 msgid "Properties / Memberships" msgstr "Propriétés / Appartenances" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 msgid "Change relation" msgstr "Changer la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Supprimer vraiment la sélection de la relation {0} ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:855 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 msgid "Delete the selected key in all objects" msgstr "Supprimer la clé sélectionnée de tous les objets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 msgid "Delete Properties" msgstr "Supprimer les propriétés" @@ -5214,6 +5205,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168 -#: build/trans_presets.java:3121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 +#: build/trans_presets.java:3133 msgid "Relations" msgstr "Relations" @@ -5223,22 +5214,22 @@ msgstr "Ouvrir une liste de toutes les relations." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:174 #, java-format msgid "Relations: {0}" msgstr "Relations : {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 msgid "Open an editor for the selected relation" msgstr "Ouvrir un éditeur pour la relation sélectionnée" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:325 msgid "Delete the selected relation" msgstr "Supprimer la relation sélectionnée" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:363 msgid "Create a new relation" msgstr "Créer une nouvelle relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:400 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280 msgid "Create a copy of this relation and open it in another editor window" @@ -5246,4 +5237,9 @@ "Créer une copie de cette relation et l'ouvrir dans une nouvelle fenêtre " "d'édition" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 +#, fuzzy +msgid "Set the current selection to the list of selected relations" +msgstr "éditer la relation sélectionnée" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5284,9 +5280,9 @@ msgstr "Sélection : {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 msgid "Undock the panel" msgstr "Détacher le panneau" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5295,5 +5291,5 @@ "d'outils de gauche." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 msgid "Click to minimize/maximize the panel content" msgstr "Cliquer pour minimiser/maximiser le contenu du panneau" @@ -5597,5 +5593,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174 msgid "Add an empty tag" -msgstr "Ajouter une étiquette vide" +msgstr "Ajouter un attribut vide" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 @@ -5732,5 +5728,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70 msgid "Please enter the desired coordinates first." -msgstr "Entrer les coordonnées désirées en premier." +msgstr "Veuillez d’abord saisir les coordonnées désirées." #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77 @@ -5802,5 +5798,6 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118 msgid "Null pointer exception, possibly some missing tags." -msgstr "Erreur de pointeur nul, des étiquettes sont peut-être manquantes." +msgstr "" +"Échec (NullPointerException). Sans doute parce qu'il manque des attributs." #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 @@ -5821,5 +5818,5 @@ #. group "Geography" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2771 msgid "Places" msgstr "Lieux/endroits" @@ -6501,6 +6498,4 @@ #. item "Man Made/Windmill" label "Edit Windmill" #. -#. item "Man Made/Pipeline" label "Edit Pipeline" -#. #. item "Man Made/Wastewater Plant" label "Edit Wastewater Plant" #. @@ -6513,4 +6508,6 @@ #. item "Man Made/Surveillance" label "Edit Surveillance Camera" #. +#. item "Man Made/Power Station" label "Edit Power Station" +#. #. item "Amenities/Fountain" label "Edit Fountain" #. @@ -6835,57 +6832,57 @@ #: build/trans_presets.java:2250 build/trans_presets.java:2258 #: build/trans_presets.java:2290 build/trans_presets.java:2295 -#: build/trans_presets.java:2300 build/trans_presets.java:2305 -#: build/trans_presets.java:2311 build/trans_presets.java:2317 -#: build/trans_presets.java:2323 build/trans_presets.java:2331 -#: build/trans_presets.java:2337 build/trans_presets.java:2343 -#: build/trans_presets.java:2349 build/trans_presets.java:2355 -#: build/trans_presets.java:2365 build/trans_presets.java:2462 -#: build/trans_presets.java:2469 build/trans_presets.java:2483 -#: build/trans_presets.java:2489 build/trans_presets.java:2496 -#: build/trans_presets.java:2503 build/trans_presets.java:2509 -#: build/trans_presets.java:2515 build/trans_presets.java:2537 -#: build/trans_presets.java:2544 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2305 build/trans_presets.java:2310 +#: build/trans_presets.java:2316 build/trans_presets.java:2322 +#: build/trans_presets.java:2339 build/trans_presets.java:2345 +#: build/trans_presets.java:2351 build/trans_presets.java:2357 +#: build/trans_presets.java:2363 build/trans_presets.java:2373 +#: build/trans_presets.java:2380 build/trans_presets.java:2474 +#: build/trans_presets.java:2481 build/trans_presets.java:2495 +#: build/trans_presets.java:2501 build/trans_presets.java:2508 +#: build/trans_presets.java:2515 build/trans_presets.java:2521 +#: build/trans_presets.java:2527 build/trans_presets.java:2549 +#: build/trans_presets.java:2556 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2576 #: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2594 build/trans_presets.java:2601 -#: build/trans_presets.java:2608 build/trans_presets.java:2615 -#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2594 build/trans_presets.java:2600 +#: build/trans_presets.java:2606 build/trans_presets.java:2613 +#: build/trans_presets.java:2620 build/trans_presets.java:2627 #: build/trans_presets.java:2633 build/trans_presets.java:2639 -#: build/trans_presets.java:2645 build/trans_presets.java:2652 -#: build/trans_presets.java:2659 build/trans_presets.java:2666 -#: build/trans_presets.java:2672 build/trans_presets.java:2678 -#: build/trans_presets.java:2688 build/trans_presets.java:2697 -#: build/trans_presets.java:2712 build/trans_presets.java:2718 -#: build/trans_presets.java:2726 build/trans_presets.java:2733 -#: build/trans_presets.java:2753 build/trans_presets.java:2764 -#: build/trans_presets.java:2770 build/trans_presets.java:2776 +#: build/trans_presets.java:2645 build/trans_presets.java:2651 +#: build/trans_presets.java:2657 build/trans_presets.java:2664 +#: build/trans_presets.java:2671 build/trans_presets.java:2678 +#: build/trans_presets.java:2684 build/trans_presets.java:2690 +#: build/trans_presets.java:2700 build/trans_presets.java:2709 +#: build/trans_presets.java:2724 build/trans_presets.java:2730 +#: build/trans_presets.java:2738 build/trans_presets.java:2745 +#: build/trans_presets.java:2765 build/trans_presets.java:2776 #: build/trans_presets.java:2782 build/trans_presets.java:2788 -#: build/trans_presets.java:2795 build/trans_presets.java:2802 -#: build/trans_presets.java:2809 build/trans_presets.java:2815 -#: build/trans_presets.java:2821 build/trans_presets.java:2829 -#: build/trans_presets.java:2836 build/trans_presets.java:2843 -#: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2879 build/trans_presets.java:2885 +#: build/trans_presets.java:2794 build/trans_presets.java:2800 +#: build/trans_presets.java:2807 build/trans_presets.java:2814 +#: build/trans_presets.java:2821 build/trans_presets.java:2827 +#: build/trans_presets.java:2833 build/trans_presets.java:2841 +#: build/trans_presets.java:2848 build/trans_presets.java:2855 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2875 build/trans_presets.java:2882 #: build/trans_presets.java:2891 build/trans_presets.java:2897 -#: build/trans_presets.java:2903 build/trans_presets.java:2912 -#: build/trans_presets.java:2922 build/trans_presets.java:2931 -#: build/trans_presets.java:2937 build/trans_presets.java:2943 -#: build/trans_presets.java:2948 build/trans_presets.java:2954 -#: build/trans_presets.java:2960 build/trans_presets.java:2969 -#: build/trans_presets.java:2975 build/trans_presets.java:2981 +#: build/trans_presets.java:2903 build/trans_presets.java:2909 +#: build/trans_presets.java:2915 build/trans_presets.java:2924 +#: build/trans_presets.java:2934 build/trans_presets.java:2943 +#: build/trans_presets.java:2949 build/trans_presets.java:2955 +#: build/trans_presets.java:2960 build/trans_presets.java:2966 +#: build/trans_presets.java:2972 build/trans_presets.java:2981 #: build/trans_presets.java:2987 build/trans_presets.java:2993 #: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3012 build/trans_presets.java:3018 -#: build/trans_presets.java:3023 build/trans_presets.java:3030 -#: build/trans_presets.java:3037 build/trans_presets.java:3043 -#: build/trans_presets.java:3052 build/trans_presets.java:3060 -#: build/trans_presets.java:3066 build/trans_presets.java:3072 -#: build/trans_presets.java:3079 build/trans_presets.java:3085 -#: build/trans_presets.java:3092 build/trans_presets.java:3098 +#: build/trans_presets.java:3011 build/trans_presets.java:3017 +#: build/trans_presets.java:3024 build/trans_presets.java:3030 +#: build/trans_presets.java:3035 build/trans_presets.java:3042 +#: build/trans_presets.java:3049 build/trans_presets.java:3055 +#: build/trans_presets.java:3064 build/trans_presets.java:3072 +#: build/trans_presets.java:3078 build/trans_presets.java:3084 +#: build/trans_presets.java:3091 build/trans_presets.java:3097 #: build/trans_presets.java:3104 build/trans_presets.java:3110 -#: build/trans_presets.java:3116 build/trans_presets.java:3129 -#: build/trans_presets.java:3143 build/trans_presets.java:3157 +#: build/trans_presets.java:3116 build/trans_presets.java:3122 +#: build/trans_presets.java:3128 build/trans_presets.java:3141 +#: build/trans_presets.java:3155 build/trans_presets.java:3169 msgid "Name" msgstr "Nom" @@ -6897,4 +6894,6 @@ "{2} in changeset {3}" msgstr "" +"Version {0} créée le {1} par " +"{2} dans l’ensemble de changements {3}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -6910,5 +6909,5 @@ #, java-format msgid "Show changeset {0}" -msgstr "" +msgstr "Montrer l’ensemble de changements {0}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6951,5 +6950,4 @@ msgstr "Fermer les ensembles de changements" -#. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 msgid "Close the selected open changesets" @@ -6967,5 +6965,5 @@ #, java-format msgid "Closing changeset {0}" -msgstr "" +msgstr "Fermeture de l’ensemble de changements {0}" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -6977,25 +6975,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "Yes" msgstr "Oui" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "No" msgstr "Non" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47 #, java-format msgid "Layer ''{0}'' has modifications which should be uploaded to the server." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49 #, java-format msgid "Layer ''{0}'' has no modifications to be uploaded." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60 #, java-format msgid "" @@ -7004,23 +7002,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62 #, java-format msgid "Layer ''{0}'' has no modifications to be saved." msgstr "Layer ''{0}'' has no modifications to be saved." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80 msgid "No file associated with this layer" msgstr "Pas de fichier associé à ce calque" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:83 msgid "Please select a file" msgstr "Veuillez sélectionner un fichier" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:86 #, java-format msgid "Layer ''{0}'' is not backed by a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:101 #, java-format msgid "File ''{0}'' is not writable. Please enter another file name." @@ -7029,6 +7027,6 @@ "de fichier." -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:115 #, java-format msgid "Select to upload layer ''{0}'' to the server ''{1}''" @@ -7129,5 +7127,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -msgid "Save and Exit" +#, fuzzy +msgid "Save/Upload and Exit" msgstr "Enregistrer et quitter" @@ -7138,5 +7137,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -msgid "Save and Delete" +#, fuzzy +msgid "Save/Upload and Delete" msgstr "Sauvegarder et supprimer." @@ -7153,7 +7153,8 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481 +#, fuzzy msgid "" "An upload and/or save operation of one layer with modifications
was " -"cancelled or has been failed." +"cancelled or has failed." msgstr "" "Une opération d'envoi et/ou de sauvegarde d'un calque avec des " @@ -7241,6 +7242,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:891 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:921 msgid "Tags of new changeset" msgstr "Tags du nouvel ensemble de changements" @@ -7342,7 +7343,6 @@ msgstr "Fermer l'ensemble de changements après le prochain envoi" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:909 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:933 #, java-format msgid "Tags of changeset {0}" @@ -7350,48 +7350,48 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:949 msgid "Load the list of your open changesets from the server" msgstr "Charger la liste de vos ensembles de changements depuis le serveur" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:963 msgid "Close the currently selected open changeset" msgstr "Fermer l'ensemble de changements actuellement ouvert" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1011 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106 msgid "Preparing primitives to upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Images pour {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "Lecture GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Aucune heure pour le point {0}·x·{1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Impossible de lire l’heure \"{0}\" du point {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325 msgid "No images with readable timestamps found." msgstr "Aucune image avec des informations horaires lisibles trouvée." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format @@ -7399,29 +7399,29 @@ msgstr "Lecture de {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:402 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246 msgid "Geotagged Images" msgstr "Images géolocalisées" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:587 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "GPS start: {0}" msgstr "Allumage du GPS : {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 #, java-format msgid "GPS end: {0}" msgstr "Extinction du GPS : {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594 #, java-format msgid "current delta: {0}s" msgstr "variation différentielle actuelle : {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595 msgid "timezone difference: " msgstr "différence de fuseau horaire : " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284 msgid "image" @@ -7430,14 +7430,14 @@ msgstr[1] "images" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #, java-format msgid "{0} within the track." msgstr "{0} dans la trace." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680 msgid "Sync clock" msgstr "Synchroniser l’horloge" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7445,32 +7445,32 @@ msgstr "images JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:734 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "La date du fichier \"{0}\" n'a pas pu être analysée." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Il n’y a aucune heure EXIF associée au fichier \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 msgid "Image" msgstr "Image" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:752 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Entrez la date et l’heure montrées (mm/jj/aaaa HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759 msgid "GPS unit timezone (difference to photo)" msgstr "Fuseau horaire de l'instrument GPS (différence avec la photo)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:767 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771 msgid "Synchronize Time with GPS Unit" msgstr "Synchroniser l’heure avec l’instrument GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:790 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 msgid "Time entered could not be parsed." msgstr "La date indiquée ne peut être analysée." @@ -7554,5 +7554,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 #, java-format msgid "Name: {0}" @@ -7575,5 +7575,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3160 +#: build/trans_presets.java:3172 msgid "Description" msgstr "Description" @@ -7630,5 +7630,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:587 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 @@ -7697,19 +7697,19 @@ "estimer leur horodatage ont été omis." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:105 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:107 #, java-format msgid "Data Layer {0}" msgstr "Couche de données {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 msgid "outside downloaded area" msgstr "en dehors de la zone téléchargée" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:252 #, java-format msgid "version {0}" msgstr "version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:289 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:290 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" @@ -7717,24 +7717,47 @@ "0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 +#, fuzzy, java-format +msgid "There was {0} conflict detected." +msgid_plural "There were {0} conflicts detected." +msgstr[0] "Il y a eu {0} conflits durant l'import." +msgstr[1] "Il y a eu {0} conflits durant l'import." + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 +#, java-format +msgid "" +"{0} object has been purged from the local dataset because it is deleted on " +"the server." +msgid_plural "" +"{0} objects have been purged from the local dataset because they are deleted " +"on the server." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 +#, fuzzy +msgid "Conflicts detected" +msgstr "Conflit détecté" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 #, java-format msgid "{0} consists of:" msgstr "{0} est consistué de :" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:476 #, java-format msgid " ({0} deleted.)" msgstr " ({0} supprimés)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 msgid "unset" msgstr "non défini" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 #, java-format msgid "API version: {0}" msgstr "Version de l’API : {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:501 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:584 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" @@ -8115,5 +8138,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:412 #: ../plugins/terracer/src/terracer/TerracerAction.java:430 @@ -8893,5 +8916,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261 msgid "More information about this feature" msgstr "Plus d'informations à propos de cette balise" @@ -8940,5 +8963,5 @@ msgstr "Les éléments de type {0} sont avalisés." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:700 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -8948,18 +8971,18 @@ msgstr[1] "Changer {0} objets." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Rien n'est sélectionné !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 msgid "Selection unsuitable!" msgstr "Sélection inappropriée !" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 msgid "Apply Preset" msgstr "Appliquer balise" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788 msgid "Change Properties" msgstr "Changer les propriétés" @@ -8993,6 +9016,5 @@ msgid "NullPointerException, possibly some missing tags." msgstr "" -"Échec (NullPointerException). Il est probable que des étiquettes soient " -"manquantes." +"Échec (NullPointerException). Sans doute parce qu'il manque des attributs." #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 @@ -9253,5 +9275,5 @@ #, java-format msgid "Updating changeset {0}..." -msgstr "" +msgstr "Mise à jour de l’ensemble de changements {0}..." #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 @@ -9259,44 +9281,44 @@ msgstr "Fermeture de la révision..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "Pas de nouveau changement à envoyer" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 msgid "Preparing..." msgstr "Préparation en cours..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 msgid "Uploading..." msgstr "Envoi en cours..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 msgid "Waiting 10 seconds ... " msgstr "Attends 10 secondes… " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9544,5 +9566,5 @@ msgid "" "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}''," -"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." +"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." msgstr "" @@ -9659,6 +9681,6 @@ #, java-format msgid "" -"Relation with external id ''{0}'' refers to missing primitive with external " -"id ''{1}''." +"Relation with external id ''{0}'' refers to a missing primitive with " +"external id ''{1}''." msgstr "" @@ -9755,32 +9777,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:73 msgid "Starting to upload with one request per primitive ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Starting to upload in one request ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 +#, fuzzy, java-format +msgid "Parameter ''{0}'' must not be null" +msgstr "le paramètre \"{0}\" ne doit pas être vide" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 msgid "Uploading data ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 msgid "" "WARNING: no API version defined for data to upload. Falling back to version " @@ -9788,5 +9815,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:153 #, java-format msgid "" @@ -10013,5 +10040,5 @@ #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:202 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:324 build/trans_presets.java:325 @@ -10033,6 +10060,6 @@ #: build/trans_presets.java:789 build/trans_presets.java:1333 #: build/trans_presets.java:1400 build/trans_presets.java:1401 -#: build/trans_presets.java:1402 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 +#: build/trans_presets.java:1402 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 msgid "unknown" msgstr "inconnu" @@ -10188,5 +10215,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:192 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:182 +#, java-format +msgid "" +"The OSM server ''{0}'' doesn't know about an object
you tried to read, " +"update, or delete. Either the respective object
doesn''t exist on the " +"server or you''re using an invalid URL to access
it. Please carefully " +"check the servers address ''{1}'' for typos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:209 #, java-format msgid "" @@ -10196,5 +10232,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:262 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:279 #, java-format msgid "" @@ -10469,17 +10505,15 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35 msgid "Define Address Interpolation" msgstr "" -#. Whether to re-trigger data changed for relation #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "Impair" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:413 #: ../plugins/terracer/src/terracer/TerracerAction.java:437 @@ -10487,99 +10521,99 @@ msgstr "Pair" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 msgid "Alphabetic" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161 #, java-format msgid "Relation: {0}" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173 msgid "Associate with street using:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184 msgid "Numbering Scheme:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 msgid "Starting #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188 msgid "Ending #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 #, java-format msgid "Will associate {0} additional house number nodes" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 msgid "Starting address number must be less than ending address number" msgstr "" @@ -11364,4 +11398,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52 +#: build/trans_presets.java:2331 msgid "Location" msgstr "Localisation" @@ -11506,5 +11541,5 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 msgid "Splits an area by an untagged way." -msgstr "Divise une zone à l’aide d'un chemin sans étiquette." +msgstr "Divise une zone à l’aide d'un chemin sans attribut." #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:76 @@ -11918,4 +11953,5 @@ msgstr "Sud-Est" +#. item "Man Made/Pipeline" combo "Type" #. color highway_track #. @@ -11961,7 +11997,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:990 build/trans_style.java:1007 -#: build/trans_style.java:1023 build/trans_style.java:3400 -#: build/trans_style.java:3408 +#: build/trans_presets.java:2330 build/trans_style.java:990 +#: build/trans_style.java:1007 build/trans_style.java:1023 +#: build/trans_style.java:3400 build/trans_style.java:3408 msgid "water" msgstr "eau" @@ -12790,5 +12826,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 msgid "Edit tags" -msgstr "Modifier les étiquettes" +msgstr "Modifier les attributs" #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib @@ -12796,9 +12832,9 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" -msgstr "Lance la fenêtre de l'éditeur d'étiquette" +msgstr "Lance la fenêtre de l'éditeur d'attribut" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158 msgid "JOSM Tag Editor Plugin" -msgstr "Greffon d'édition des étiquettes JOSM" +msgstr "Greffon d'édition des attributs JOSM" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 @@ -12987,5 +13023,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311 msgid "Fix tag conflicts" -msgstr "Corriger les conflits d'étiquettes" +msgstr "Corriger les conflits d’attribut" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461 @@ -13003,5 +13039,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853 msgid "Remove tags from inner ways" -msgstr "Supprime les étiquettes des chemins internes" +msgstr "Supprime les attributs des chemins internes" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882 @@ -13428,5 +13464,5 @@ #, java-format msgid "Invalid tagchecker line - {0}: {1}" -msgstr "Ligne du vérificateur d’étiquettes invalide - {0} : {1}" +msgstr "Ligne du vérificateur d’attributs invalide - {0} : {1}" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 @@ -13448,5 +13484,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" -msgstr "Combinaisons étiquette/valeur non valide" +msgstr "Combinaisons attribut/valeur non valide" #. passing translated text also to original string, as we already @@ -13568,6 +13604,6 @@ msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" -"Chercher les nœuds et chemins avec FIXME comme valeur pour n’importe quelle " -"étiquette." +"Chercher les nœuds et chemins possédant la valeur FIXME dans n’importe " +"lequel attribut." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 @@ -13813,5 +13849,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92 msgid "Untagged and unconnected nodes" -msgstr "Nœud non connectés et sans étiquettes" +msgstr "Nœud non connectés et sans attribut" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:38 @@ -13826,6 +13862,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60 msgid "This test checks for untagged, empty and one node ways." -msgstr "" -"Ce test vérifie les chemins sans étiquette, vides ou avec un seul nœud." +msgstr "Ce test vérifie les chemins sans attribut, vides ou avec un seul nœud." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91 @@ -14084,5 +14119,5 @@ #, java-format msgid "Warning: The complete URL is ''{0}''." -msgstr "" +msgstr "Attention : l’URL complète est ''{0}''." #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 @@ -14436,5 +14471,5 @@ msgstr "" "Simule un clic lorsque vous faites un léger déplacement. C'est utile pour " -"les tablettes graphiqyes, lorsque vous avez du mal à cliquer sans déplacer " +"les tablettes graphiques, lorsque vous avez du mal à cliquer sans déplacer " "la souris (problème général Java - tablettes graphiques)" @@ -14516,7 +14551,5 @@ #: build/trans_plugins.java:63 msgid "Provides a dialog for editing tags in a tabular grid." -msgstr "" -"Fourni une fenêtre permettant de modifier les étiquettes sous forme de " -"tableur." +msgstr "Ouvre une fenêtre de modification des attributs sous forme de table." #. Plugin tagging-preset-tester @@ -14670,9 +14703,11 @@ #. item "Public Transport/Airport" text "Name" #. +#. item "Man Made/Power Station" text "Operator" #. item "Relations/Route" text "Name" #: build/trans_presets.java:65 build/trans_presets.java:101 #: build/trans_presets.java:121 build/trans_presets.java:141 #: build/trans_presets.java:178 build/trans_presets.java:198 -#: build/trans_presets.java:1560 build/trans_presets.java:3158 +#: build/trans_presets.java:1560 build/trans_presets.java:2382 +#: build/trans_presets.java:3170 msgid "Reference" msgstr "Référence" @@ -15234,5 +15269,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 msgid "metal" msgstr "Métal" @@ -15252,5 +15287,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 #: build/trans_style.java:3375 msgid "wood" @@ -15539,7 +15574,7 @@ #: build/trans_presets.java:1401 build/trans_presets.java:1402 #: build/trans_presets.java:1767 build/trans_presets.java:1777 -#: build/trans_presets.java:2408 build/trans_presets.java:2444 -#: build/trans_presets.java:2453 build/trans_presets.java:2454 -#: build/trans_presets.java:2455 build/trans_presets.java:2725 +#: build/trans_presets.java:2420 build/trans_presets.java:2456 +#: build/trans_presets.java:2465 build/trans_presets.java:2466 +#: build/trans_presets.java:2467 build/trans_presets.java:2737 msgid "yes" msgstr "oui" @@ -15688,8 +15723,8 @@ #: build/trans_presets.java:1400 build/trans_presets.java:1401 #: build/trans_presets.java:1402 build/trans_presets.java:1767 -#: build/trans_presets.java:1777 build/trans_presets.java:2408 -#: build/trans_presets.java:2444 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 -#: build/trans_presets.java:2725 +#: build/trans_presets.java:1777 build/trans_presets.java:2420 +#: build/trans_presets.java:2456 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 +#: build/trans_presets.java:2737 msgid "no" msgstr "non" @@ -15827,6 +15862,8 @@ #. item "Water/Wetland" text "Name" #. item "Car/Parking" text "Reference number" +#. item "Man Made/Pipeline" text "Operator" #. item "Man Made/Power Generator" label "Edit Power Generator" #. +#. item "Man Made/Power Tower" label "Edit Power Tower" #. item "Land use/Tree" text "Name" #. item "Land use/Wood" text "Name" @@ -15834,7 +15871,8 @@ #: build/trans_presets.java:350 build/trans_presets.java:649 #: build/trans_presets.java:789 build/trans_presets.java:1137 -#: build/trans_presets.java:1395 build/trans_presets.java:2364 -#: build/trans_presets.java:2913 build/trans_presets.java:2923 -#: build/trans_presets.java:2932 +#: build/trans_presets.java:1395 build/trans_presets.java:2330 +#: build/trans_presets.java:2372 build/trans_presets.java:2398 +#: build/trans_presets.java:2925 build/trans_presets.java:2935 +#: build/trans_presets.java:2944 msgid "Type" msgstr "Type" @@ -16384,10 +16422,10 @@ #. item "Tourism/Information Terminal" text "Closer description" #. item "Tourism/Audioguide" text "Closer description" -#. item "Man Made/Power Station" label "Edit Power Station" -#. +#. item "Man Made/Tower" text "Height (meters)" +#. item "Man Made/Pipeline" label "Edit Pipeline" +#. +#. item "Man Made/Power Station" text "Name" #. item "Man Made/Power Sub Station" label "Edit Power Sub Station" #. -#. item "Man Made/Power Line" label "Edit Power Line" -#. #. item #. #: build/trans_presets.java:1535 build/trans_presets.java:1789 -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2465 msgid "Shelter" msgstr "Abri" @@ -18745,5 +18785,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1877 build/trans_presets.java:2669 +#: build/trans_presets.java:1877 build/trans_presets.java:2681 msgid "Sports" msgstr "Sports" @@ -20096,6 +20136,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "Religion" msgstr "Religion" @@ -20104,66 +20144,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "bahai" msgstr "bahai" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "buddhist" msgstr "buddhist" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "christian" msgstr "christian" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "hindu" msgstr "hindu" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jain" msgstr "jain" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jewish" msgstr "jewish" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "muslim" msgstr "muslim" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "spiritualist" msgstr "spiritualist" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "taoist" msgstr "taoist" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "unitarian" msgstr "unitarisme" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "zoroastrian" msgstr "zoroastrian" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "Denomination" msgstr "Dénomination" @@ -20172,76 +20212,76 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "anglican" msgstr "anglican" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "baptist" msgstr "baptist" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "catholic" msgstr "catholique" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "evangelical" msgstr "evangelical" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "jehovahs_witness" msgstr "jehovahs_witness" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "lutheran" msgstr "lutheran" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "methodist" msgstr "methodist" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "mormon" msgstr "mormon" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "orthodox" msgstr "orthodox" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "pentecostal" msgstr "pentecostal" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "presbyterian" msgstr "presbyterian" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "protestant" msgstr "protestant" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "quaker" msgstr "quaker" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "shia" msgstr "shia" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "sunni" msgstr "sunni" @@ -20337,25 +20377,49 @@ #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2296 +#, fuzzy +msgid "Tower type" +msgstr "Type de route" + +#. item "Man Made/Tower" combo "Tower type" +#: build/trans_presets.java:2296 +#, fuzzy +msgid "communication" +msgstr "connexion" + +#: build/trans_presets.java:2296 +#, fuzzy +msgid "observation" +msgstr "Altitude" + +#. +#: build/trans_presets.java:2298 +#, fuzzy +msgid "Height (meters)" +msgstr "Hauteur max. (mètres)" + +#. item "Man Made/Tower" text "Operator" +#. +#: build/trans_presets.java:2302 msgid "Water Tower" msgstr "Château d’eau" #. item -#: build/trans_presets.java:2298 +#: build/trans_presets.java:2303 msgid "Edit Water Tower" msgstr "Éditer un château d’eau" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2307 msgid "Gasometer" msgstr "Gazomètre" #. item -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2308 msgid "Edit Gasometer" msgstr "Éditer un gazomètre" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2307 +#: build/trans_presets.java:2312 msgid "Lighthouse" msgstr "Phare" @@ -20363,10 +20427,10 @@ #. item #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2314 msgid "Edit Lighthouse" msgstr "Éditer un phare" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2318 msgid "Windmill" msgstr "Moulin à vent" @@ -20374,21 +20438,55 @@ #. item #. -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2320 msgid "Edit Windmill" msgstr "Éditer un moulin à vent" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2319 +#: build/trans_presets.java:2324 msgid "Pipeline" msgstr "Pipeline" #. item -#. -#: build/trans_presets.java:2321 +#. +#: build/trans_presets.java:2327 msgid "Edit Pipeline" msgstr "Éditer un pipeline" -#. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2330 +#, fuzzy +msgid "oil" +msgstr "fossil" + +#: build/trans_presets.java:2330 build/trans_presets.java:2372 +msgid "gas" +msgstr "gaz" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "sewage" +msgstr "usage" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "heat" +msgstr "lande/bruyère" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "any substance" +msgstr "A Par distance" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "underwater" +msgstr "eau" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "overground" +msgstr "souterrain" + +#: build/trans_presets.java:2333 msgid "Wastewater Plant" msgstr "Station d’épuration" @@ -20398,10 +20496,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:2329 +#: build/trans_presets.java:2337 msgid "Edit Wastewater Plant" msgstr "Éditer une station d’épuration" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2333 +#: build/trans_presets.java:2341 msgid "Crane" msgstr "Grue" @@ -20409,10 +20507,10 @@ #. item #. -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2343 msgid "Edit Crane" msgstr "Éditer une grue permanente" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2347 msgid "Beacon" msgstr "Balise signalétique" @@ -20420,10 +20518,10 @@ #. item #. -#: build/trans_presets.java:2341 +#: build/trans_presets.java:2349 msgid "Edit Beacon" msgstr "Editer balise signalétique" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2353 msgid "Survey Point" msgstr "Équipement de topographie" @@ -20431,10 +20529,10 @@ #. item #. -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2355 msgid "Edit Survey Point" msgstr "Éditer un équipement de topographie" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2359 msgid "Surveillance" msgstr "Surveillance" @@ -20442,5 +20540,5 @@ #. item #. -#: build/trans_presets.java:2353 +#: build/trans_presets.java:2361 msgid "Edit Surveillance Camera" msgstr "Éditer une caméra de surveillance" @@ -20448,5 +20546,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2366 msgid "Power Generator" msgstr "Centrale électrique" @@ -20456,39 +20554,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:2362 +#: build/trans_presets.java:2370 msgid "Edit Power Generator" msgstr "Éditer une centrale électrique" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "wind" msgstr "wind" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "hydro" msgstr "hydro" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "fossil" msgstr "fossil" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "nuclear" msgstr "nuclear" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "coal" msgstr "charbon" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "photovoltaic" msgstr "photovoltaïque" -#: build/trans_presets.java:2364 -msgid "gas" -msgstr "gaz" - #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2375 msgid "Power Station" msgstr "Station électrique" @@ -20497,10 +20591,10 @@ #. -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2378 msgid "Edit Power Station" msgstr "Editez une station électrique" -#. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2374 +#. item "Man Made/Power Station" text "Reference" +#: build/trans_presets.java:2384 msgid "Power Sub Station" msgstr "Transformateur électrique" @@ -20509,5 +20603,5 @@ #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2387 msgid "Edit Power Sub Station" msgstr "Modifier transformateur électrique" @@ -20515,10 +20609,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2380 build/trans_presets.java:2396 +#: build/trans_presets.java:2390 build/trans_presets.java:2407 msgid "Line reference" msgstr "Champ de vision" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2382 +#: build/trans_presets.java:2392 msgid "Power Tower" msgstr "Pylône électrique" @@ -20529,11 +20623,26 @@ #. 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:2387 +#: build/trans_presets.java:2397 msgid "Edit Power Tower" msgstr "Éditer un pylône électrique" -#. item "Man Made/Power Tower" label "Edit Power Tower" -#. -#: build/trans_presets.java:2390 +#. item "Man Made/Power Tower" combo "Type" +#: build/trans_presets.java:2398 +#, fuzzy +msgid "tower" +msgstr "Structure de hauteur" + +#: build/trans_presets.java:2398 +#, fuzzy +msgid "pole" +msgstr "Rôle" + +#: build/trans_presets.java:2399 +#, fuzzy +msgid "Tower reference" +msgstr "Champ de vision" + +#. item "Man Made/Power Tower" text "Tower reference" +#: build/trans_presets.java:2401 msgid "Power Line" msgstr "Ligne de courant" @@ -20542,40 +20651,83 @@ #. -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2404 msgid "Edit Power Line" msgstr "Editez une ligne de courant" +#. item "Man Made/Power Line" label "Edit Power Line" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "Line type" +msgstr "Type de piste" + +#. item "Man Made/Power Line" combo "Line type" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "line" +msgstr "lié" + +#: build/trans_presets.java:2405 +#, fuzzy +msgid "minor_line" +msgstr "motorway_link" + #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2408 msgid "Voltage" msgstr "Tension" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2398 -msgid "Amount of Wires" +#: build/trans_presets.java:2409 +#, fuzzy +msgid "Amount of Cables" msgstr "Nombre de câbles" -#. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2401 +#. item "Man Made/Power Line" text "Amount of Cables" +#: build/trans_presets.java:2410 +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:2410 +#, fuzzy +msgid "single" +msgstr "Angle" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "double" +msgstr "Boules" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "triple" +msgstr "Échalier" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "quad" +msgstr "quaker" + +#: build/trans_presets.java:2413 msgid "Amenities" msgstr "Équipements" #. group "Amenities" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2414 msgid "Toilets" msgstr "Toilettes" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2409 build/trans_presets.java:2525 +#: build/trans_presets.java:2421 build/trans_presets.java:2537 msgid "Note" msgstr "Note" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2411 +#: build/trans_presets.java:2423 msgid "Post Box" msgstr "Boîte aux lettres" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2428 msgid "Telephone" msgstr "Téléphone" @@ -20584,5 +20736,5 @@ #. -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2431 msgid "Edit Telephone" msgstr "Éditer un téléphone" @@ -20590,5 +20742,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2422 build/trans_presets.java:2526 +#: build/trans_presets.java:2434 build/trans_presets.java:2538 msgid "Coins" msgstr "Pièces" @@ -20596,5 +20748,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2423 build/trans_presets.java:2527 +#: build/trans_presets.java:2435 build/trans_presets.java:2539 msgid "Notes" msgstr "Billets" @@ -20602,5 +20754,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2424 build/trans_presets.java:2528 +#: build/trans_presets.java:2436 build/trans_presets.java:2540 msgid "Electronic purses and Charge cards" msgstr "Cartes de crédit temporaire" @@ -20608,5 +20760,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2425 build/trans_presets.java:2529 +#: build/trans_presets.java:2437 build/trans_presets.java:2541 msgid "Debit cards" msgstr "Cartes de débit" @@ -20614,15 +20766,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2426 build/trans_presets.java:2530 +#: build/trans_presets.java:2438 build/trans_presets.java:2542 msgid "Credit cards" msgstr "Cartes de crédits" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2439 msgid "Telephone cards" msgstr "Cartes téléphoniques" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2429 +#: build/trans_presets.java:2441 msgid "Recycling" msgstr "Recyclage" @@ -20631,5 +20783,5 @@ #. -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2444 msgid "Edit Recycling station" msgstr "Éditer un point de recylcage" @@ -20637,35 +20789,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2446 msgid "Batteries" msgstr "Batteries" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2435 +#: build/trans_presets.java:2447 msgid "Cans" msgstr "Canettes" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2448 msgid "Clothes" msgstr "Vêtements" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2437 +#: build/trans_presets.java:2449 msgid "Glass" msgstr "Verre" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2450 msgid "Paper" msgstr "Papier" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2451 msgid "Scrap Metal" msgstr "Ferrailleur" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2453 msgid "Bench" msgstr "Banc" @@ -20674,31 +20826,31 @@ #. #. -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2456 msgid "Backrest" msgstr "Accoudoir" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "stone" msgstr "pierre" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "plastic" msgstr "plastique" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "Colour" msgstr "Couleur" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "black" msgstr "noir" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "brown" msgstr "marron" @@ -20769,5 +20921,5 @@ #. #. -#: build/trans_presets.java:2446 build/trans_style.java:3063 +#: build/trans_presets.java:2458 build/trans_style.java:3063 #: build/trans_style.java:3071 build/trans_style.java:3079 #: build/trans_style.java:3087 build/trans_style.java:3135 @@ -20777,27 +20929,27 @@ msgstr "espace vert" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "red" msgstr "rouge" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "blue" msgstr "bleu" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "white" msgstr "blanc" -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2459 msgid "Amount of Seats" msgstr "Nombre de places" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2461 msgid "Hunting Stand" msgstr "Hutte de chasse" #. item -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2462 msgid "Edit Hunting Stand" msgstr "Hutte de chasse" @@ -20806,30 +20958,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2452 build/trans_presets.java:2914 +#: build/trans_presets.java:2464 build/trans_presets.java:2926 msgid "Height" msgstr "Hauteur" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "low" msgstr "faible" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "half" msgstr "à moitié" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "full" msgstr "complet" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2466 msgid "Hide" msgstr "Masquer" -#: build/trans_presets.java:2455 +#: build/trans_presets.java:2467 msgid "Lock" msgstr "Verrouiller" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2469 msgid "Fountain" msgstr "Fontaine" @@ -20838,10 +20990,10 @@ #. -#: build/trans_presets.java:2460 +#: build/trans_presets.java:2472 msgid "Edit Fountain" msgstr "Éditer une fontaine" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2476 msgid "Drinking Water" msgstr "Eau potable" @@ -20850,10 +21002,10 @@ #. -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2479 msgid "Edit Drinking Water" msgstr "Éditer un point d’eau potable" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2471 +#: build/trans_presets.java:2483 msgid "Baby Hatch" msgstr "Tour d’abandon (nouveau né)" @@ -20861,33 +21013,33 @@ #. item #. -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2485 msgid "Edit Baby Hatch" msgstr "Éditer un tour d’abandon" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2491 msgid "Shops" msgstr "Magasins" #. group "Shops" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2492 msgid "Supermarket" msgstr "Supermarché" #. item -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2493 msgid "Edit Supermarket" msgstr "Éditer un supermarché" -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2498 msgid "Chemist" msgstr "Droguerie" #. item -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2499 msgid "Edit Chemist" msgstr "Éditer la droguerie" -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2504 msgid "Convenience Store" msgstr "Commerce de proximité" @@ -20895,9 +21047,9 @@ #. item #. -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2506 msgid "Edit Convenience Store" msgstr "Éditer une épicerie" -#: build/trans_presets.java:2499 +#: build/trans_presets.java:2511 msgid "Kiosk" msgstr "Kiosque à journaux" @@ -20905,27 +21057,27 @@ #. item #. -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2513 msgid "Edit Kiosk" msgstr "Éditer un kiosque à journaux" -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2518 msgid "Book Store" msgstr "Librairie" #. item -#: build/trans_presets.java:2507 +#: build/trans_presets.java:2519 msgid "Edit Book Store" msgstr "Éditer librairie" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2524 msgid "Travel Agency" msgstr "Agence de voyage" #. item -#: build/trans_presets.java:2513 +#: build/trans_presets.java:2525 msgid "Edit Travel Agency" msgstr "Éditer agence de voyage" -#: build/trans_presets.java:2518 +#: build/trans_presets.java:2530 msgid "Vending machine" msgstr "Distributeur automatique" @@ -20933,5 +21085,5 @@ #. item #. -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2532 msgid "Edit Vending machine" msgstr "Éditer un distributeur automatique" @@ -20939,88 +21091,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "Vending products" msgstr "Produits vendus" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_tickets" msgstr "public_transport_tickets" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_plans" msgstr "public_transport_plans" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "parking_tickets" msgstr "parking_tickets" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "food" msgstr "food" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "drinks" msgstr "drinks" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "sweets" msgstr "bonbons" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "cigarettes" msgstr "cigarettes" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "photos" msgstr "photos" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "animal_food" msgstr "animal_food" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "news_papers" msgstr "news_papers" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "toys" msgstr "jouets" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "stamps" msgstr "stamps" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "SIM-cards" msgstr "SIM-cards" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "telephone_vouchers" msgstr "telephone_vouchers" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "vouchers" msgstr "vouchers" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "condoms" msgstr "condoms" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "tampons" msgstr "tampons" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "excrement_bags" msgstr "excrement_bags" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2543 msgid "Account or loyalty cards" msgstr "Cartes de fidélité" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2545 msgid "Butcher" msgstr "Boucherie" @@ -21028,9 +21180,9 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2547 msgid "Edit Butcher" msgstr "Éditer une boucherie" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2552 msgid "Baker" msgstr "Boulanger" @@ -21038,9 +21190,9 @@ #. item #. -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2554 msgid "Edit Baker" msgstr "Éditer une boulangerie" -#: build/trans_presets.java:2547 +#: build/trans_presets.java:2559 msgid "Florist" msgstr "Fleuriste" @@ -21048,18 +21200,18 @@ #. item #. -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2561 msgid "Edit Florist" msgstr "Modifier fleuriste" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2566 msgid "Organic" msgstr "Boutique bio" #. item -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2567 msgid "Edit Organic Shop" msgstr "Modifier boutique bio" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2572 msgid "Alcohol" msgstr "Alcool" @@ -21067,54 +21219,54 @@ #. item #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2574 msgid "Edit Alcohol Shop" msgstr "Modifier commerce d'acool" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2579 msgid "Beverages" msgstr "Boissons" #. item -#: build/trans_presets.java:2568 +#: build/trans_presets.java:2580 msgid "Edit Beverages Shop" msgstr "Modifier débit de boissons" -#: build/trans_presets.java:2573 +#: build/trans_presets.java:2585 msgid "Computer" msgstr "Informatique" #. item -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2586 msgid "Edit Computer Shop" msgstr "Modifier magasin informatique" -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2591 msgid "Electronics" msgstr "Électronique" #. item -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2592 msgid "Edit Electronics Shop" msgstr "Modifier magasin d’électronique" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2597 msgid "Hifi" msgstr "Hi-Fi" #. item -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2598 msgid "Edit Hifi Shop" msgstr "Modifier boutique Hi-Fi" -#: build/trans_presets.java:2591 +#: build/trans_presets.java:2603 msgid "Furniture" msgstr "Ameublement" #. item -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2604 msgid "Edit Furniture Shop" msgstr "Modifier magasin d’ameublement" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2609 msgid "Garden Centre" msgstr "Jardinerie" @@ -21122,9 +21274,9 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2611 msgid "Edit Garden Centre" msgstr "Modifier jardinerie" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2616 msgid "Hardware" msgstr "Quincaillerie" @@ -21132,9 +21284,9 @@ #. item #. -#: build/trans_presets.java:2606 +#: build/trans_presets.java:2618 msgid "Edit Hardware Store" msgstr "Modifier quincaillerie" -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2623 msgid "Do-it-yourself-store" msgstr "Magasin de bricolage" @@ -21142,54 +21294,54 @@ #. item #. -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2625 msgid "Edit Do-it-yourself-store" msgstr "Éditer un magasin de bricolage" -#: build/trans_presets.java:2618 +#: build/trans_presets.java:2630 msgid "Stationery" msgstr "Papeterie" #. item -#: build/trans_presets.java:2619 +#: build/trans_presets.java:2631 msgid "Edit Stationery Shop" msgstr "Modifier papeterie" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2636 msgid "Hairdresser" msgstr "Coiffeur" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2637 msgid "Edit Hairdresser" msgstr "Editez un Coiffeur" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2642 msgid "Shoes" msgstr "Magasin de chaussures" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2643 msgid "Edit Shoe Shop" msgstr "Modifier magasin de chaussures" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2648 msgid "Toys" msgstr "Jouets" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2649 msgid "Edit Toy Shop" msgstr "Modifier magasin de jouets" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2654 msgid "Video" msgstr "Vidéoclub" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2655 msgid "Edit Video Shop" msgstr "Modifier vidéoclub" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2660 msgid "Dry Cleaning" msgstr "Pressing" @@ -21197,9 +21349,9 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2662 msgid "Edit Dry Cleaning" msgstr "Éditer un pressing" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2667 msgid "Laundry" msgstr "Laverie libre-service" @@ -21207,9 +21359,9 @@ #. item #. -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2669 msgid "Edit Laundry" msgstr "Éditer une laverie" -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2674 msgid "Outdoor" msgstr "Magasin de sports d’extérieur" @@ -21217,28 +21369,28 @@ #. item #. -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2676 msgid "Edit Outdoor Shop" msgstr "Éditer un magasin de sports d’extérieur" #. item -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2682 msgid "Edit Sports Shop" msgstr "Modifier magasin de sport" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2687 msgid "Optician" msgstr "Opticien" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2688 msgid "Edit Optician" msgstr "Modifier opticien" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2695 msgid "Cash" msgstr "Argent" #. group "Cash" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2696 msgid "Bank" msgstr "Banque" @@ -21246,14 +21398,14 @@ #. item #. -#: build/trans_presets.java:2686 +#: build/trans_presets.java:2698 msgid "Edit Bank" msgstr "Editez une banque" -#: build/trans_presets.java:2691 build/trans_presets.java:2700 +#: build/trans_presets.java:2703 build/trans_presets.java:2712 msgid "Automated Teller Machine" msgstr "Distributeur automatique" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2705 msgid "Money Exchange" msgstr "Bureau de change" @@ -21261,5 +21413,5 @@ #. item #. -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2707 msgid "Edit Money Exchange" msgstr "Éditer un bureau de change" @@ -21267,15 +21419,15 @@ #. item #. -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2714 msgid "Edit Automated Teller Machine" msgstr "Éditer un distributeur automatique" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2719 msgid "Health" msgstr "Santé" #. group "Health" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2720 msgid "Doctors" msgstr "Médecin" @@ -21283,18 +21435,18 @@ #. item #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2722 msgid "Edit Doctors" msgstr "Modifier Médecin" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2727 msgid "Dentist" msgstr "Dentiste" #. item -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2728 msgid "Edit Dentist" msgstr "Editez le Dentiste" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2733 msgid "Pharmacy" msgstr "Pharmacie" @@ -21302,5 +21454,5 @@ #. item #. -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2735 msgid "Edit Pharmacy" msgstr "Éditer pharmacie" @@ -21308,9 +21460,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2737 msgid "Dispensing" msgstr "Dispensaire" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2741 msgid "Hospital" msgstr "Hôpital" @@ -21318,10 +21470,10 @@ #. item #. -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2743 msgid "Edit Hospital" msgstr "Éditer hôpital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2747 msgid "Emergency Access Point" msgstr "Point d’accès d’urgence" @@ -21330,5 +21482,5 @@ #. -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2750 msgid "Edit Emergency Access Point" msgstr "Éditer point d’accès d’urgence" @@ -21337,20 +21489,20 @@ #. #. -#: build/trans_presets.java:2741 +#: build/trans_presets.java:2753 msgid "Point Number" msgstr "Numéro du point" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2742 +#: build/trans_presets.java:2754 msgid "Point Name" msgstr "Nom du point" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2756 msgid "Phone Number" msgstr "Numéro de téléphone" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2757 msgid "(Use international code, like +12-345-67890)" msgstr "(Utiliser le code international, comme +12-345-67890" @@ -21358,5 +21510,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2760 msgid "Veterinary" msgstr "Vétérinaire" @@ -21365,59 +21517,59 @@ #. -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2763 msgid "Edit Veterinary" msgstr "Editez un Vétérinaire" -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2770 msgid "Geography" msgstr "Géographie" #. group "Places" -#: build/trans_presets.java:2760 +#: build/trans_presets.java:2772 msgid "Continent" msgstr "Continent" #. item -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2773 msgid "Edit Continent" msgstr "Éditer un continent" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2766 +#: build/trans_presets.java:2778 msgid "Country" msgstr "Pays" #. item -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2779 msgid "Edit Country" msgstr "Éditer un pays" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2784 msgid "State" msgstr "Département" #. item -#: build/trans_presets.java:2773 +#: build/trans_presets.java:2785 msgid "Edit State" msgstr "Éditer un état" #. item "Places/State" text "Name" -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2790 msgid "Region" msgstr "Région" #. item -#: build/trans_presets.java:2779 +#: build/trans_presets.java:2791 msgid "Edit Region" msgstr "Éditer une région" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2796 msgid "County" msgstr "Comté/Canton" #. item -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2797 msgid "Edit County" msgstr "Éditer un comté/canton" @@ -21425,15 +21577,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2803 msgid "City" msgstr "Ville de plus de 100 000 habitants" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2804 msgid "Edit City" msgstr "Editez la ville" #. item "Places/City" text "Name" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2809 msgid "Town" msgstr "Ville 10 000 à 100 000 habitants" @@ -21441,10 +21593,10 @@ #. item #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2811 msgid "Edit Town" msgstr "Editez la ville" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2804 +#: build/trans_presets.java:2816 msgid "Suburb" msgstr "Banlieue" @@ -21452,25 +21604,25 @@ #. item #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2818 msgid "Edit Suburb" msgstr "Éditer une banlieue" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2823 msgid "Village" msgstr "Village" #. item -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2824 msgid "Edit Village" msgstr "Éditer un village" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2817 +#: build/trans_presets.java:2829 msgid "Hamlet" msgstr "Hameau" #. item -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2830 msgid "Edit Hamlet" msgstr "Éditer un hameau" @@ -21478,5 +21630,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2824 +#: build/trans_presets.java:2836 msgid "Locality" msgstr "Lieu-dit" @@ -21484,10 +21636,10 @@ #. item #. -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2838 msgid "Edit Locality" msgstr "Éditer un lieu-dit" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2843 msgid "Island" msgstr "île" @@ -21495,10 +21647,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2845 msgid "Edit Island" msgstr "Éditer une île" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2838 +#: build/trans_presets.java:2850 msgid "Islet" msgstr "" @@ -21506,5 +21658,5 @@ #. item #. -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2852 msgid "Edit Islet" msgstr "" @@ -21512,5 +21664,5 @@ #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2858 msgid "Cave Entrance" msgstr "Entrée de grotte" @@ -21518,10 +21670,10 @@ #. item #. -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2860 msgid "Edit Cave Entrance" msgstr "Éditer une entrée de grotte" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2864 msgid "Peak" msgstr "Sommet" @@ -21529,10 +21681,10 @@ #. item #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2866 msgid "Edit Peak" msgstr "Modifier un pic" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2871 msgid "Glacier" msgstr "Glacier" @@ -21540,10 +21692,10 @@ #. item #. -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2873 msgid "Edit Glacier" msgstr "Éditer un glacier" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2878 msgid "Volcano" msgstr "Volcan" @@ -21551,70 +21703,70 @@ #. item #. -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2880 msgid "Edit Volcano" msgstr "Éditer un volcan" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2886 msgid "Boundaries" msgstr "Frontières" #. group "Boundaries" -#: build/trans_presets.java:2875 +#: build/trans_presets.java:2887 msgid "National" msgstr "Nationale" #. item -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2888 msgid "Edit National Boundary" msgstr "Éditer une frontière nationale" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2881 +#: build/trans_presets.java:2893 msgid "Administrative" msgstr "Administrative" #. item -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2894 msgid "Edit Administrative Boundary" msgstr "Éditer une frontière administrative" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2887 +#: build/trans_presets.java:2899 msgid "Civil" msgstr "Civile" #. item -#: build/trans_presets.java:2888 +#: build/trans_presets.java:2900 msgid "Edit Civil Boundary" msgstr "Éditer une frontière civile" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2893 +#: build/trans_presets.java:2905 msgid "Political" msgstr "Politique" #. item -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2906 msgid "Edit Political Boundary" msgstr "Éditer une zone électorale" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2911 msgid "National park" msgstr "Parc national" #. item -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2912 msgid "Edit National Park Boundary" msgstr "Éditer les frontières d’un parc national" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2918 msgid "Land use" msgstr "Utilisation du terrain" #. group "Land use" -#: build/trans_presets.java:2907 +#: build/trans_presets.java:2919 msgid "Tree" msgstr "Arbre" @@ -21623,15 +21775,15 @@ #. -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2922 msgid "Edit Tree" msgstr "Éditer un arbre isolé" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2915 +#: build/trans_presets.java:2927 msgid "Botanical Name" msgstr "Nom botanique" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2929 msgid "Wood" msgstr "Bois" @@ -21640,5 +21792,5 @@ #. -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2932 msgid "Edit Wood" msgstr "Éditer un bois" @@ -21646,17 +21798,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "coniferous" msgstr "coniferous" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "deciduous" msgstr "deciduous" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "mixed" msgstr "mixed" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2937 msgid "Forest" msgstr "Forêt" @@ -21665,14 +21817,14 @@ #. -#: build/trans_presets.java:2928 +#: build/trans_presets.java:2940 msgid "Edit Forest Landuse" msgstr "Éditer une forêt" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2946 msgid "Nature Reserve" msgstr "Réserve naturelle" #. item -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2947 msgid "Edit Nature Reserve" msgstr "Éditer une réserve naturelle" @@ -21680,25 +21832,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2952 msgid "Scree" msgstr "Zone d’éboulements" #. item -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2953 msgid "Edit Scree" msgstr "Éditer une zone d’éboulements" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2957 msgid "Scrub" msgstr "Broussailles" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:2958 msgid "Edit Scrub" msgstr "Éditer des broussailles" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2962 msgid "Fell" msgstr "Talus" @@ -21706,10 +21858,10 @@ #. item #. -#: build/trans_presets.java:2952 +#: build/trans_presets.java:2964 msgid "Edit Fell" msgstr "Éditer un talus" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2968 msgid "Heath" msgstr "Lande" @@ -21717,5 +21869,5 @@ #. item #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2970 msgid "Edit Heath" msgstr "Éditer une lande" @@ -21723,5 +21875,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2975 msgid "Farmyard" msgstr "Bâtiments de ferme" @@ -21730,45 +21882,45 @@ #. -#: build/trans_presets.java:2966 +#: build/trans_presets.java:2978 msgid "Edit Farmyard Landuse" msgstr "Éditer des bâtiments de ferme" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2983 msgid "Farmland" msgstr "Terrains de ferme" #. item -#: build/trans_presets.java:2972 +#: build/trans_presets.java:2984 msgid "Edit Farmland Landuse" msgstr "Éditer des terrains de ferme" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2977 +#: build/trans_presets.java:2989 msgid "Meadow" msgstr "Prairie" #. item -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2990 msgid "Edit Meadow Landuse" msgstr "Editer prairie" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:2995 msgid "Vineyard" msgstr "Vigne" #. item -#: build/trans_presets.java:2984 +#: build/trans_presets.java:2996 msgid "Edit Vineyard Landuse" msgstr "Éditer une vigne" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3001 msgid "Allotments" msgstr "Jardins familiaux" #. item -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3002 msgid "Edit Allotments Landuse" msgstr "Éditer des jardins familiaux" @@ -21776,25 +21928,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3008 msgid "Garden" msgstr "Jardin" #. item -#: build/trans_presets.java:2997 +#: build/trans_presets.java:3009 msgid "Edit Garden" msgstr "Éditer un jardin" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3013 msgid "Grass" msgstr "Herbe" #. item -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3014 msgid "Edit Grass Landuse" msgstr "Éditer de l’herbe" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3019 msgid "Village Green" msgstr "Zone publique herborée" @@ -21802,10 +21954,10 @@ #. item #. -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3021 msgid "Edit Village Green Landuse" msgstr "Éditer une zone publique herborée" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3026 msgid "Common" msgstr "Espace commun" @@ -21813,20 +21965,20 @@ #. item #. -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3028 msgid "Edit Common" msgstr "Éditer un espace commun" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3032 msgid "Park" msgstr "Parc" #. item -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3033 msgid "Edit Park" msgstr "Editez un Parc" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3037 msgid "Recreation Ground" msgstr "Aire de jeux" @@ -21834,5 +21986,5 @@ #. item #. -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3039 msgid "Edit Recreation Ground Landuse" msgstr "Éditer une aire de jeux" @@ -21840,15 +21992,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3033 +#: build/trans_presets.java:3045 msgid "Residential area" msgstr "Zone résidentielle" #. item -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3046 msgid "Edit Residential Landuse" msgstr "Éditer une zone résidentielle" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3051 msgid "Graveyard" msgstr "Petit cimetière" @@ -21856,9 +22008,9 @@ #. item #. -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3053 msgid "Edit Graveyard" msgstr "Éditer un petit cimetière" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3059 msgid "Cemetery" msgstr "Cimetière" @@ -21866,39 +22018,39 @@ #. item #. -#: build/trans_presets.java:3049 +#: build/trans_presets.java:3061 msgid "Edit Cemetery Landuse" msgstr "Éditer un cimetière" -#: build/trans_presets.java:3056 +#: build/trans_presets.java:3068 msgid "Retail" msgstr "Zone commerciale" #. item -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3069 msgid "Edit Retail Landuse" msgstr "Éditer une zone commerciale" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3062 +#: build/trans_presets.java:3074 msgid "Commercial" msgstr "Bureaux" #. item -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3075 msgid "Edit Commercial Landuse" msgstr "Éditer des bureaux" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3068 +#: build/trans_presets.java:3080 msgid "Industrial" msgstr "Zone industrielle" #. item -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3081 msgid "Edit Industrial Landuse" msgstr "Éditer une zone industrielle" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3086 msgid "Railway land" msgstr "Zone ferroviaire" @@ -21906,15 +22058,15 @@ #. item #. -#: build/trans_presets.java:3076 +#: build/trans_presets.java:3088 msgid "Edit Railway Landuse" msgstr "Éditer une zone ferroviaire" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3081 +#: build/trans_presets.java:3093 msgid "Military" msgstr "Militaire" #. item -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3094 msgid "Edit Military Landuse" msgstr "Éditer un terrain militaire" @@ -21922,55 +22074,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3100 msgid "Construction area" msgstr "Zone de construction" #. item -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3101 msgid "Edit Construction Landuse" msgstr "Éditer un chantier" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3094 +#: build/trans_presets.java:3106 msgid "Brownfield" msgstr "Terrain en friche" #. item -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3107 msgid "Edit Brownfield Landuse" msgstr "Éditer un terrain en friche" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3100 +#: build/trans_presets.java:3112 msgid "Greenfield" msgstr "Espace vert" #. item -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3113 msgid "Edit Greenfield Landuse" msgstr "Éditer une nouvelle zone de construction" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3118 msgid "Landfill" msgstr "Décharge" #. item -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3119 msgid "Edit Landfill Landuse" msgstr "Éditer une décharge" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3124 msgid "Quarry" msgstr "Carrière" #. item -#: build/trans_presets.java:3113 +#: build/trans_presets.java:3125 msgid "Edit Quarry Landuse" msgstr "Éditer une carrière" #. group "Relations" -#: build/trans_presets.java:3122 +#: build/trans_presets.java:3134 msgid "Multipolygon" msgstr "Multypoligone" @@ -21980,5 +22132,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:3126 +#: build/trans_presets.java:3138 msgid "Edit Multipolygon" msgstr "Modifier un multipolygone" @@ -21987,10 +22139,10 @@ #. #. -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3144 msgid "outer segment" msgstr "segment extérieur" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3145 msgid "inner segment" msgstr "segment intérieur" @@ -21998,5 +22150,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3148 msgid "Turn restriction" msgstr "Interdiction de tourner" @@ -22005,5 +22157,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3151 msgid "Edit Turn Restriction" msgstr "Modifier une interdiction de tourner" @@ -22011,34 +22163,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "Restriction" msgstr "Restriction" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_left_turn" msgstr "Interdiction de tourner à gauche" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_right_turn" msgstr "Interdiction de tourner à droite" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_straight_on" msgstr "Interdiction d'aller tout droit" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_u_turn" msgstr "Interdiction de faire demi-tour" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_right_turn" msgstr "Obligation de tourner à droite" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_left_turn" msgstr "Obligation de tourner à gauche" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_straight_on" msgstr "Obligation d'aller tout droit" @@ -22047,15 +22199,15 @@ #. #. -#: build/trans_presets.java:3146 +#: build/trans_presets.java:3158 msgid "from way" msgstr "chemin d'origine" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3159 msgid "via node or way" msgstr "nœud ou chemin de passage" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3148 +#: build/trans_presets.java:3160 msgid "to way" msgstr "chemin destination" @@ -22063,5 +22215,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3151 +#: build/trans_presets.java:3163 msgid "Route" msgstr "Route" @@ -22070,5 +22222,5 @@ #. -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3166 msgid "Edit Route" msgstr "Modifier une route" @@ -22076,5 +22228,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "Route type" msgstr "Type de route" @@ -22146,5 +22298,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:233 +#: build/trans_presets.java:3168 build/trans_style.java:233 #: build/trans_style.java:683 build/trans_style.java:906 #: build/trans_style.java:914 build/trans_style.java:922 @@ -22153,17 +22305,17 @@ msgstr "vélo/bicyclette" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "road" msgstr "route" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ferry" msgstr "ferry" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ski" msgstr "ski" @@ -22216,5 +22368,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:247 +#: build/trans_presets.java:3168 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -22223,13 +22375,13 @@ msgstr "piéton" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "hiking" msgstr "randonnée" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "tram" msgstr "tram" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "detour" msgstr "détour" @@ -22243,10 +22395,10 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:1206 +#: build/trans_presets.java:3168 build/trans_style.java:1206 msgid "subway" msgstr "métro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3159 +#: build/trans_presets.java:3171 msgid "Symbol description" msgstr "Description du symbole" @@ -22254,31 +22406,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3174 msgid "Network" msgstr "Réseau" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "Route state" msgstr "État de la route" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "proposed" msgstr "proposé" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "alternate" msgstr "alternatif" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "temporary" msgstr "temporaire" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "connection" msgstr "connexion" -#: build/trans_presets.java:3165 +#: build/trans_presets.java:3177 msgid "Color (hex)" msgstr "Couleur (hexa)" @@ -22287,30 +22439,30 @@ #. #. -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3180 msgid "route segment" msgstr "segment de route" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3181 msgid "forward segment" msgstr "segment suivant" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3170 +#: build/trans_presets.java:3182 msgid "backward segment" msgstr "segment précédent" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3183 msgid "halt point" msgstr "point d'arrêt" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3172 +#: build/trans_presets.java:3184 msgid "forward halt point" msgstr "point d'arrêt suivant" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3173 +#: build/trans_presets.java:3185 msgid "backward halt point" msgstr "point d'arrêt précédent" @@ -26269,10 +26421,10 @@ #: build/trans_validator.java:40 msgid "oneway tag on a node" -msgstr "étiquette sens unique sur un nœud" +msgstr "attribut « sens unique (oneway) » sur un nœud" #. node : W : oneway == * #: build/trans_validator.java:41 msgid "bridge tag on a node" -msgstr "étiquette \"pont\" sur un nœud" +msgstr "attribut « pont (bridge) » sur un nœud" #. node : W : bridge == BOOLEAN_TRUE @@ -26285,5 +26437,5 @@ #: build/trans_validator.java:46 msgid "wrong highway tag on a node" -msgstr "mauvaise étiquette voie sur un nœud" +msgstr "valeur incorrecte de l’attribute « voie (highway) » sur un nœud" #. node : W : highway == track @@ -26316,10 +26468,10 @@ #: build/trans_validator.java:58 msgid "cycleway with tag bicycle" -msgstr "voie cyclable avec étiquette vélo" +msgstr "voie cyclable (cycleway) avec l’attribut « vélo (bicyle) »" #. way : W : highway == cycleway && bicycle == BOOLEAN_FALSE #: build/trans_validator.java:59 msgid "footway with tag foot" -msgstr "voie piétonnière avec étiquette piéton" +msgstr "voie piétonnière (footway) avec l’attribut « vélo (foot) »" #. way : W : highway == footway && foot == BOOLEAN_FALSE @@ -26369,5 +26521,5 @@ #: build/trans_validator.java:79 msgid "unusual tag combination" -msgstr "combinaison d'étiquettes inhabituelle" +msgstr "combinaison d’attributs inhabituelle" #. FORMAT @@ -26448,9 +26600,29 @@ msgstr "Czech UHUL:ORTOFOTO" +#~ msgid "Combine ways with different memberships?" +#~ msgstr "" +#~ "Fusionner des chemins qui ne sont pas les mêmes membres d’une relation ?" + +#~ msgid "Combine Anyway" +#~ msgstr "Fusionner quand même" + #~ msgid "" -#~ "Hailed to set reference. Reference ID {0} does not match history ID {1}." +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" #~ msgstr "" -#~ "impossible de définir la référence. la référence d’id {0} ne correspond " -#~ "pas à l'historique d’id {1}" +#~ "Les chemins sélectionnés ne sont pas les mêmes membres d’une relation. " +#~ "Voulez-vous encore les fusionner ?" + +#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +#~ msgstr "Erreur : l’en-tête \"{0}\" ne correspond pas au modèle \"{1}\"" + +#~ msgid "Purging 1 primitive" +#~ msgstr "Suppression d’une primitive" + +#~ msgid "removing reference from way {0}" +#~ msgstr "suppression de la référence du chemin {0}" + +#~ msgid "Empty member in relation." +#~ msgstr "Membre vide dans la relation." #~ msgid "Move" @@ -27052,7 +27224,4 @@ #~ msgstr "Impossible de lire une valeur numérique dans la réponse" -#~ msgid "linked" -#~ msgstr "lié" - #~ msgid "% of lon:" #~ msgstr "% de lon. :" @@ -27262,2 +27431,8 @@ #~ "Page d’aide manquante. Créez la sur English ou French." + +#~ msgid "" +#~ "Hailed to set reference. Reference ID {0} does not match history ID {1}." +#~ msgstr "" +#~ "impossible de définir la référence. la référence d’id {0} ne correspond " +#~ "pas à l'historique d’id {1}" Index: /applications/editors/josm/i18n/po/gl.po =================================================================== --- /applications/editors/josm/i18n/po/gl.po (revision 17821) +++ /applications/editors/josm/i18n/po/gl.po (revision 17822) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-22 17:52+0200\n" +"POT-Creation-Date: 2009-09-28 16:38+0200\n" "PO-Revision-Date: 2009-09-22 15:04+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: 2009-09-22 15:46+0000\n" +"X-Launchpad-Export-Date: 2009-09-28 14:34+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -66,8 +66,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250 @@ -90,9 +90,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -141,7 +141,7 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:172 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 @@ -154,5 +154,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 @@ -329,6 +328,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -338,6 +336,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 @@ -347,5 +345,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -356,5 +354,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180 @@ -363,5 +361,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -454,9 +452,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -488,10 +486,9 @@ msgstr "Por favor, selecciona polo menos catro nodos." -#. FIXME: not sure whether this fits in a dialog #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:85 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -601,5 +598,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 #, java-format msgid "File: {0}" @@ -621,36 +618,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine Way" msgstr "Combinar vía" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 msgid "Combine several ways into one." msgstr "Combinar varias vías en unha." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 -msgid "Combine ways with different memberships?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -msgid "Combine Anyway" -msgstr "Combinar de todas formas" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 msgid "Change directions?" msgstr "Cambiar direccións?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Reverse and Combine" msgstr "Invertir e Combinar" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -660,5 +643,5 @@ "invertir algunhas?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -668,10 +651,10 @@ "serie de nodos)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 #, java-format msgid "Combine {0} ways" msgstr "Combinar {0} vías" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 msgid "Please select at least two ways to combine." msgstr "Por favor, selecciona polo menos dúas vías para combinar." @@ -716,6 +699,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -781,5 +763,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -810,5 +792,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307 #, java-format msgid "There were {0} conflicts during import." @@ -826,5 +807,4 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Duplicate" @@ -855,10 +835,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:209 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Exportar a GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:208 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Exportar os datos a un ficheiro GPX." @@ -869,8 +849,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -935,5 +915,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 @@ -976,6 +956,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1065,18 +1044,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge Nodes" msgstr "Acoplar Nodos" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 msgid "Merge nodes into the oldest one." msgstr "Acoplar nodos no máis antigo" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 msgid "Please select at least two nodes to merge." msgstr "Por favor, selecciona polo menos dous nodos a acoplar." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -1084,5 +1063,5 @@ "uso." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 #, java-format msgid "Merge {0} nodes" @@ -1154,5 +1133,4 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350 msgid "New" msgstr "Nova" @@ -1333,10 +1311,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Gardar" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Gardar os datos actuais." @@ -1393,10 +1371,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Gardar como..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Gardar os datos actuais nun novo ficheiro." @@ -1441,5 +1419,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:961 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888 @@ -1686,14 +1664,14 @@ msgstr "Selección valeira" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 msgid "Upload to OSM..." msgstr "Subir a OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload all changes to the OSM server." msgstr "SIbir todos os cambios ó servidor OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 #, java-format msgid "" @@ -1702,23 +1680,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Nada que subir. Consigue algún dato antes." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:171 msgid "No changes to upload." msgstr "Non hai cambios que subir." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223 #, java-format msgid "Synchronize {0} {1} only" msgstr "Sincronizar só {0} {1}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 msgid "Synchronize entire dataset" msgstr "Sincronizar o paquete de datos completo" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:228 #, java-format msgid "" @@ -1740,17 +1718,17 @@ "continuar editando.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:283 msgid "Conflict detected" msgstr "Detectado un conflito" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:257 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 #, java-format msgid "Unexpected return value. Got {0}." msgstr "valor retornado non esperado. Obtívose {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:272 #, java-format msgid "" @@ -1766,5 +1744,5 @@ "editando.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:306 #, java-format msgid "" @@ -1774,9 +1752,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 msgid "Changeset closed" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" @@ -1785,25 +1763,30 @@ "\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:425 #, java-format msgid "Uploading failed.
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:434 msgid "Upload to OSM API failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457 msgid "Updating primitive" msgstr "Actualizando primitiva" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:514 #, java-format msgid "Uploading data for layer ''{0}''" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." msgstr "" @@ -1892,13 +1875,13 @@ msgstr "Avance máis lento" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34 msgid "Downloading GPS data" msgstr "Descargando datos GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57 msgid "Downloaded GPX Data" msgstr "Datos GPX Descargados" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87 msgid "Raw GPS data" msgstr "Datos GPS en bruto" @@ -1912,4 +1895,8 @@ msgid "" "Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 +msgid "No data found in this area." msgstr "" @@ -2620,9 +2607,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 +#, java-format +msgid "" +"Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -2671,5 +2658,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Delete from relation" msgstr "Borrar da relación" @@ -2722,14 +2709,15 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 -msgid "Purging 1 primitive" -msgstr "Purgando 1 primitiva" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 -#, java-format -msgid "removing reference from way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 +#, fuzzy, java-format +msgid "Purged object ''{0}''" +msgstr "Mover obxectos {0}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 +#, fuzzy, java-format +msgid "Purged {0} objects" +msgstr "Cambiar {0} obxecto" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 #, java-format msgid "" @@ -2740,8 +2728,8 @@ "2. Os actuais son {1}" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203 -#, java-format -msgid "removing reference from relation {0}" -msgstr "" +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 +#, fuzzy, java-format +msgid "Removing reference from relation {0}" +msgstr "Borrar realmente a selección da relación {0}?" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 @@ -2749,4 +2737,9 @@ msgid "Resolve conflicts in member list of relation {0}" msgstr "Resolver conflitos na lista de membros da relación {0}" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 @@ -3089,24 +3082,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Error: {0}" msgstr "Erro: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Warning: {0}" msgstr "Advertencia: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3114,5 +3107,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3138,6 +3131,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:244 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3196,120 +3189,113 @@ msgstr "a vía multipoligonal \"{0}\" non está pechada." -#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed -#. TODO Remove useless nullcheck when RelationMember.member is encalupsed -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855 -msgid "Empty member in relation." -msgstr "Membro vacío na relación." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:850 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Membro \"{0}\" borrado na relación." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:861 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Vía \"{0}\" con menos de dous puntos." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 msgid "More than one \"from\" way found." msgstr "Atopadas máis de unha vía \"desde\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:607 msgid "More than one \"to\" way found." msgstr "Atopadas máis de unha vía \"ata\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:613 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627 msgid "More than one \"via\" found." msgstr "Atopouse máis de un \"vía\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:632 #, java-format msgid "Unknown role ''{0}''." msgstr "Papel \"{0}\" descoñecido." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Tipo de membro descoñecido para \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:641 msgid "No \"from\" way found." msgstr "Non se atoparon vias \"desde\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645 msgid "No \"to\" way found." msgstr "Non se atoparon vías \"ata\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:649 msgid "No \"via\" node or way found." msgstr "Ningún nodo o vía \"vía\" atopados." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:658 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "A vía \"desde\" non comeza ou finaliza en un nodo \"vía\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:662 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "A vía \"ata\" non comeza ou finaliza en un nodo \"vía\"." +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693 -msgid "The \"from\" way doesn't start or end at the \"via\" way." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816 #, java-format msgid "Style for restriction {0} not found." msgstr "Non se atopou o estilo para a restrición {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:870 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Non hai un rol ''{0}'' útil para a Vía ''{1}'.'" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:882 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:940 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1029 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Intersección entre as vías ''{0}'' e ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1041 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "A vía interior ''{0}'' está fóra." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1094 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1120 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1324 msgid "untagged" msgstr "Sen etiquetar" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1325 msgid "text" msgstr "texto" @@ -3331,5 +3317,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:249 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 @@ -3340,5 +3326,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 @@ -3367,5 +3353,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:169 msgid "background" msgstr "fondo" @@ -3457,5 +3443,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "railway" msgstr "Vía férrea" @@ -3511,9 +3497,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +#, fuzzy +msgid "Not Found" +msgstr "Ficheiro non atopado" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 msgid "Unknown host" msgstr "Maquina descoñecida" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:247 msgid "Primitive already deleted" msgstr "A primitiva xa foi borrada" @@ -4826,5 +4817,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -5040,43 +5031,43 @@ msgstr "Membro de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 msgid "Add Properties" msgstr "Engadir Propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 msgid "Add a new key/value pair to all objects" msgstr "Engadir un novo par clave/valor para todos os obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 msgid "Edit Properties" msgstr "Editar Propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 msgid "Edit the value of the selected key for all objects" msgstr "Editar o valor da clave seleccionada para todos os obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 msgid "Properties / Memberships" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 msgid "Change relation" msgstr "Cambiar relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Borrar realmente a selección da relación {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:855 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 msgid "Delete the selected key in all objects" msgstr "Borrar a clave seleccionada en todos os obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 msgid "Delete Properties" msgstr "Borrar Propiedades" @@ -5086,6 +5077,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168 -#: build/trans_presets.java:3121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 +#: build/trans_presets.java:3133 msgid "Relations" msgstr "Relacións" @@ -5095,25 +5086,30 @@ msgstr "Abrir unha lista con todas as relacións." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:174 #, java-format msgid "Relations: {0}" msgstr "Relacións: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 msgid "Open an editor for the selected relation" msgstr "Abrir un editor para a relación seleccionada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:325 msgid "Delete the selected relation" msgstr "Borrar a relación seleccionada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:363 msgid "Create a new relation" msgstr "Crear unha nova relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:400 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280 msgid "Create a copy of this relation and open it in another editor window" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 +#, fuzzy +msgid "Set the current selection to the list of selected relations" +msgstr "A selección actual non pode ser usada para a separación." #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5154,9 +5150,9 @@ msgstr "Selección: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 msgid "Undock the panel" msgstr "Desacoplar o panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5165,5 +5161,5 @@ "da esquerda." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 msgid "Click to minimize/maximize the panel content" msgstr "Facer click para minimizar/maximizar o contido do panel" @@ -5677,5 +5673,5 @@ #. group "Geography" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2771 msgid "Places" msgstr "Lugares" @@ -6349,6 +6345,4 @@ #. item "Man Made/Windmill" label "Edit Windmill" #. -#. item "Man Made/Pipeline" label "Edit Pipeline" -#. #. item "Man Made/Wastewater Plant" label "Edit Wastewater Plant" #. @@ -6361,4 +6355,6 @@ #. item "Man Made/Surveillance" label "Edit Surveillance Camera" #. +#. item "Man Made/Power Station" label "Edit Power Station" +#. #. item "Amenities/Fountain" label "Edit Fountain" #. @@ -6683,57 +6679,57 @@ #: build/trans_presets.java:2250 build/trans_presets.java:2258 #: build/trans_presets.java:2290 build/trans_presets.java:2295 -#: build/trans_presets.java:2300 build/trans_presets.java:2305 -#: build/trans_presets.java:2311 build/trans_presets.java:2317 -#: build/trans_presets.java:2323 build/trans_presets.java:2331 -#: build/trans_presets.java:2337 build/trans_presets.java:2343 -#: build/trans_presets.java:2349 build/trans_presets.java:2355 -#: build/trans_presets.java:2365 build/trans_presets.java:2462 -#: build/trans_presets.java:2469 build/trans_presets.java:2483 -#: build/trans_presets.java:2489 build/trans_presets.java:2496 -#: build/trans_presets.java:2503 build/trans_presets.java:2509 -#: build/trans_presets.java:2515 build/trans_presets.java:2537 -#: build/trans_presets.java:2544 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2305 build/trans_presets.java:2310 +#: build/trans_presets.java:2316 build/trans_presets.java:2322 +#: build/trans_presets.java:2339 build/trans_presets.java:2345 +#: build/trans_presets.java:2351 build/trans_presets.java:2357 +#: build/trans_presets.java:2363 build/trans_presets.java:2373 +#: build/trans_presets.java:2380 build/trans_presets.java:2474 +#: build/trans_presets.java:2481 build/trans_presets.java:2495 +#: build/trans_presets.java:2501 build/trans_presets.java:2508 +#: build/trans_presets.java:2515 build/trans_presets.java:2521 +#: build/trans_presets.java:2527 build/trans_presets.java:2549 +#: build/trans_presets.java:2556 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2576 #: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2594 build/trans_presets.java:2601 -#: build/trans_presets.java:2608 build/trans_presets.java:2615 -#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2594 build/trans_presets.java:2600 +#: build/trans_presets.java:2606 build/trans_presets.java:2613 +#: build/trans_presets.java:2620 build/trans_presets.java:2627 #: build/trans_presets.java:2633 build/trans_presets.java:2639 -#: build/trans_presets.java:2645 build/trans_presets.java:2652 -#: build/trans_presets.java:2659 build/trans_presets.java:2666 -#: build/trans_presets.java:2672 build/trans_presets.java:2678 -#: build/trans_presets.java:2688 build/trans_presets.java:2697 -#: build/trans_presets.java:2712 build/trans_presets.java:2718 -#: build/trans_presets.java:2726 build/trans_presets.java:2733 -#: build/trans_presets.java:2753 build/trans_presets.java:2764 -#: build/trans_presets.java:2770 build/trans_presets.java:2776 +#: build/trans_presets.java:2645 build/trans_presets.java:2651 +#: build/trans_presets.java:2657 build/trans_presets.java:2664 +#: build/trans_presets.java:2671 build/trans_presets.java:2678 +#: build/trans_presets.java:2684 build/trans_presets.java:2690 +#: build/trans_presets.java:2700 build/trans_presets.java:2709 +#: build/trans_presets.java:2724 build/trans_presets.java:2730 +#: build/trans_presets.java:2738 build/trans_presets.java:2745 +#: build/trans_presets.java:2765 build/trans_presets.java:2776 #: build/trans_presets.java:2782 build/trans_presets.java:2788 -#: build/trans_presets.java:2795 build/trans_presets.java:2802 -#: build/trans_presets.java:2809 build/trans_presets.java:2815 -#: build/trans_presets.java:2821 build/trans_presets.java:2829 -#: build/trans_presets.java:2836 build/trans_presets.java:2843 -#: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2879 build/trans_presets.java:2885 +#: build/trans_presets.java:2794 build/trans_presets.java:2800 +#: build/trans_presets.java:2807 build/trans_presets.java:2814 +#: build/trans_presets.java:2821 build/trans_presets.java:2827 +#: build/trans_presets.java:2833 build/trans_presets.java:2841 +#: build/trans_presets.java:2848 build/trans_presets.java:2855 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2875 build/trans_presets.java:2882 #: build/trans_presets.java:2891 build/trans_presets.java:2897 -#: build/trans_presets.java:2903 build/trans_presets.java:2912 -#: build/trans_presets.java:2922 build/trans_presets.java:2931 -#: build/trans_presets.java:2937 build/trans_presets.java:2943 -#: build/trans_presets.java:2948 build/trans_presets.java:2954 -#: build/trans_presets.java:2960 build/trans_presets.java:2969 -#: build/trans_presets.java:2975 build/trans_presets.java:2981 +#: build/trans_presets.java:2903 build/trans_presets.java:2909 +#: build/trans_presets.java:2915 build/trans_presets.java:2924 +#: build/trans_presets.java:2934 build/trans_presets.java:2943 +#: build/trans_presets.java:2949 build/trans_presets.java:2955 +#: build/trans_presets.java:2960 build/trans_presets.java:2966 +#: build/trans_presets.java:2972 build/trans_presets.java:2981 #: build/trans_presets.java:2987 build/trans_presets.java:2993 #: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3012 build/trans_presets.java:3018 -#: build/trans_presets.java:3023 build/trans_presets.java:3030 -#: build/trans_presets.java:3037 build/trans_presets.java:3043 -#: build/trans_presets.java:3052 build/trans_presets.java:3060 -#: build/trans_presets.java:3066 build/trans_presets.java:3072 -#: build/trans_presets.java:3079 build/trans_presets.java:3085 -#: build/trans_presets.java:3092 build/trans_presets.java:3098 +#: build/trans_presets.java:3011 build/trans_presets.java:3017 +#: build/trans_presets.java:3024 build/trans_presets.java:3030 +#: build/trans_presets.java:3035 build/trans_presets.java:3042 +#: build/trans_presets.java:3049 build/trans_presets.java:3055 +#: build/trans_presets.java:3064 build/trans_presets.java:3072 +#: build/trans_presets.java:3078 build/trans_presets.java:3084 +#: build/trans_presets.java:3091 build/trans_presets.java:3097 #: build/trans_presets.java:3104 build/trans_presets.java:3110 -#: build/trans_presets.java:3116 build/trans_presets.java:3129 -#: build/trans_presets.java:3143 build/trans_presets.java:3157 +#: build/trans_presets.java:3116 build/trans_presets.java:3122 +#: build/trans_presets.java:3128 build/trans_presets.java:3141 +#: build/trans_presets.java:3155 build/trans_presets.java:3169 msgid "Name" msgstr "Nome" @@ -6796,5 +6792,4 @@ msgstr "" -#. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 msgid "Close the selected open changesets" @@ -6822,25 +6817,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "Yes" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "No" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47 #, java-format msgid "Layer ''{0}'' has modifications which should be uploaded to the server." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49 #, java-format msgid "Layer ''{0}'' has no modifications to be uploaded." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60 #, java-format msgid "" @@ -6849,29 +6844,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62 #, java-format msgid "Layer ''{0}'' has no modifications to be saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80 msgid "No file associated with this layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:83 msgid "Please select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:86 #, java-format msgid "Layer ''{0}'' is not backed by a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:101 #, java-format msgid "File ''{0}'' is not writable. Please enter another file name." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:115 #, java-format msgid "Select to upload layer ''{0}'' to the server ''{1}''" @@ -6964,5 +6959,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -msgid "Save and Exit" +#, fuzzy +msgid "Save/Upload and Exit" msgstr "Gardar e Sair" @@ -6972,6 +6968,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -msgid "Save and Delete" -msgstr "" +#, fuzzy +msgid "Save/Upload and Delete" +msgstr "Subida de datos cancelada" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 @@ -6987,5 +6984,5 @@ msgid "" "An upload and/or save operation of one layer with modifications
was " -"cancelled or has been failed." +"cancelled or has failed." msgstr "" @@ -7071,6 +7068,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:891 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:921 msgid "Tags of new changeset" msgstr "" @@ -7167,7 +7164,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:909 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:933 #, java-format msgid "Tags of changeset {0}" @@ -7175,48 +7171,48 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:949 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:963 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1011 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106 msgid "Preparing primitives to upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Imaxes para {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "Ler GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Non hai hora para o punto {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Non se puido ler a hora \"{0}\" do punto {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325 msgid "No images with readable timestamps found." msgstr "Non se atoparon imaxes con marcas de tempo lexibles." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format @@ -7224,29 +7220,29 @@ msgstr "Lendo {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:402 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246 msgid "Geotagged Images" msgstr "Imaxes xeo-etiquetadas" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:587 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "GPS start: {0}" msgstr "Inicio GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 #, java-format msgid "GPS end: {0}" msgstr "Fin GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594 #, java-format msgid "current delta: {0}s" msgstr "delta actual: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595 msgid "timezone difference: " msgstr "Diferencia de zona horaria: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284 msgid "image" @@ -7255,14 +7251,14 @@ msgstr[1] "imaxes" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #, java-format msgid "{0} within the track." msgstr "{0} dentro da traza." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680 msgid "Sync clock" msgstr "Sincronizar reloxo" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7270,32 +7266,32 @@ msgstr "imaxes JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:734 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "A data no ficheiro \"{0}\" non puido ser analizada." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Non hai hora EXIF no ficheiro \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 msgid "Image" msgstr "Imaxe" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:752 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Introduce a data amosada (mm/dd/yyy HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759 msgid "GPS unit timezone (difference to photo)" msgstr "Zona horaria da unidade GPS (differencia coa foto)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:767 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771 msgid "Synchronize Time with GPS Unit" msgstr "Sincronizar hora coa da unidade GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:790 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 msgid "Time entered could not be parsed." msgstr "A hora introducida non puido ser analizada." @@ -7379,5 +7375,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 #, java-format msgid "Name: {0}" @@ -7400,5 +7396,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3160 +#: build/trans_presets.java:3172 msgid "Description" msgstr "" @@ -7454,5 +7450,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:587 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 @@ -7517,42 +7513,65 @@ "correctamente os seus tempos foron omitidos." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:105 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:107 #, java-format msgid "Data Layer {0}" msgstr "Capa de datos {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 msgid "outside downloaded area" msgstr "fora da área descargada" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:252 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:289 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:290 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 +#, fuzzy, java-format +msgid "There was {0} conflict detected." +msgid_plural "There were {0} conflicts detected." +msgstr[0] "Detectado un conflito" +msgstr[1] "Detectado un conflito" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 +#, java-format +msgid "" +"{0} object has been purged from the local dataset because it is deleted on " +"the server." +msgid_plural "" +"{0} objects have been purged from the local dataset because they are deleted " +"on the server." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 +#, fuzzy +msgid "Conflicts detected" +msgstr "Detectado un conflito" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 #, java-format msgid "{0} consists of:" msgstr "{0} composto de:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:476 #, java-format msgid " ({0} deleted.)" msgstr " ({0} borrados.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:501 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:584 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" @@ -7918,5 +7937,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:412 #: ../plugins/terracer/src/terracer/TerracerAction.java:430 @@ -8689,5 +8708,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261 msgid "More information about this feature" msgstr "Máis información acerca desta característica" @@ -8736,5 +8755,5 @@ msgstr "Os elementos do tipo {0} están soportados." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:700 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -8744,18 +8763,18 @@ msgstr[1] "Cambiar {0} obxectos" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Nada seleccionado!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 msgid "Selection unsuitable!" msgstr "Selección non axeitada!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 msgid "Apply Preset" msgstr "Aplicar axuste preestablecido" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788 msgid "Change Properties" msgstr "Cambiar Propiedades" @@ -9043,44 +9062,44 @@ msgstr "Pechando colección de cambios..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 msgid "Preparing..." msgstr "Preparando..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 msgid "Uploading..." msgstr "Subindo..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9311,5 +9330,5 @@ msgid "" "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}''," -"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." +"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." msgstr "" @@ -9426,6 +9445,6 @@ #, java-format msgid "" -"Relation with external id ''{0}'' refers to missing primitive with external " -"id ''{1}''." +"Relation with external id ''{0}'' refers to a missing primitive with " +"external id ''{1}''." msgstr "" @@ -9522,32 +9541,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:73 msgid "Starting to upload with one request per primitive ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Starting to upload in one request ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 +#, fuzzy, java-format +msgid "Parameter ''{0}'' must not be null" +msgstr "o parámetro \"{0}\" debe non ser nulo" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 msgid "Uploading data ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 msgid "" "WARNING: no API version defined for data to upload. Falling back to version " @@ -9555,5 +9579,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:153 #, java-format msgid "" @@ -9777,5 +9801,5 @@ #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:202 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:324 build/trans_presets.java:325 @@ -9797,6 +9821,6 @@ #: build/trans_presets.java:789 build/trans_presets.java:1333 #: build/trans_presets.java:1400 build/trans_presets.java:1401 -#: build/trans_presets.java:1402 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 +#: build/trans_presets.java:1402 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 msgid "unknown" msgstr "descoñecido" @@ -9943,5 +9967,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:192 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:182 +#, java-format +msgid "" +"The OSM server ''{0}'' doesn't know about an object
you tried to read, " +"update, or delete. Either the respective object
doesn''t exist on the " +"server or you''re using an invalid URL to access
it. Please carefully " +"check the servers address ''{1}'' for typos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:209 #, java-format msgid "" @@ -9951,5 +9984,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:262 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:279 #, java-format msgid "" @@ -10205,17 +10238,15 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35 msgid "Define Address Interpolation" msgstr "" -#. Whether to re-trigger data changed for relation #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:413 #: ../plugins/terracer/src/terracer/TerracerAction.java:437 @@ -10223,99 +10254,99 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 msgid "Alphabetic" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161 #, java-format msgid "Relation: {0}" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173 msgid "Associate with street using:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184 msgid "Numbering Scheme:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 msgid "Starting #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188 msgid "Ending #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 #, java-format msgid "Will associate {0} additional house number nodes" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 msgid "Starting address number must be less than ending address number" msgstr "" @@ -11047,4 +11078,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52 +#: build/trans_presets.java:2331 msgid "Location" msgstr "" @@ -11586,4 +11618,5 @@ msgstr "" +#. item "Man Made/Pipeline" combo "Type" #. color highway_track #. @@ -11629,7 +11662,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:990 build/trans_style.java:1007 -#: build/trans_style.java:1023 build/trans_style.java:3400 -#: build/trans_style.java:3408 +#: build/trans_presets.java:2330 build/trans_style.java:990 +#: build/trans_style.java:1007 build/trans_style.java:1023 +#: build/trans_style.java:3400 build/trans_style.java:3408 msgid "water" msgstr "" @@ -14155,9 +14188,11 @@ #. item "Public Transport/Airport" text "Name" #. +#. item "Man Made/Power Station" text "Operator" #. item "Relations/Route" text "Name" #: build/trans_presets.java:65 build/trans_presets.java:101 #: build/trans_presets.java:121 build/trans_presets.java:141 #: build/trans_presets.java:178 build/trans_presets.java:198 -#: build/trans_presets.java:1560 build/trans_presets.java:3158 +#: build/trans_presets.java:1560 build/trans_presets.java:2382 +#: build/trans_presets.java:3170 msgid "Reference" msgstr "" @@ -14719,5 +14754,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 msgid "metal" msgstr "" @@ -14737,5 +14772,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 #: build/trans_style.java:3375 msgid "wood" @@ -15024,7 +15059,7 @@ #: build/trans_presets.java:1401 build/trans_presets.java:1402 #: build/trans_presets.java:1767 build/trans_presets.java:1777 -#: build/trans_presets.java:2408 build/trans_presets.java:2444 -#: build/trans_presets.java:2453 build/trans_presets.java:2454 -#: build/trans_presets.java:2455 build/trans_presets.java:2725 +#: build/trans_presets.java:2420 build/trans_presets.java:2456 +#: build/trans_presets.java:2465 build/trans_presets.java:2466 +#: build/trans_presets.java:2467 build/trans_presets.java:2737 msgid "yes" msgstr "" @@ -15173,8 +15208,8 @@ #: build/trans_presets.java:1400 build/trans_presets.java:1401 #: build/trans_presets.java:1402 build/trans_presets.java:1767 -#: build/trans_presets.java:1777 build/trans_presets.java:2408 -#: build/trans_presets.java:2444 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 -#: build/trans_presets.java:2725 +#: build/trans_presets.java:1777 build/trans_presets.java:2420 +#: build/trans_presets.java:2456 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 +#: build/trans_presets.java:2737 msgid "no" msgstr "" @@ -15312,6 +15347,8 @@ #. item "Water/Wetland" text "Name" #. item "Car/Parking" text "Reference number" +#. item "Man Made/Pipeline" text "Operator" #. item "Man Made/Power Generator" label "Edit Power Generator" #. +#. item "Man Made/Power Tower" label "Edit Power Tower" #. item "Land use/Tree" text "Name" #. item "Land use/Wood" text "Name" @@ -15319,7 +15356,8 @@ #: build/trans_presets.java:350 build/trans_presets.java:649 #: build/trans_presets.java:789 build/trans_presets.java:1137 -#: build/trans_presets.java:1395 build/trans_presets.java:2364 -#: build/trans_presets.java:2913 build/trans_presets.java:2923 -#: build/trans_presets.java:2932 +#: build/trans_presets.java:1395 build/trans_presets.java:2330 +#: build/trans_presets.java:2372 build/trans_presets.java:2398 +#: build/trans_presets.java:2925 build/trans_presets.java:2935 +#: build/trans_presets.java:2944 msgid "Type" msgstr "" @@ -15869,10 +15907,10 @@ #. item "Tourism/Information Terminal" text "Closer description" #. item "Tourism/Audioguide" text "Closer description" -#. item "Man Made/Power Station" label "Edit Power Station" -#. +#. item "Man Made/Tower" text "Height (meters)" +#. item "Man Made/Pipeline" label "Edit Pipeline" +#. +#. item "Man Made/Power Station" text "Name" #. item "Man Made/Power Sub Station" label "Edit Power Sub Station" #. -#. item "Man Made/Power Line" label "Edit Power Line" -#. #. item #. #: build/trans_presets.java:1535 build/trans_presets.java:1789 -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2465 msgid "Shelter" msgstr "" @@ -18230,5 +18270,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1877 build/trans_presets.java:2669 +#: build/trans_presets.java:1877 build/trans_presets.java:2681 msgid "Sports" msgstr "" @@ -19581,6 +19621,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "Religion" msgstr "" @@ -19589,66 +19629,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "bahai" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "buddhist" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "christian" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "hindu" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jain" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jewish" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "muslim" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "sikh" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "spiritualist" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "taoist" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "zoroastrian" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "Denomination" msgstr "" @@ -19657,76 +19697,76 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "anglican" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "baptist" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "catholic" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "evangelical" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "jehovahs_witness" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "lutheran" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "methodist" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "mormon" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "orthodox" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "pentecostal" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "presbyterian" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "protestant" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "quaker" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "shia" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "sunni" msgstr "" @@ -19822,25 +19862,47 @@ #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2296 +msgid "Tower type" +msgstr "" + +#. item "Man Made/Tower" combo "Tower type" +#: build/trans_presets.java:2296 +msgid "communication" +msgstr "" + +#: build/trans_presets.java:2296 +#, fuzzy +msgid "observation" +msgstr "Información" + +#. +#: build/trans_presets.java:2298 +#, fuzzy +msgid "Height (meters)" +msgstr "Lonxitude máxima (metros)" + +#. item "Man Made/Tower" text "Operator" +#. +#: build/trans_presets.java:2302 msgid "Water Tower" msgstr "" #. item -#: build/trans_presets.java:2298 +#: build/trans_presets.java:2303 msgid "Edit Water Tower" msgstr "" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2307 msgid "Gasometer" msgstr "" #. item -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2308 msgid "Edit Gasometer" msgstr "" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2307 +#: build/trans_presets.java:2312 msgid "Lighthouse" msgstr "" @@ -19848,10 +19910,10 @@ #. item #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2314 msgid "Edit Lighthouse" msgstr "" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2318 msgid "Windmill" msgstr "" @@ -19859,21 +19921,51 @@ #. item #. -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2320 msgid "Edit Windmill" msgstr "" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2319 +#: build/trans_presets.java:2324 msgid "Pipeline" msgstr "" #. item -#. -#: build/trans_presets.java:2321 +#. +#: build/trans_presets.java:2327 msgid "Edit Pipeline" msgstr "" -#. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2330 +msgid "oil" +msgstr "" + +#: build/trans_presets.java:2330 build/trans_presets.java:2372 +msgid "gas" +msgstr "" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "sewage" +msgstr "uso" + +#: build/trans_presets.java:2330 +msgid "heat" +msgstr "" + +#: build/trans_presets.java:2330 +msgid "any substance" +msgstr "" + +#: build/trans_presets.java:2331 +msgid "underwater" +msgstr "" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "overground" +msgstr "fondo" + +#: build/trans_presets.java:2333 msgid "Wastewater Plant" msgstr "" @@ -19883,10 +19975,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:2329 +#: build/trans_presets.java:2337 msgid "Edit Wastewater Plant" msgstr "" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2333 +#: build/trans_presets.java:2341 msgid "Crane" msgstr "" @@ -19894,10 +19986,10 @@ #. item #. -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2343 msgid "Edit Crane" msgstr "" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2347 msgid "Beacon" msgstr "" @@ -19905,10 +19997,10 @@ #. item #. -#: build/trans_presets.java:2341 +#: build/trans_presets.java:2349 msgid "Edit Beacon" msgstr "" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2353 msgid "Survey Point" msgstr "" @@ -19916,10 +20008,10 @@ #. item #. -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2355 msgid "Edit Survey Point" msgstr "" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2359 msgid "Surveillance" msgstr "" @@ -19927,5 +20019,5 @@ #. item #. -#: build/trans_presets.java:2353 +#: build/trans_presets.java:2361 msgid "Edit Surveillance Camera" msgstr "" @@ -19933,5 +20025,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2366 msgid "Power Generator" msgstr "" @@ -19941,39 +20033,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:2362 +#: build/trans_presets.java:2370 msgid "Edit Power Generator" msgstr "" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "wind" msgstr "" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "hydro" msgstr "" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "fossil" msgstr "" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "nuclear" msgstr "" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "coal" msgstr "" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "photovoltaic" msgstr "" -#: build/trans_presets.java:2364 -msgid "gas" -msgstr "" - #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2375 msgid "Power Station" msgstr "" @@ -19982,10 +20070,10 @@ #. -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2378 msgid "Edit Power Station" msgstr "" -#. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2374 +#. item "Man Made/Power Station" text "Reference" +#: build/trans_presets.java:2384 msgid "Power Sub Station" msgstr "" @@ -19994,5 +20082,5 @@ #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2387 msgid "Edit Power Sub Station" msgstr "" @@ -20000,10 +20088,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2380 build/trans_presets.java:2396 +#: build/trans_presets.java:2390 build/trans_presets.java:2407 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2382 +#: build/trans_presets.java:2392 msgid "Power Tower" msgstr "" @@ -20014,11 +20102,26 @@ #. 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:2387 +#: build/trans_presets.java:2397 msgid "Edit Power Tower" msgstr "" -#. item "Man Made/Power Tower" label "Edit Power Tower" -#. -#: build/trans_presets.java:2390 +#. item "Man Made/Power Tower" combo "Type" +#: build/trans_presets.java:2398 +#, fuzzy +msgid "tower" +msgstr "Máis lento" + +#: build/trans_presets.java:2398 +#, fuzzy +msgid "pole" +msgstr "Papel" + +#: build/trans_presets.java:2399 +#, fuzzy +msgid "Tower reference" +msgstr "Preferencias" + +#. item "Man Made/Power Tower" text "Tower reference" +#: build/trans_presets.java:2401 msgid "Power Line" msgstr "" @@ -20027,40 +20130,79 @@ #. -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2404 msgid "Edit Power Line" msgstr "" +#. item "Man Made/Power Line" label "Edit Power Line" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "Line type" +msgstr "tipo" + +#. item "Man Made/Power Line" combo "Line type" +#: build/trans_presets.java:2405 +msgid "line" +msgstr "" + +#: build/trans_presets.java:2405 +msgid "minor_line" +msgstr "" + #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2408 msgid "Voltage" msgstr "" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2398 -msgid "Amount of Wires" -msgstr "" - -#. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2409 +msgid "Amount of Cables" +msgstr "" + +#. item "Man Made/Power Line" text "Amount of Cables" +#: build/trans_presets.java:2410 +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:2410 +#, fuzzy +msgid "single" +msgstr "cadea" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "double" +msgstr "Papel" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "triple" +msgstr "Ficheiro" + +#: build/trans_presets.java:2410 +msgid "quad" +msgstr "" + +#: build/trans_presets.java:2413 msgid "Amenities" msgstr "" #. group "Amenities" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2414 msgid "Toilets" msgstr "" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2409 build/trans_presets.java:2525 +#: build/trans_presets.java:2421 build/trans_presets.java:2537 msgid "Note" msgstr "" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2411 +#: build/trans_presets.java:2423 msgid "Post Box" msgstr "" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2428 msgid "Telephone" msgstr "" @@ -20069,5 +20211,5 @@ #. -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2431 msgid "Edit Telephone" msgstr "" @@ -20075,5 +20217,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2422 build/trans_presets.java:2526 +#: build/trans_presets.java:2434 build/trans_presets.java:2538 msgid "Coins" msgstr "" @@ -20081,5 +20223,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2423 build/trans_presets.java:2527 +#: build/trans_presets.java:2435 build/trans_presets.java:2539 msgid "Notes" msgstr "" @@ -20087,5 +20229,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2424 build/trans_presets.java:2528 +#: build/trans_presets.java:2436 build/trans_presets.java:2540 msgid "Electronic purses and Charge cards" msgstr "" @@ -20093,5 +20235,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2425 build/trans_presets.java:2529 +#: build/trans_presets.java:2437 build/trans_presets.java:2541 msgid "Debit cards" msgstr "" @@ -20099,15 +20241,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2426 build/trans_presets.java:2530 +#: build/trans_presets.java:2438 build/trans_presets.java:2542 msgid "Credit cards" msgstr "" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2439 msgid "Telephone cards" msgstr "" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2429 +#: build/trans_presets.java:2441 msgid "Recycling" msgstr "" @@ -20116,5 +20258,5 @@ #. -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2444 msgid "Edit Recycling station" msgstr "" @@ -20122,35 +20264,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2446 msgid "Batteries" msgstr "" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2435 +#: build/trans_presets.java:2447 msgid "Cans" msgstr "" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2448 msgid "Clothes" msgstr "" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2437 +#: build/trans_presets.java:2449 msgid "Glass" msgstr "" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2450 msgid "Paper" msgstr "" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2451 msgid "Scrap Metal" msgstr "" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2453 msgid "Bench" msgstr "" @@ -20159,31 +20301,31 @@ #. #. -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2456 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "stone" msgstr "" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "plastic" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "black" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "brown" msgstr "" @@ -20254,5 +20396,5 @@ #. #. -#: build/trans_presets.java:2446 build/trans_style.java:3063 +#: build/trans_presets.java:2458 build/trans_style.java:3063 #: build/trans_style.java:3071 build/trans_style.java:3079 #: build/trans_style.java:3087 build/trans_style.java:3135 @@ -20262,27 +20404,27 @@ msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "red" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "blue" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "white" msgstr "" -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2459 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2461 msgid "Hunting Stand" msgstr "" #. item -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2462 msgid "Edit Hunting Stand" msgstr "" @@ -20291,30 +20433,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2452 build/trans_presets.java:2914 +#: build/trans_presets.java:2464 build/trans_presets.java:2926 msgid "Height" msgstr "" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "low" msgstr "" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "half" msgstr "" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "full" msgstr "" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2466 msgid "Hide" msgstr "" -#: build/trans_presets.java:2455 +#: build/trans_presets.java:2467 msgid "Lock" msgstr "" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2469 msgid "Fountain" msgstr "" @@ -20323,10 +20465,10 @@ #. -#: build/trans_presets.java:2460 +#: build/trans_presets.java:2472 msgid "Edit Fountain" msgstr "" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2476 msgid "Drinking Water" msgstr "" @@ -20335,10 +20477,10 @@ #. -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2479 msgid "Edit Drinking Water" msgstr "" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2471 +#: build/trans_presets.java:2483 msgid "Baby Hatch" msgstr "" @@ -20346,33 +20488,33 @@ #. item #. -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2485 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2491 msgid "Shops" msgstr "" #. group "Shops" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2492 msgid "Supermarket" msgstr "" #. item -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2493 msgid "Edit Supermarket" msgstr "" -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2498 msgid "Chemist" msgstr "" #. item -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2499 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2504 msgid "Convenience Store" msgstr "" @@ -20380,9 +20522,9 @@ #. item #. -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2506 msgid "Edit Convenience Store" msgstr "" -#: build/trans_presets.java:2499 +#: build/trans_presets.java:2511 msgid "Kiosk" msgstr "" @@ -20390,27 +20532,27 @@ #. item #. -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2513 msgid "Edit Kiosk" msgstr "" -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2518 msgid "Book Store" msgstr "" #. item -#: build/trans_presets.java:2507 +#: build/trans_presets.java:2519 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2524 msgid "Travel Agency" msgstr "" #. item -#: build/trans_presets.java:2513 +#: build/trans_presets.java:2525 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2518 +#: build/trans_presets.java:2530 msgid "Vending machine" msgstr "" @@ -20418,5 +20560,5 @@ #. item #. -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2532 msgid "Edit Vending machine" msgstr "" @@ -20424,88 +20566,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "Vending products" msgstr "" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_tickets" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "parking_tickets" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "food" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "drinks" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "sweets" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "cigarettes" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "photos" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "animal_food" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "news_papers" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "toys" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "stamps" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "SIM-cards" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "telephone_vouchers" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "condoms" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "tampons" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "excrement_bags" msgstr "" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2543 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2545 msgid "Butcher" msgstr "" @@ -20513,9 +20655,9 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2547 msgid "Edit Butcher" msgstr "" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2552 msgid "Baker" msgstr "" @@ -20523,9 +20665,9 @@ #. item #. -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2554 msgid "Edit Baker" msgstr "" -#: build/trans_presets.java:2547 +#: build/trans_presets.java:2559 msgid "Florist" msgstr "" @@ -20533,18 +20675,18 @@ #. item #. -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2561 msgid "Edit Florist" msgstr "" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2566 msgid "Organic" msgstr "" #. item -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2567 msgid "Edit Organic Shop" msgstr "" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2572 msgid "Alcohol" msgstr "" @@ -20552,54 +20694,54 @@ #. item #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2574 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2579 msgid "Beverages" msgstr "" #. item -#: build/trans_presets.java:2568 +#: build/trans_presets.java:2580 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2573 +#: build/trans_presets.java:2585 msgid "Computer" msgstr "" #. item -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2586 msgid "Edit Computer Shop" msgstr "" -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2591 msgid "Electronics" msgstr "" #. item -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2592 msgid "Edit Electronics Shop" msgstr "" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2597 msgid "Hifi" msgstr "" #. item -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2598 msgid "Edit Hifi Shop" msgstr "" -#: build/trans_presets.java:2591 +#: build/trans_presets.java:2603 msgid "Furniture" msgstr "" #. item -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2604 msgid "Edit Furniture Shop" msgstr "" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2609 msgid "Garden Centre" msgstr "" @@ -20607,9 +20749,9 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2611 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2616 msgid "Hardware" msgstr "" @@ -20617,9 +20759,9 @@ #. item #. -#: build/trans_presets.java:2606 +#: build/trans_presets.java:2618 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2623 msgid "Do-it-yourself-store" msgstr "" @@ -20627,54 +20769,54 @@ #. item #. -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2625 msgid "Edit Do-it-yourself-store" msgstr "" -#: build/trans_presets.java:2618 +#: build/trans_presets.java:2630 msgid "Stationery" msgstr "" #. item -#: build/trans_presets.java:2619 +#: build/trans_presets.java:2631 msgid "Edit Stationery Shop" msgstr "" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2636 msgid "Hairdresser" msgstr "" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2637 msgid "Edit Hairdresser" msgstr "" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2642 msgid "Shoes" msgstr "" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2643 msgid "Edit Shoe Shop" msgstr "" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2648 msgid "Toys" msgstr "" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2649 msgid "Edit Toy Shop" msgstr "" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2654 msgid "Video" msgstr "" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2655 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2660 msgid "Dry Cleaning" msgstr "" @@ -20682,9 +20824,9 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2662 msgid "Edit Dry Cleaning" msgstr "" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2667 msgid "Laundry" msgstr "" @@ -20692,9 +20834,9 @@ #. item #. -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2669 msgid "Edit Laundry" msgstr "" -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2674 msgid "Outdoor" msgstr "" @@ -20702,28 +20844,28 @@ #. item #. -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2676 msgid "Edit Outdoor Shop" msgstr "" #. item -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2682 msgid "Edit Sports Shop" msgstr "" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2687 msgid "Optician" msgstr "" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2688 msgid "Edit Optician" msgstr "" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2695 msgid "Cash" msgstr "" #. group "Cash" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2696 msgid "Bank" msgstr "" @@ -20731,14 +20873,14 @@ #. item #. -#: build/trans_presets.java:2686 +#: build/trans_presets.java:2698 msgid "Edit Bank" msgstr "" -#: build/trans_presets.java:2691 build/trans_presets.java:2700 +#: build/trans_presets.java:2703 build/trans_presets.java:2712 msgid "Automated Teller Machine" msgstr "" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2705 msgid "Money Exchange" msgstr "" @@ -20746,5 +20888,5 @@ #. item #. -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2707 msgid "Edit Money Exchange" msgstr "" @@ -20752,15 +20894,15 @@ #. item #. -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2714 msgid "Edit Automated Teller Machine" msgstr "" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2719 msgid "Health" msgstr "" #. group "Health" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2720 msgid "Doctors" msgstr "" @@ -20768,18 +20910,18 @@ #. item #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2722 msgid "Edit Doctors" msgstr "" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2727 msgid "Dentist" msgstr "" #. item -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2728 msgid "Edit Dentist" msgstr "" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2733 msgid "Pharmacy" msgstr "" @@ -20787,5 +20929,5 @@ #. item #. -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2735 msgid "Edit Pharmacy" msgstr "" @@ -20793,9 +20935,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2737 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2741 msgid "Hospital" msgstr "" @@ -20803,10 +20945,10 @@ #. item #. -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2743 msgid "Edit Hospital" msgstr "" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2747 msgid "Emergency Access Point" msgstr "" @@ -20815,5 +20957,5 @@ #. -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2750 msgid "Edit Emergency Access Point" msgstr "" @@ -20822,20 +20964,20 @@ #. #. -#: build/trans_presets.java:2741 +#: build/trans_presets.java:2753 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2742 +#: build/trans_presets.java:2754 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2756 msgid "Phone Number" msgstr "" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2757 msgid "(Use international code, like +12-345-67890)" msgstr "" @@ -20843,5 +20985,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2760 msgid "Veterinary" msgstr "" @@ -20850,59 +20992,59 @@ #. -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2763 msgid "Edit Veterinary" msgstr "" -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2770 msgid "Geography" msgstr "" #. group "Places" -#: build/trans_presets.java:2760 +#: build/trans_presets.java:2772 msgid "Continent" msgstr "" #. item -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2773 msgid "Edit Continent" msgstr "" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2766 +#: build/trans_presets.java:2778 msgid "Country" msgstr "" #. item -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2779 msgid "Edit Country" msgstr "" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2784 msgid "State" msgstr "" #. item -#: build/trans_presets.java:2773 +#: build/trans_presets.java:2785 msgid "Edit State" msgstr "" #. item "Places/State" text "Name" -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2790 msgid "Region" msgstr "" #. item -#: build/trans_presets.java:2779 +#: build/trans_presets.java:2791 msgid "Edit Region" msgstr "" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2796 msgid "County" msgstr "" #. item -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2797 msgid "Edit County" msgstr "" @@ -20910,15 +21052,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2803 msgid "City" msgstr "" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2804 msgid "Edit City" msgstr "" #. item "Places/City" text "Name" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2809 msgid "Town" msgstr "" @@ -20926,10 +21068,10 @@ #. item #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2811 msgid "Edit Town" msgstr "" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2804 +#: build/trans_presets.java:2816 msgid "Suburb" msgstr "" @@ -20937,25 +21079,25 @@ #. item #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2818 msgid "Edit Suburb" msgstr "" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2823 msgid "Village" msgstr "" #. item -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2824 msgid "Edit Village" msgstr "" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2817 +#: build/trans_presets.java:2829 msgid "Hamlet" msgstr "" #. item -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2830 msgid "Edit Hamlet" msgstr "" @@ -20963,5 +21105,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2824 +#: build/trans_presets.java:2836 msgid "Locality" msgstr "" @@ -20969,10 +21111,10 @@ #. item #. -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2838 msgid "Edit Locality" msgstr "" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2843 msgid "Island" msgstr "" @@ -20980,10 +21122,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2845 msgid "Edit Island" msgstr "" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2838 +#: build/trans_presets.java:2850 msgid "Islet" msgstr "" @@ -20991,5 +21133,5 @@ #. item #. -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2852 msgid "Edit Islet" msgstr "" @@ -20997,5 +21139,5 @@ #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2858 msgid "Cave Entrance" msgstr "" @@ -21003,10 +21145,10 @@ #. item #. -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2860 msgid "Edit Cave Entrance" msgstr "" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2864 msgid "Peak" msgstr "" @@ -21014,10 +21156,10 @@ #. item #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2866 msgid "Edit Peak" msgstr "" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2871 msgid "Glacier" msgstr "" @@ -21025,10 +21167,10 @@ #. item #. -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2873 msgid "Edit Glacier" msgstr "" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2878 msgid "Volcano" msgstr "" @@ -21036,70 +21178,70 @@ #. item #. -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2880 msgid "Edit Volcano" msgstr "" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2886 msgid "Boundaries" msgstr "" #. group "Boundaries" -#: build/trans_presets.java:2875 +#: build/trans_presets.java:2887 msgid "National" msgstr "" #. item -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2888 msgid "Edit National Boundary" msgstr "" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2881 +#: build/trans_presets.java:2893 msgid "Administrative" msgstr "" #. item -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2894 msgid "Edit Administrative Boundary" msgstr "" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2887 +#: build/trans_presets.java:2899 msgid "Civil" msgstr "" #. item -#: build/trans_presets.java:2888 +#: build/trans_presets.java:2900 msgid "Edit Civil Boundary" msgstr "" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2893 +#: build/trans_presets.java:2905 msgid "Political" msgstr "" #. item -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2906 msgid "Edit Political Boundary" msgstr "" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2911 msgid "National park" msgstr "" #. item -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2912 msgid "Edit National Park Boundary" msgstr "" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2918 msgid "Land use" msgstr "" #. group "Land use" -#: build/trans_presets.java:2907 +#: build/trans_presets.java:2919 msgid "Tree" msgstr "" @@ -21108,15 +21250,15 @@ #. -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2922 msgid "Edit Tree" msgstr "" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2915 +#: build/trans_presets.java:2927 msgid "Botanical Name" msgstr "" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2929 msgid "Wood" msgstr "" @@ -21125,5 +21267,5 @@ #. -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2932 msgid "Edit Wood" msgstr "" @@ -21131,17 +21273,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "coniferous" msgstr "" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "deciduous" msgstr "" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "mixed" msgstr "" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2937 msgid "Forest" msgstr "" @@ -21150,14 +21292,14 @@ #. -#: build/trans_presets.java:2928 +#: build/trans_presets.java:2940 msgid "Edit Forest Landuse" msgstr "" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2946 msgid "Nature Reserve" msgstr "" #. item -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2947 msgid "Edit Nature Reserve" msgstr "" @@ -21165,25 +21307,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2952 msgid "Scree" msgstr "" #. item -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2953 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2957 msgid "Scrub" msgstr "" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:2958 msgid "Edit Scrub" msgstr "" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2962 msgid "Fell" msgstr "" @@ -21191,10 +21333,10 @@ #. item #. -#: build/trans_presets.java:2952 +#: build/trans_presets.java:2964 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2968 msgid "Heath" msgstr "" @@ -21202,5 +21344,5 @@ #. item #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2970 msgid "Edit Heath" msgstr "" @@ -21208,5 +21350,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2975 msgid "Farmyard" msgstr "" @@ -21215,45 +21357,45 @@ #. -#: build/trans_presets.java:2966 +#: build/trans_presets.java:2978 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2983 msgid "Farmland" msgstr "" #. item -#: build/trans_presets.java:2972 +#: build/trans_presets.java:2984 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2977 +#: build/trans_presets.java:2989 msgid "Meadow" msgstr "" #. item -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2990 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:2995 msgid "Vineyard" msgstr "" #. item -#: build/trans_presets.java:2984 +#: build/trans_presets.java:2996 msgid "Edit Vineyard Landuse" msgstr "" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3001 msgid "Allotments" msgstr "" #. item -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3002 msgid "Edit Allotments Landuse" msgstr "" @@ -21261,25 +21403,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3008 msgid "Garden" msgstr "" #. item -#: build/trans_presets.java:2997 +#: build/trans_presets.java:3009 msgid "Edit Garden" msgstr "" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3013 msgid "Grass" msgstr "" #. item -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3014 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3019 msgid "Village Green" msgstr "" @@ -21287,10 +21429,10 @@ #. item #. -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3021 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3026 msgid "Common" msgstr "" @@ -21298,20 +21440,20 @@ #. item #. -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3028 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3032 msgid "Park" msgstr "" #. item -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3033 msgid "Edit Park" msgstr "" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3037 msgid "Recreation Ground" msgstr "" @@ -21319,5 +21461,5 @@ #. item #. -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3039 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -21325,15 +21467,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3033 +#: build/trans_presets.java:3045 msgid "Residential area" msgstr "" #. item -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3046 msgid "Edit Residential Landuse" msgstr "" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3051 msgid "Graveyard" msgstr "" @@ -21341,9 +21483,9 @@ #. item #. -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3053 msgid "Edit Graveyard" msgstr "" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3059 msgid "Cemetery" msgstr "" @@ -21351,39 +21493,39 @@ #. item #. -#: build/trans_presets.java:3049 +#: build/trans_presets.java:3061 msgid "Edit Cemetery Landuse" msgstr "" -#: build/trans_presets.java:3056 +#: build/trans_presets.java:3068 msgid "Retail" msgstr "" #. item -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3069 msgid "Edit Retail Landuse" msgstr "" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3062 +#: build/trans_presets.java:3074 msgid "Commercial" msgstr "" #. item -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3075 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3068 +#: build/trans_presets.java:3080 msgid "Industrial" msgstr "" #. item -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3081 msgid "Edit Industrial Landuse" msgstr "" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3086 msgid "Railway land" msgstr "" @@ -21391,15 +21533,15 @@ #. item #. -#: build/trans_presets.java:3076 +#: build/trans_presets.java:3088 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3081 +#: build/trans_presets.java:3093 msgid "Military" msgstr "" #. item -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3094 msgid "Edit Military Landuse" msgstr "" @@ -21407,55 +21549,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3100 msgid "Construction area" msgstr "" #. item -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3101 msgid "Edit Construction Landuse" msgstr "" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3094 +#: build/trans_presets.java:3106 msgid "Brownfield" msgstr "" #. item -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3107 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3100 +#: build/trans_presets.java:3112 msgid "Greenfield" msgstr "" #. item -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3113 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3118 msgid "Landfill" msgstr "" #. item -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3119 msgid "Edit Landfill Landuse" msgstr "" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3124 msgid "Quarry" msgstr "" #. item -#: build/trans_presets.java:3113 +#: build/trans_presets.java:3125 msgid "Edit Quarry Landuse" msgstr "" #. group "Relations" -#: build/trans_presets.java:3122 +#: build/trans_presets.java:3134 msgid "Multipolygon" msgstr "" @@ -21465,5 +21607,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:3126 +#: build/trans_presets.java:3138 msgid "Edit Multipolygon" msgstr "" @@ -21472,10 +21614,10 @@ #. #. -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3144 msgid "outer segment" msgstr "" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3145 msgid "inner segment" msgstr "" @@ -21483,5 +21625,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3148 msgid "Turn restriction" msgstr "" @@ -21490,5 +21632,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3151 msgid "Edit Turn Restriction" msgstr "" @@ -21496,34 +21638,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_straight_on" msgstr "" @@ -21532,15 +21674,15 @@ #. #. -#: build/trans_presets.java:3146 +#: build/trans_presets.java:3158 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3159 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3148 +#: build/trans_presets.java:3160 msgid "to way" msgstr "" @@ -21548,5 +21690,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3151 +#: build/trans_presets.java:3163 msgid "Route" msgstr "" @@ -21555,5 +21697,5 @@ #. -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3166 msgid "Edit Route" msgstr "" @@ -21561,5 +21703,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "Route type" msgstr "" @@ -21631,5 +21773,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:233 +#: build/trans_presets.java:3168 build/trans_style.java:233 #: build/trans_style.java:683 build/trans_style.java:906 #: build/trans_style.java:914 build/trans_style.java:922 @@ -21638,17 +21780,17 @@ msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "bus" msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "road" msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ferry" msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ski" msgstr "" @@ -21701,5 +21843,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:247 +#: build/trans_presets.java:3168 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -21708,13 +21850,13 @@ msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "hiking" msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "tram" msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "detour" msgstr "" @@ -21728,10 +21870,10 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:1206 +#: build/trans_presets.java:3168 build/trans_style.java:1206 msgid "subway" msgstr "" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3159 +#: build/trans_presets.java:3171 msgid "Symbol description" msgstr "" @@ -21739,31 +21881,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3174 msgid "Network" msgstr "" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "proposed" msgstr "" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "alternate" msgstr "" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "temporary" msgstr "" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "connection" msgstr "" -#: build/trans_presets.java:3165 +#: build/trans_presets.java:3177 msgid "Color (hex)" msgstr "" @@ -21772,30 +21914,30 @@ #. #. -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3180 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3181 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3170 +#: build/trans_presets.java:3182 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3183 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3172 +#: build/trans_presets.java:3184 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3173 +#: build/trans_presets.java:3185 msgid "backward halt point" msgstr "" @@ -25933,4 +26075,13 @@ msgstr "" +#~ msgid "Combine Anyway" +#~ msgstr "Combinar de todas formas" + +#~ msgid "Purging 1 primitive" +#~ msgstr "Purgando 1 primitiva" + +#~ msgid "Empty member in relation." +#~ msgstr "Membro vacío na relación." + #~ msgid "" #~ "Server returned internal error. Try a reduced area or retry after waiting " Index: /applications/editors/josm/i18n/po/he.po =================================================================== --- /applications/editors/josm/i18n/po/he.po (revision 17821) +++ /applications/editors/josm/i18n/po/he.po (revision 17822) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-22 17:52+0200\n" +"POT-Creation-Date: 2009-09-28 16:38+0200\n" "PO-Revision-Date: 2009-09-22 14:53+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: 2009-09-22 15:45+0000\n" +"X-Launchpad-Export-Date: 2009-09-28 14:34+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -66,8 +66,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250 @@ -90,9 +90,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -141,7 +141,7 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:172 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 @@ -154,5 +154,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 @@ -333,6 +332,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -342,6 +340,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 @@ -351,5 +349,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -360,5 +358,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180 @@ -367,5 +365,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -458,9 +456,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -492,10 +490,9 @@ msgstr "נא בחר לפחות ארבעה צמתים." -#. FIXME: not sure whether this fits in a dialog #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:85 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -605,5 +602,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 #, java-format msgid "File: {0}" @@ -625,36 +622,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine Way" msgstr "שלב דרכים" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 msgid "Combine several ways into one." msgstr "שלב מספר דרכים לאחת." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 -msgid "Combine ways with different memberships?" -msgstr "לשלב שתי דרכים בעלות חברויות שונות?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -msgid "Combine Anyway" -msgstr "אחד בכל זאת" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "לדרכים הנבחרות ישנם יחסים משתנים. האם אתה עדיין מעוניין לשלב ביניהם?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 msgid "Change directions?" msgstr "לשנות כיוונים?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Reverse and Combine" msgstr "הפוך כיוון ואחד" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -662,5 +645,5 @@ msgstr "לא ניתן לשלב את הדרכים בכיווניהם הנוכחיים. האם ברצונך להפוך כמה מהם?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -668,10 +651,10 @@ msgstr "לא ניתן לשלב דרכים (לא ניתן למזג אותן למחרוזת אחת של צמתים)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 #, java-format msgid "Combine {0} ways" msgstr "שלב {0} דרכים" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 msgid "Please select at least two ways to combine." msgstr "נא בחר לפחות שתי דרכים לשילוב." @@ -717,6 +700,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -781,5 +763,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -810,5 +792,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307 #, java-format msgid "There were {0} conflicts during import." @@ -826,5 +807,4 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Duplicate" @@ -855,10 +835,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:209 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "ייצא ל-GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:208 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "ייצא נתונים לקובץ GPX." @@ -869,8 +849,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -935,5 +915,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 @@ -976,6 +956,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1063,22 +1042,22 @@ msgstr "מזג את השכבה הנוכחית לתוך שכבה אחרת" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge Nodes" msgstr "מיזוג צמתים" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 msgid "Merge nodes into the oldest one." msgstr "מזג את הצמתים לישנים ביותר." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 msgid "Please select at least two nodes to merge." msgstr "אנא בחר לפחות שני צמתים למיזוג." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "לא ניתן למזג צמתים: יש למחוק דרך שעדיין בשימוש." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 #, java-format msgid "Merge {0} nodes" @@ -1150,5 +1129,4 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350 msgid "New" msgstr "חדש" @@ -1326,10 +1304,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "שמירה" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "שמור את הנתונים הנוכחיים." @@ -1386,10 +1364,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "שמור בשם..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "שמור את המידע הנוכחי לקובץ חדש." @@ -1431,5 +1409,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:961 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888 @@ -1661,14 +1639,14 @@ msgstr "בחירה ריקה" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 msgid "Upload to OSM..." msgstr "העלה ל-OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload all changes to the OSM server." msgstr "העלה את כל השינויים לשרת ה-OSM" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 #, java-format msgid "" @@ -1677,23 +1655,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "אין מה להעלות. קבל כמה נתונים תחילה." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:171 msgid "No changes to upload." msgstr "אין שינויים להעלאה." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223 #, java-format msgid "Synchronize {0} {1} only" msgstr "סנכרן רק את {0} {1}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 msgid "Synchronize entire dataset" msgstr "סנכרן את כל סט הנתונים" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:228 #, java-format msgid "" @@ -1707,17 +1685,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:283 msgid "Conflict detected" msgstr "התגלתה התנגשות" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:257 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 #, java-format msgid "Unexpected return value. Got {0}." msgstr "ערך מוחזר לא צפוי. התקבל {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:272 #, java-format msgid "" @@ -1728,5 +1706,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:306 #, java-format msgid "" @@ -1736,34 +1714,39 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 msgid "Changeset closed" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:425 #, java-format msgid "Uploading failed.
{0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:434 msgid "Upload to OSM API failed" msgstr "העלאה ל-API של OSM נכשלה" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457 msgid "Updating primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:514 #, java-format msgid "Uploading data for layer ''{0}''" +msgstr "" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." msgstr "" @@ -1852,13 +1835,13 @@ msgstr "הרצה איטית יותר" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34 msgid "Downloading GPS data" msgstr "מוריד נתוני GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57 msgid "Downloaded GPX Data" msgstr "הורדו נתוני GPX" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87 msgid "Raw GPS data" msgstr "נתוני GPS גולמיים" @@ -1873,4 +1856,9 @@ "Ignoring exception because download has been cancelled. Exception was: {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 +#, fuzzy +msgid "No data found in this area." +msgstr "לא נמצאו נתונים על מכשיר." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2567,9 +2555,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 +#, java-format +msgid "" +"Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -2618,5 +2606,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Delete from relation" msgstr "מחק מיחס" @@ -2668,14 +2656,15 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 -msgid "Purging 1 primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 -#, java-format -msgid "removing reference from way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 +#, fuzzy, java-format +msgid "Purged object ''{0}''" +msgstr "הזז פריטים {0}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 +#, fuzzy, java-format +msgid "Purged {0} objects" +msgstr "שנה עצם {0}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 #, java-format msgid "" @@ -2684,12 +2673,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203 -#, java-format -msgid "removing reference from relation {0}" -msgstr "" +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 +#, fuzzy, java-format +msgid "Removing reference from relation {0}" +msgstr "באמת מחק את הבחירה מהיחס {0}?" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 #, java-format msgid "Resolve conflicts in member list of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -3031,24 +3025,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Error: {0}" msgstr "שגיאה: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Warning: {0}" msgstr "אזהרה: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3056,5 +3050,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3080,6 +3074,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:244 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3135,120 +3129,113 @@ msgstr "" -#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed -#. TODO Remove useless nullcheck when RelationMember.member is encalupsed -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855 -msgid "Empty member in relation." -msgstr "איבר ריק ביחס." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:850 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "מחק איבר \"{0}\" ביחס." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:861 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "הדרך \"{0}\" בת פחות משתי נקודות." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:607 msgid "More than one \"to\" way found." msgstr "יותר מ-\"to\" אחד נמצא." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:613 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627 msgid "More than one \"via\" found." msgstr "יותר מ-\"via\" אחד נמצא." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:632 +#, java-format +msgid "Unknown role ''{0}''." +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 #, java-format -msgid "Unknown role ''{0}''." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638 -#, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:641 msgid "No \"from\" way found." msgstr "אף דרך \"from\" לא נמצאה." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645 msgid "No \"to\" way found." msgstr "אף דרך \"to\" לא נמצאה." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:649 msgid "No \"via\" node or way found." msgstr "לא נמצאה אף נקודה או דרך מסוג \"via\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:658 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:662 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693 -msgid "The \"from\" way doesn't start or end at the \"via\" way." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:870 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:882 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:940 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1029 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1041 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "דרך פנימית ''{0}'' נמצאת בחוץ." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1094 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1120 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1324 msgid "untagged" msgstr "לא מתוייג" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1325 msgid "text" msgstr "טקסט" @@ -3270,5 +3257,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:249 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 @@ -3279,5 +3266,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 @@ -3306,5 +3293,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:169 msgid "background" msgstr "רקע" @@ -3396,5 +3383,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "railway" msgstr "מסילת רכבת" @@ -3450,9 +3437,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +#, fuzzy +msgid "Not Found" +msgstr "לא מחובר" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 msgid "Unknown host" msgstr "מארח לא ידוע" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:247 msgid "Primitive already deleted" msgstr "" @@ -4764,5 +4756,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -4976,43 +4968,43 @@ msgstr "חבר ב" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 msgid "Add Properties" msgstr "הוסף תכונות" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 msgid "Add a new key/value pair to all objects" msgstr "הוסף מצד מפתח/ערך לכל הפריטים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 msgid "Edit Properties" msgstr "ערוך מאפיינים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 msgid "Edit the value of the selected key for all objects" msgstr "ערוך את הערך של המפתח הנבחר עבור כל הפריטים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "תכונות: {0} \\ חברויות: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 msgid "Properties / Memberships" msgstr "תכונות \\ חברויות" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 msgid "Change relation" msgstr "שנה יחס" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 #, java-format msgid "Really delete selection from relation {0}?" msgstr "באמת מחק את הבחירה מהיחס {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:855 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 msgid "Delete the selected key in all objects" msgstr "מחק את המפתח הנבחר בכל הפריטים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 msgid "Delete Properties" msgstr "מחק מאפיינים" @@ -5022,6 +5014,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168 -#: build/trans_presets.java:3121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 +#: build/trans_presets.java:3133 msgid "Relations" msgstr "יחסים" @@ -5031,25 +5023,30 @@ msgstr "פתח רשימה של כל היחסים." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:174 #, java-format msgid "Relations: {0}" msgstr "יחסים: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 msgid "Open an editor for the selected relation" msgstr "פתח עורך עבור היחס הנבחר" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:325 msgid "Delete the selected relation" msgstr "מחק את היחס הנבחר" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:363 msgid "Create a new relation" msgstr "צור יחס חדש" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:400 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280 msgid "Create a copy of this relation and open it in another editor window" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 +#, fuzzy +msgid "Set the current selection to the list of selected relations" +msgstr "הבחירה הנוכחית אינה יכולה לשמש לפיצול." #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5090,14 +5087,14 @@ msgstr "בחירה: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 msgid "Undock the panel" msgstr "\"שחרר\" את הפאנל" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "סגור את הפאנל. ניתן לפתוח אותו מחדש בעזרת הכפתורים בסרגל הכלים השמאלי." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 msgid "Click to minimize/maximize the panel content" msgstr "לחץ כדי למזער \\ למקסם את תוכן הפאנל" @@ -5606,5 +5603,5 @@ #. group "Geography" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2771 msgid "Places" msgstr "מקומות" @@ -6278,6 +6275,4 @@ #. item "Man Made/Windmill" label "Edit Windmill" #. -#. item "Man Made/Pipeline" label "Edit Pipeline" -#. #. item "Man Made/Wastewater Plant" label "Edit Wastewater Plant" #. @@ -6290,4 +6285,6 @@ #. item "Man Made/Surveillance" label "Edit Surveillance Camera" #. +#. item "Man Made/Power Station" label "Edit Power Station" +#. #. item "Amenities/Fountain" label "Edit Fountain" #. @@ -6612,57 +6609,57 @@ #: build/trans_presets.java:2250 build/trans_presets.java:2258 #: build/trans_presets.java:2290 build/trans_presets.java:2295 -#: build/trans_presets.java:2300 build/trans_presets.java:2305 -#: build/trans_presets.java:2311 build/trans_presets.java:2317 -#: build/trans_presets.java:2323 build/trans_presets.java:2331 -#: build/trans_presets.java:2337 build/trans_presets.java:2343 -#: build/trans_presets.java:2349 build/trans_presets.java:2355 -#: build/trans_presets.java:2365 build/trans_presets.java:2462 -#: build/trans_presets.java:2469 build/trans_presets.java:2483 -#: build/trans_presets.java:2489 build/trans_presets.java:2496 -#: build/trans_presets.java:2503 build/trans_presets.java:2509 -#: build/trans_presets.java:2515 build/trans_presets.java:2537 -#: build/trans_presets.java:2544 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2305 build/trans_presets.java:2310 +#: build/trans_presets.java:2316 build/trans_presets.java:2322 +#: build/trans_presets.java:2339 build/trans_presets.java:2345 +#: build/trans_presets.java:2351 build/trans_presets.java:2357 +#: build/trans_presets.java:2363 build/trans_presets.java:2373 +#: build/trans_presets.java:2380 build/trans_presets.java:2474 +#: build/trans_presets.java:2481 build/trans_presets.java:2495 +#: build/trans_presets.java:2501 build/trans_presets.java:2508 +#: build/trans_presets.java:2515 build/trans_presets.java:2521 +#: build/trans_presets.java:2527 build/trans_presets.java:2549 +#: build/trans_presets.java:2556 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2576 #: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2594 build/trans_presets.java:2601 -#: build/trans_presets.java:2608 build/trans_presets.java:2615 -#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2594 build/trans_presets.java:2600 +#: build/trans_presets.java:2606 build/trans_presets.java:2613 +#: build/trans_presets.java:2620 build/trans_presets.java:2627 #: build/trans_presets.java:2633 build/trans_presets.java:2639 -#: build/trans_presets.java:2645 build/trans_presets.java:2652 -#: build/trans_presets.java:2659 build/trans_presets.java:2666 -#: build/trans_presets.java:2672 build/trans_presets.java:2678 -#: build/trans_presets.java:2688 build/trans_presets.java:2697 -#: build/trans_presets.java:2712 build/trans_presets.java:2718 -#: build/trans_presets.java:2726 build/trans_presets.java:2733 -#: build/trans_presets.java:2753 build/trans_presets.java:2764 -#: build/trans_presets.java:2770 build/trans_presets.java:2776 +#: build/trans_presets.java:2645 build/trans_presets.java:2651 +#: build/trans_presets.java:2657 build/trans_presets.java:2664 +#: build/trans_presets.java:2671 build/trans_presets.java:2678 +#: build/trans_presets.java:2684 build/trans_presets.java:2690 +#: build/trans_presets.java:2700 build/trans_presets.java:2709 +#: build/trans_presets.java:2724 build/trans_presets.java:2730 +#: build/trans_presets.java:2738 build/trans_presets.java:2745 +#: build/trans_presets.java:2765 build/trans_presets.java:2776 #: build/trans_presets.java:2782 build/trans_presets.java:2788 -#: build/trans_presets.java:2795 build/trans_presets.java:2802 -#: build/trans_presets.java:2809 build/trans_presets.java:2815 -#: build/trans_presets.java:2821 build/trans_presets.java:2829 -#: build/trans_presets.java:2836 build/trans_presets.java:2843 -#: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2879 build/trans_presets.java:2885 +#: build/trans_presets.java:2794 build/trans_presets.java:2800 +#: build/trans_presets.java:2807 build/trans_presets.java:2814 +#: build/trans_presets.java:2821 build/trans_presets.java:2827 +#: build/trans_presets.java:2833 build/trans_presets.java:2841 +#: build/trans_presets.java:2848 build/trans_presets.java:2855 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2875 build/trans_presets.java:2882 #: build/trans_presets.java:2891 build/trans_presets.java:2897 -#: build/trans_presets.java:2903 build/trans_presets.java:2912 -#: build/trans_presets.java:2922 build/trans_presets.java:2931 -#: build/trans_presets.java:2937 build/trans_presets.java:2943 -#: build/trans_presets.java:2948 build/trans_presets.java:2954 -#: build/trans_presets.java:2960 build/trans_presets.java:2969 -#: build/trans_presets.java:2975 build/trans_presets.java:2981 +#: build/trans_presets.java:2903 build/trans_presets.java:2909 +#: build/trans_presets.java:2915 build/trans_presets.java:2924 +#: build/trans_presets.java:2934 build/trans_presets.java:2943 +#: build/trans_presets.java:2949 build/trans_presets.java:2955 +#: build/trans_presets.java:2960 build/trans_presets.java:2966 +#: build/trans_presets.java:2972 build/trans_presets.java:2981 #: build/trans_presets.java:2987 build/trans_presets.java:2993 #: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3012 build/trans_presets.java:3018 -#: build/trans_presets.java:3023 build/trans_presets.java:3030 -#: build/trans_presets.java:3037 build/trans_presets.java:3043 -#: build/trans_presets.java:3052 build/trans_presets.java:3060 -#: build/trans_presets.java:3066 build/trans_presets.java:3072 -#: build/trans_presets.java:3079 build/trans_presets.java:3085 -#: build/trans_presets.java:3092 build/trans_presets.java:3098 +#: build/trans_presets.java:3011 build/trans_presets.java:3017 +#: build/trans_presets.java:3024 build/trans_presets.java:3030 +#: build/trans_presets.java:3035 build/trans_presets.java:3042 +#: build/trans_presets.java:3049 build/trans_presets.java:3055 +#: build/trans_presets.java:3064 build/trans_presets.java:3072 +#: build/trans_presets.java:3078 build/trans_presets.java:3084 +#: build/trans_presets.java:3091 build/trans_presets.java:3097 #: build/trans_presets.java:3104 build/trans_presets.java:3110 -#: build/trans_presets.java:3116 build/trans_presets.java:3129 -#: build/trans_presets.java:3143 build/trans_presets.java:3157 +#: build/trans_presets.java:3116 build/trans_presets.java:3122 +#: build/trans_presets.java:3128 build/trans_presets.java:3141 +#: build/trans_presets.java:3155 build/trans_presets.java:3169 msgid "Name" msgstr "שם" @@ -6725,5 +6722,4 @@ msgstr "" -#. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 msgid "Close the selected open changesets" @@ -6751,25 +6747,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "Yes" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "No" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47 #, java-format msgid "Layer ''{0}'' has modifications which should be uploaded to the server." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49 #, java-format msgid "Layer ''{0}'' has no modifications to be uploaded." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60 #, java-format msgid "" @@ -6778,29 +6774,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62 #, java-format msgid "Layer ''{0}'' has no modifications to be saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80 msgid "No file associated with this layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:83 msgid "Please select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:86 #, java-format msgid "Layer ''{0}'' is not backed by a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:101 #, java-format msgid "File ''{0}'' is not writable. Please enter another file name." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:115 #, java-format msgid "Select to upload layer ''{0}'' to the server ''{1}''" @@ -6893,5 +6889,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -msgid "Save and Exit" +#, fuzzy +msgid "Save/Upload and Exit" msgstr "שמור וצא" @@ -6901,5 +6898,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -msgid "Save and Delete" +msgid "Save/Upload and Delete" msgstr "" @@ -6916,5 +6913,5 @@ msgid "" "An upload and/or save operation of one layer with modifications
was " -"cancelled or has been failed." +"cancelled or has failed." msgstr "" @@ -7000,6 +6997,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:891 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:921 msgid "Tags of new changeset" msgstr "" @@ -7096,7 +7093,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:909 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:933 #, java-format msgid "Tags of changeset {0}" @@ -7104,48 +7100,48 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:949 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:963 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1011 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106 msgid "Preparing primitives to upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "תמונות עבור {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "קורא GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "אין זמן לנקודה {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "לא ניתן לקרוא מהזמן \"{0}\" מהנקודה {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325 msgid "No images with readable timestamps found." msgstr "לא נמצאו תמונות עם חותמות זמין קריאות." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format @@ -7153,29 +7149,29 @@ msgstr "קורא {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:402 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246 msgid "Geotagged Images" msgstr "תמונות בעלות גאותגיות" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:587 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "GPS start: {0}" msgstr "התחלת GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 #, java-format msgid "GPS end: {0}" msgstr "סיום GPS: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594 #, java-format msgid "current delta: {0}s" msgstr "הפרש נוכחי: {0}ש'" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595 msgid "timezone difference: " msgstr "הפרש אזורי הזמן: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284 msgid "image" @@ -7184,14 +7180,14 @@ msgstr[1] "תמונות" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #, java-format msgid "{0} within the track." msgstr "{0} מתוך הרצועה." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680 msgid "Sync clock" msgstr "סנכרן שעון" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7199,32 +7195,32 @@ msgstr "תמונות JPEG (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:734 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "לא ניתן לנתח את התאריך שבקובץ \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "אין נתוני שעה במבנה EXIF בתוך הקובץ \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 msgid "Image" msgstr "תמונה" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:752 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "הזן את התאריך המוצג (mm/dd/yyyy HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759 msgid "GPS unit timezone (difference to photo)" msgstr "אזור זמן של יחידת GPS (הבדל מתמונה)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:767 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771 msgid "Synchronize Time with GPS Unit" msgstr "סנכרן את השעה עם יחידת ה-GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:790 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 msgid "Time entered could not be parsed." msgstr "לא ניתן לנתח את הזמן שהוזן." @@ -7308,5 +7304,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 #, java-format msgid "Name: {0}" @@ -7329,5 +7325,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3160 +#: build/trans_presets.java:3172 msgid "Description" msgstr "תיאור" @@ -7383,5 +7379,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:587 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 @@ -7446,42 +7442,65 @@ "באופן הגיוני הושמטו." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:105 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:107 #, java-format msgid "Data Layer {0}" msgstr "שכבת נתונים {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 msgid "outside downloaded area" msgstr "מחוץ לשטח שהורד" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:252 #, java-format msgid "version {0}" msgstr "גירסה {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:289 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:290 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 +#, fuzzy, java-format +msgid "There was {0} conflict detected." +msgid_plural "There were {0} conflicts detected." +msgstr[0] "נמצאו {0} התנגשויות במהלך היבוא" +msgstr[1] "נמצאו {0} התנגשויות במהלך היבוא" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 +#, java-format +msgid "" +"{0} object has been purged from the local dataset because it is deleted on " +"the server." +msgid_plural "" +"{0} objects have been purged from the local dataset because they are deleted " +"on the server." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 +#, fuzzy +msgid "Conflicts detected" +msgstr "התגלתה התנגשות" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 #, java-format msgid "{0} consists of:" msgstr "{0} מורכב מ-:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:476 #, java-format msgid " ({0} deleted.)" msgstr " ({0} נמחק/ו.)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 #, java-format msgid "API version: {0}" msgstr "גירסת API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:501 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:584 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" @@ -7827,5 +7846,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:412 #: ../plugins/terracer/src/terracer/TerracerAction.java:430 @@ -8553,5 +8572,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261 msgid "More information about this feature" msgstr "עוד מידע על הכלי הזה" @@ -8600,5 +8619,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:700 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -8608,18 +8627,18 @@ msgstr[1] "שנה {0} עצמים" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "כלום לא נבחר!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 msgid "Selection unsuitable!" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 msgid "Apply Preset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788 msgid "Change Properties" msgstr "שנה תכונות" @@ -8903,44 +8922,44 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 msgid "Preparing..." msgstr "מכין..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 msgid "Uploading..." msgstr "מעלה..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9169,5 +9188,5 @@ msgid "" "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}''," -"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." +"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." msgstr "" @@ -9284,6 +9303,6 @@ #, java-format msgid "" -"Relation with external id ''{0}'' refers to missing primitive with external " -"id ''{1}''." +"Relation with external id ''{0}'' refers to a missing primitive with " +"external id ''{1}''." msgstr "" @@ -9378,32 +9397,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:73 msgid "Starting to upload with one request per primitive ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Starting to upload in one request ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 +#, fuzzy, java-format +msgid "Parameter ''{0}'' must not be null" +msgstr "פרמטר ''{0}'' אינו יכול להיות אפס" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 msgid "Uploading data ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 msgid "" "WARNING: no API version defined for data to upload. Falling back to version " @@ -9411,5 +9435,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:153 #, java-format msgid "" @@ -9629,5 +9653,5 @@ #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:202 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:324 build/trans_presets.java:325 @@ -9649,6 +9673,6 @@ #: build/trans_presets.java:789 build/trans_presets.java:1333 #: build/trans_presets.java:1400 build/trans_presets.java:1401 -#: build/trans_presets.java:1402 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 +#: build/trans_presets.java:1402 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 msgid "unknown" msgstr "לא ידוע" @@ -9791,5 +9815,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:192 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:182 +#, java-format +msgid "" +"The OSM server ''{0}'' doesn't know about an object
you tried to read, " +"update, or delete. Either the respective object
doesn''t exist on the " +"server or you''re using an invalid URL to access
it. Please carefully " +"check the servers address ''{1}'' for typos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:209 #, java-format msgid "" @@ -9799,5 +9832,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:262 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:279 #, java-format msgid "" @@ -10056,17 +10089,15 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35 msgid "Define Address Interpolation" msgstr "" -#. Whether to re-trigger data changed for relation #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:413 #: ../plugins/terracer/src/terracer/TerracerAction.java:437 @@ -10074,99 +10105,99 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 msgid "Alphabetic" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161 #, java-format msgid "Relation: {0}" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173 msgid "Associate with street using:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184 msgid "Numbering Scheme:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 msgid "Starting #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188 msgid "Ending #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 #, java-format msgid "Will associate {0} additional house number nodes" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 msgid "Starting address number must be less than ending address number" msgstr "" @@ -10900,4 +10931,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52 +#: build/trans_presets.java:2331 msgid "Location" msgstr "מיקום" @@ -11437,4 +11469,5 @@ msgstr "דרום-מזרח" +#. item "Man Made/Pipeline" combo "Type" #. color highway_track #. @@ -11480,7 +11513,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:990 build/trans_style.java:1007 -#: build/trans_style.java:1023 build/trans_style.java:3400 -#: build/trans_style.java:3408 +#: build/trans_presets.java:2330 build/trans_style.java:990 +#: build/trans_style.java:1007 build/trans_style.java:1023 +#: build/trans_style.java:3400 build/trans_style.java:3408 msgid "water" msgstr "מים" @@ -14015,9 +14048,11 @@ #. item "Public Transport/Airport" text "Name" #. +#. item "Man Made/Power Station" text "Operator" #. item "Relations/Route" text "Name" #: build/trans_presets.java:65 build/trans_presets.java:101 #: build/trans_presets.java:121 build/trans_presets.java:141 #: build/trans_presets.java:178 build/trans_presets.java:198 -#: build/trans_presets.java:1560 build/trans_presets.java:3158 +#: build/trans_presets.java:1560 build/trans_presets.java:2382 +#: build/trans_presets.java:3170 msgid "Reference" msgstr "התייחסות" @@ -14579,5 +14614,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 msgid "metal" msgstr "" @@ -14597,5 +14632,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 #: build/trans_style.java:3375 msgid "wood" @@ -14884,7 +14919,7 @@ #: build/trans_presets.java:1401 build/trans_presets.java:1402 #: build/trans_presets.java:1767 build/trans_presets.java:1777 -#: build/trans_presets.java:2408 build/trans_presets.java:2444 -#: build/trans_presets.java:2453 build/trans_presets.java:2454 -#: build/trans_presets.java:2455 build/trans_presets.java:2725 +#: build/trans_presets.java:2420 build/trans_presets.java:2456 +#: build/trans_presets.java:2465 build/trans_presets.java:2466 +#: build/trans_presets.java:2467 build/trans_presets.java:2737 msgid "yes" msgstr "כן" @@ -15033,8 +15068,8 @@ #: build/trans_presets.java:1400 build/trans_presets.java:1401 #: build/trans_presets.java:1402 build/trans_presets.java:1767 -#: build/trans_presets.java:1777 build/trans_presets.java:2408 -#: build/trans_presets.java:2444 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 -#: build/trans_presets.java:2725 +#: build/trans_presets.java:1777 build/trans_presets.java:2420 +#: build/trans_presets.java:2456 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 +#: build/trans_presets.java:2737 msgid "no" msgstr "לא" @@ -15172,6 +15207,8 @@ #. item "Water/Wetland" text "Name" #. item "Car/Parking" text "Reference number" +#. item "Man Made/Pipeline" text "Operator" #. item "Man Made/Power Generator" label "Edit Power Generator" #. +#. item "Man Made/Power Tower" label "Edit Power Tower" #. item "Land use/Tree" text "Name" #. item "Land use/Wood" text "Name" @@ -15179,7 +15216,8 @@ #: build/trans_presets.java:350 build/trans_presets.java:649 #: build/trans_presets.java:789 build/trans_presets.java:1137 -#: build/trans_presets.java:1395 build/trans_presets.java:2364 -#: build/trans_presets.java:2913 build/trans_presets.java:2923 -#: build/trans_presets.java:2932 +#: build/trans_presets.java:1395 build/trans_presets.java:2330 +#: build/trans_presets.java:2372 build/trans_presets.java:2398 +#: build/trans_presets.java:2925 build/trans_presets.java:2935 +#: build/trans_presets.java:2944 msgid "Type" msgstr "סוג" @@ -15729,10 +15767,10 @@ #. item "Tourism/Information Terminal" text "Closer description" #. item "Tourism/Audioguide" text "Closer description" -#. item "Man Made/Power Station" label "Edit Power Station" -#. +#. item "Man Made/Tower" text "Height (meters)" +#. item "Man Made/Pipeline" label "Edit Pipeline" +#. +#. item "Man Made/Power Station" text "Name" #. item "Man Made/Power Sub Station" label "Edit Power Sub Station" #. -#. item "Man Made/Power Line" label "Edit Power Line" -#. #. item #. #: build/trans_presets.java:1535 build/trans_presets.java:1789 -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2465 msgid "Shelter" msgstr "מקלט" @@ -18090,5 +18130,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1877 build/trans_presets.java:2669 +#: build/trans_presets.java:1877 build/trans_presets.java:2681 msgid "Sports" msgstr "" @@ -19441,6 +19481,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "Religion" msgstr "דת" @@ -19449,66 +19489,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "bahai" msgstr "בהאי" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "buddhist" msgstr "בודהיסט" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "christian" msgstr "נוצרי" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "hindu" msgstr "הינדי" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jain" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jewish" msgstr "יהודי" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "muslim" msgstr "מוסלמי" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "sikh" msgstr "סיקי" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "spiritualist" msgstr "ספיריטואליסט" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "taoist" msgstr "טאואיסט" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "zoroastrian" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "Denomination" msgstr "" @@ -19517,76 +19557,76 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "anglican" msgstr "אנגליקני" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "baptist" msgstr "באפטיסט" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "catholic" msgstr "קתולי" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "evangelical" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "jehovahs_witness" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "lutheran" msgstr "לותרני" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "methodist" msgstr "מתודיסט" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "mormon" msgstr "מורמוני" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "orthodox" msgstr "אורתודוקסי" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "pentecostal" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "presbyterian" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "protestant" msgstr "פרוטסטנטי" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "quaker" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "shia" msgstr "שיעי" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "sunni" msgstr "סוני" @@ -19682,25 +19722,49 @@ #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2296 +#, fuzzy +msgid "Tower type" +msgstr "מגדל" + +#. item "Man Made/Tower" combo "Tower type" +#: build/trans_presets.java:2296 +#, fuzzy +msgid "communication" +msgstr "מיקום" + +#: build/trans_presets.java:2296 +#, fuzzy +msgid "observation" +msgstr "הגבהה" + +#. +#: build/trans_presets.java:2298 +#, fuzzy +msgid "Height (meters)" +msgstr "אורך מירבי (מטרים)" + +#. item "Man Made/Tower" text "Operator" +#. +#: build/trans_presets.java:2302 msgid "Water Tower" msgstr "מגדל מים" #. item -#: build/trans_presets.java:2298 +#: build/trans_presets.java:2303 msgid "Edit Water Tower" msgstr "ערוך מגדל מים" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2307 msgid "Gasometer" msgstr "" #. item -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2308 msgid "Edit Gasometer" msgstr "" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2307 +#: build/trans_presets.java:2312 msgid "Lighthouse" msgstr "מגדלור" @@ -19708,10 +19772,10 @@ #. item #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2314 msgid "Edit Lighthouse" msgstr "ערוך מגדלור" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2318 msgid "Windmill" msgstr "טחנת רוח" @@ -19719,21 +19783,55 @@ #. item #. -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2320 msgid "Edit Windmill" msgstr "ערוך טחנת רוח" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2319 +#: build/trans_presets.java:2324 msgid "Pipeline" msgstr "צינור" #. item -#. -#: build/trans_presets.java:2321 +#. +#: build/trans_presets.java:2327 msgid "Edit Pipeline" msgstr "ערוך צינור" -#. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2330 +#, fuzzy +msgid "oil" +msgstr "שירותים" + +#: build/trans_presets.java:2330 build/trans_presets.java:2372 +msgid "gas" +msgstr "" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "sewage" +msgstr "שימוש" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "heat" +msgstr "בריאות" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "any substance" +msgstr "A ע\"י מרחק" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "underwater" +msgstr "מים" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "overground" +msgstr "אדמה" + +#: build/trans_presets.java:2333 msgid "Wastewater Plant" msgstr "" @@ -19743,10 +19841,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:2329 +#: build/trans_presets.java:2337 msgid "Edit Wastewater Plant" msgstr "" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2333 +#: build/trans_presets.java:2341 msgid "Crane" msgstr "" @@ -19754,10 +19852,10 @@ #. item #. -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2343 msgid "Edit Crane" msgstr "" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2347 msgid "Beacon" msgstr "" @@ -19765,10 +19863,10 @@ #. item #. -#: build/trans_presets.java:2341 +#: build/trans_presets.java:2349 msgid "Edit Beacon" msgstr "" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2353 msgid "Survey Point" msgstr "" @@ -19776,10 +19874,10 @@ #. item #. -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2355 msgid "Edit Survey Point" msgstr "" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2359 msgid "Surveillance" msgstr "" @@ -19787,5 +19885,5 @@ #. item #. -#: build/trans_presets.java:2353 +#: build/trans_presets.java:2361 msgid "Edit Surveillance Camera" msgstr "" @@ -19793,5 +19891,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2366 msgid "Power Generator" msgstr "" @@ -19801,39 +19899,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:2362 +#: build/trans_presets.java:2370 msgid "Edit Power Generator" msgstr "" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "wind" msgstr "" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "hydro" msgstr "" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "fossil" msgstr "" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "nuclear" msgstr "" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "coal" msgstr "" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "photovoltaic" msgstr "" -#: build/trans_presets.java:2364 -msgid "gas" -msgstr "" - #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2375 msgid "Power Station" msgstr "תחנת כח" @@ -19842,10 +19936,10 @@ #. -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2378 msgid "Edit Power Station" msgstr "ערוך תחנת כח" -#. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2374 +#. item "Man Made/Power Station" text "Reference" +#: build/trans_presets.java:2384 msgid "Power Sub Station" msgstr "" @@ -19854,5 +19948,5 @@ #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2387 msgid "Edit Power Sub Station" msgstr "" @@ -19860,10 +19954,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2380 build/trans_presets.java:2396 +#: build/trans_presets.java:2390 build/trans_presets.java:2407 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2382 +#: build/trans_presets.java:2392 msgid "Power Tower" msgstr "עמוד חשמל" @@ -19874,11 +19968,26 @@ #. 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:2387 +#: build/trans_presets.java:2397 msgid "Edit Power Tower" msgstr "ערוך עמוד חשמל" -#. item "Man Made/Power Tower" label "Edit Power Tower" -#. -#: build/trans_presets.java:2390 +#. item "Man Made/Power Tower" combo "Type" +#: build/trans_presets.java:2398 +#, fuzzy +msgid "tower" +msgstr "מגדל" + +#: build/trans_presets.java:2398 +#, fuzzy +msgid "pole" +msgstr "תפקיד" + +#: build/trans_presets.java:2399 +#, fuzzy +msgid "Tower reference" +msgstr "העדפות" + +#. item "Man Made/Power Tower" text "Tower reference" +#: build/trans_presets.java:2401 msgid "Power Line" msgstr "קו מתח" @@ -19887,40 +19996,81 @@ #. -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2404 msgid "Edit Power Line" msgstr "ערוך קו מתח" +#. item "Man Made/Power Line" label "Edit Power Line" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "Line type" +msgstr "סוג מסלול" + +#. item "Man Made/Power Line" combo "Line type" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "line" +msgstr "צינור" + +#: build/trans_presets.java:2405 +msgid "minor_line" +msgstr "" + #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2408 msgid "Voltage" msgstr "" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2398 -msgid "Amount of Wires" -msgstr "" - -#. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2409 +msgid "Amount of Cables" +msgstr "" + +#. item "Man Made/Power Line" text "Amount of Cables" +#: build/trans_presets.java:2410 +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:2410 +#, fuzzy +msgid "single" +msgstr "זווית" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "double" +msgstr "תפקיד" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "triple" +msgstr "קובץ" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "quad" +msgstr "מחצבה" + +#: build/trans_presets.java:2413 msgid "Amenities" msgstr "" #. group "Amenities" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2414 msgid "Toilets" msgstr "שירותים" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2409 build/trans_presets.java:2525 +#: build/trans_presets.java:2421 build/trans_presets.java:2537 msgid "Note" msgstr "" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2411 +#: build/trans_presets.java:2423 msgid "Post Box" msgstr "תיבת דואר" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2428 msgid "Telephone" msgstr "טלפון" @@ -19929,5 +20079,5 @@ #. -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2431 msgid "Edit Telephone" msgstr "ערוך טלפון" @@ -19935,5 +20085,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2422 build/trans_presets.java:2526 +#: build/trans_presets.java:2434 build/trans_presets.java:2538 msgid "Coins" msgstr "" @@ -19941,5 +20091,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2423 build/trans_presets.java:2527 +#: build/trans_presets.java:2435 build/trans_presets.java:2539 msgid "Notes" msgstr "" @@ -19947,5 +20097,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2424 build/trans_presets.java:2528 +#: build/trans_presets.java:2436 build/trans_presets.java:2540 msgid "Electronic purses and Charge cards" msgstr "" @@ -19953,5 +20103,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2425 build/trans_presets.java:2529 +#: build/trans_presets.java:2437 build/trans_presets.java:2541 msgid "Debit cards" msgstr "" @@ -19959,15 +20109,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2426 build/trans_presets.java:2530 +#: build/trans_presets.java:2438 build/trans_presets.java:2542 msgid "Credit cards" msgstr "" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2439 msgid "Telephone cards" msgstr "כרטיסי טלפון" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2429 +#: build/trans_presets.java:2441 msgid "Recycling" msgstr "" @@ -19976,5 +20126,5 @@ #. -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2444 msgid "Edit Recycling station" msgstr "ערוך תחנת מיחזור" @@ -19982,35 +20132,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2446 msgid "Batteries" msgstr "" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2435 +#: build/trans_presets.java:2447 msgid "Cans" msgstr "" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2448 msgid "Clothes" msgstr "" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2437 +#: build/trans_presets.java:2449 msgid "Glass" msgstr "" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2450 msgid "Paper" msgstr "" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2451 msgid "Scrap Metal" msgstr "" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2453 msgid "Bench" msgstr "ספסל" @@ -20019,31 +20169,31 @@ #. #. -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2456 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "stone" msgstr "" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "plastic" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "black" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "brown" msgstr "" @@ -20114,5 +20264,5 @@ #. #. -#: build/trans_presets.java:2446 build/trans_style.java:3063 +#: build/trans_presets.java:2458 build/trans_style.java:3063 #: build/trans_style.java:3071 build/trans_style.java:3079 #: build/trans_style.java:3087 build/trans_style.java:3135 @@ -20122,27 +20272,27 @@ msgstr "ירוק" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "red" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "blue" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "white" msgstr "" -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2459 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2461 msgid "Hunting Stand" msgstr "" #. item -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2462 msgid "Edit Hunting Stand" msgstr "" @@ -20151,30 +20301,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2452 build/trans_presets.java:2914 +#: build/trans_presets.java:2464 build/trans_presets.java:2926 msgid "Height" msgstr "" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "low" msgstr "" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "half" msgstr "" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "full" msgstr "" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2466 msgid "Hide" msgstr "" -#: build/trans_presets.java:2455 +#: build/trans_presets.java:2467 msgid "Lock" msgstr "" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2469 msgid "Fountain" msgstr "מזרקה" @@ -20183,10 +20333,10 @@ #. -#: build/trans_presets.java:2460 +#: build/trans_presets.java:2472 msgid "Edit Fountain" msgstr "ערוך מזרקה" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2476 msgid "Drinking Water" msgstr "מי שתיה" @@ -20195,10 +20345,10 @@ #. -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2479 msgid "Edit Drinking Water" msgstr "ערוך מי שתיה" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2471 +#: build/trans_presets.java:2483 msgid "Baby Hatch" msgstr "" @@ -20206,33 +20356,33 @@ #. item #. -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2485 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2491 msgid "Shops" msgstr "חנויות" #. group "Shops" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2492 msgid "Supermarket" msgstr "סופרמרקט" #. item -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2493 msgid "Edit Supermarket" msgstr "ערוך סופרמרקט" -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2498 msgid "Chemist" msgstr "" #. item -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2499 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2504 msgid "Convenience Store" msgstr "מכולת" @@ -20240,9 +20390,9 @@ #. item #. -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2506 msgid "Edit Convenience Store" msgstr "ערוך מכולת" -#: build/trans_presets.java:2499 +#: build/trans_presets.java:2511 msgid "Kiosk" msgstr "קיוסק" @@ -20250,27 +20400,27 @@ #. item #. -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2513 msgid "Edit Kiosk" msgstr "ערוך קיוסק" -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2518 msgid "Book Store" msgstr "" #. item -#: build/trans_presets.java:2507 +#: build/trans_presets.java:2519 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2524 msgid "Travel Agency" msgstr "" #. item -#: build/trans_presets.java:2513 +#: build/trans_presets.java:2525 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2518 +#: build/trans_presets.java:2530 msgid "Vending machine" msgstr "מכונת ממכר" @@ -20278,5 +20428,5 @@ #. item #. -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2532 msgid "Edit Vending machine" msgstr "ערוך מכונת ממכר" @@ -20284,88 +20434,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "Vending products" msgstr "" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_tickets" msgstr "כרטיסים לתחבורה ציבורית" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_plans" msgstr "מפות תחבורה ציבורית" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "parking_tickets" msgstr "כרטיסי חניה" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "food" msgstr "מזון" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "drinks" msgstr "משקאות" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "sweets" msgstr "ממתקים" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "cigarettes" msgstr "סיגריות" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "photos" msgstr "תמונות" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "animal_food" msgstr "מזון בע\"ח" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "news_papers" msgstr "עיתונים" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "toys" msgstr "צעצועים" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "stamps" msgstr "בולים" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "SIM-cards" msgstr "כרטיס SIM" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "telephone_vouchers" msgstr "שוברי טלפון" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "vouchers" msgstr "שוברים" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "condoms" msgstr "קונדומים" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "tampons" msgstr "טמפונים" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "excrement_bags" msgstr "שקיות צואה" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2543 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2545 msgid "Butcher" msgstr "קצבייה" @@ -20373,9 +20523,9 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2547 msgid "Edit Butcher" msgstr "ערוך קצבייה" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2552 msgid "Baker" msgstr "מאפייה" @@ -20383,9 +20533,9 @@ #. item #. -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2554 msgid "Edit Baker" msgstr "ערוך מאפייה" -#: build/trans_presets.java:2547 +#: build/trans_presets.java:2559 msgid "Florist" msgstr "פרחים" @@ -20393,18 +20543,18 @@ #. item #. -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2561 msgid "Edit Florist" msgstr "ערוך חנות פרחים" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2566 msgid "Organic" msgstr "" #. item -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2567 msgid "Edit Organic Shop" msgstr "ערוך חנות אורגנית" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2572 msgid "Alcohol" msgstr "" @@ -20412,54 +20562,54 @@ #. item #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2574 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2579 msgid "Beverages" msgstr "" #. item -#: build/trans_presets.java:2568 +#: build/trans_presets.java:2580 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2573 +#: build/trans_presets.java:2585 msgid "Computer" msgstr "" #. item -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2586 msgid "Edit Computer Shop" msgstr "ערוך חנות מחשבים" -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2591 msgid "Electronics" msgstr "" #. item -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2592 msgid "Edit Electronics Shop" msgstr "ערוך חנות אלקטרוניקה" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2597 msgid "Hifi" msgstr "" #. item -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2598 msgid "Edit Hifi Shop" msgstr "" -#: build/trans_presets.java:2591 +#: build/trans_presets.java:2603 msgid "Furniture" msgstr "" #. item -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2604 msgid "Edit Furniture Shop" msgstr "ערוך חנות רהיטים" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2609 msgid "Garden Centre" msgstr "" @@ -20467,9 +20617,9 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2611 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2616 msgid "Hardware" msgstr "" @@ -20477,9 +20627,9 @@ #. item #. -#: build/trans_presets.java:2606 +#: build/trans_presets.java:2618 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2623 msgid "Do-it-yourself-store" msgstr "חנות עשה-זאת-בעצמך" @@ -20487,54 +20637,54 @@ #. item #. -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2625 msgid "Edit Do-it-yourself-store" msgstr "ערוך חנות עשה-זאת-בעצמך" -#: build/trans_presets.java:2618 +#: build/trans_presets.java:2630 msgid "Stationery" msgstr "" #. item -#: build/trans_presets.java:2619 +#: build/trans_presets.java:2631 msgid "Edit Stationery Shop" msgstr "" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2636 msgid "Hairdresser" msgstr "מספרה" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2637 msgid "Edit Hairdresser" msgstr "ערוך מספרה" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2642 msgid "Shoes" msgstr "" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2643 msgid "Edit Shoe Shop" msgstr "ערוך חנות נעליים" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2648 msgid "Toys" msgstr "" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2649 msgid "Edit Toy Shop" msgstr "ערוך חנות צעצועים" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2654 msgid "Video" msgstr "" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2655 msgid "Edit Video Shop" msgstr "ערוך חנות וידאו" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2660 msgid "Dry Cleaning" msgstr "ניקוי יבש" @@ -20542,9 +20692,9 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2662 msgid "Edit Dry Cleaning" msgstr "ערוך ניקוי יבש" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2667 msgid "Laundry" msgstr "מכבסה" @@ -20552,9 +20702,9 @@ #. item #. -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2669 msgid "Edit Laundry" msgstr "ערוך מכבסה" -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2674 msgid "Outdoor" msgstr "" @@ -20562,28 +20712,28 @@ #. item #. -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2676 msgid "Edit Outdoor Shop" msgstr "" #. item -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2682 msgid "Edit Sports Shop" msgstr "ערוך חנות ספורט" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2687 msgid "Optician" msgstr "" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2688 msgid "Edit Optician" msgstr "ערוך אופטיקאי" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2695 msgid "Cash" msgstr "מזומן" #. group "Cash" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2696 msgid "Bank" msgstr "בנק" @@ -20591,14 +20741,14 @@ #. item #. -#: build/trans_presets.java:2686 +#: build/trans_presets.java:2698 msgid "Edit Bank" msgstr "ערוך בנק" -#: build/trans_presets.java:2691 build/trans_presets.java:2700 +#: build/trans_presets.java:2703 build/trans_presets.java:2712 msgid "Automated Teller Machine" msgstr "כספומט" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2705 msgid "Money Exchange" msgstr "החלפת כסף" @@ -20606,5 +20756,5 @@ #. item #. -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2707 msgid "Edit Money Exchange" msgstr "ערוך החלפת כסף" @@ -20612,15 +20762,15 @@ #. item #. -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2714 msgid "Edit Automated Teller Machine" msgstr "ערוך כספומט" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2719 msgid "Health" msgstr "בריאות" #. group "Health" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2720 msgid "Doctors" msgstr "רופאים" @@ -20628,18 +20778,18 @@ #. item #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2722 msgid "Edit Doctors" msgstr "ערוך רופאים" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2727 msgid "Dentist" msgstr "רופא שיניים" #. item -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2728 msgid "Edit Dentist" msgstr "ערוך רופא שיניים" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2733 msgid "Pharmacy" msgstr "בית מרקחת" @@ -20647,5 +20797,5 @@ #. item #. -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2735 msgid "Edit Pharmacy" msgstr "ערוך בית מרקחת" @@ -20653,9 +20803,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2737 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2741 msgid "Hospital" msgstr "בית חולים" @@ -20663,10 +20813,10 @@ #. item #. -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2743 msgid "Edit Hospital" msgstr "ערוך בית חולים" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2747 msgid "Emergency Access Point" msgstr "נקודת גישה בחירום" @@ -20675,5 +20825,5 @@ #. -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2750 msgid "Edit Emergency Access Point" msgstr "ערוך נקודת גישה בחירום" @@ -20682,20 +20832,20 @@ #. #. -#: build/trans_presets.java:2741 +#: build/trans_presets.java:2753 msgid "Point Number" msgstr "מספר נקודה" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2742 +#: build/trans_presets.java:2754 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2756 msgid "Phone Number" msgstr "מספר טלפון" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2757 msgid "(Use international code, like +12-345-67890)" msgstr "(השתמש בקדומת בינלאומית, למשל +12-345-67890)" @@ -20703,5 +20853,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2760 msgid "Veterinary" msgstr "וטרינרי" @@ -20710,59 +20860,59 @@ #. -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2763 msgid "Edit Veterinary" msgstr "ערוך וטרינרי" -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2770 msgid "Geography" msgstr "" #. group "Places" -#: build/trans_presets.java:2760 +#: build/trans_presets.java:2772 msgid "Continent" msgstr "יבשת" #. item -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2773 msgid "Edit Continent" msgstr "ערוך יבשת" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2766 +#: build/trans_presets.java:2778 msgid "Country" msgstr "ארץ" #. item -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2779 msgid "Edit Country" msgstr "ערוך ארץ" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2784 msgid "State" msgstr "מדינה" #. item -#: build/trans_presets.java:2773 +#: build/trans_presets.java:2785 msgid "Edit State" msgstr "ערוך מדינה" #. item "Places/State" text "Name" -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2790 msgid "Region" msgstr "אזור" #. item -#: build/trans_presets.java:2779 +#: build/trans_presets.java:2791 msgid "Edit Region" msgstr "ערוך אזור" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2796 msgid "County" msgstr "מחוז" #. item -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2797 msgid "Edit County" msgstr "ערוך מחוז" @@ -20770,15 +20920,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2803 msgid "City" msgstr "עיר" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2804 msgid "Edit City" msgstr "ערוך עיר" #. item "Places/City" text "Name" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2809 msgid "Town" msgstr "עיירה" @@ -20786,10 +20936,10 @@ #. item #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2811 msgid "Edit Town" msgstr "ערוך עיירה" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2804 +#: build/trans_presets.java:2816 msgid "Suburb" msgstr "פרבר" @@ -20797,25 +20947,25 @@ #. item #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2818 msgid "Edit Suburb" msgstr "ערוך פרבר" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2823 msgid "Village" msgstr "כפר" #. item -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2824 msgid "Edit Village" msgstr "ערוך כפר" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2817 +#: build/trans_presets.java:2829 msgid "Hamlet" msgstr "כפר קטן" #. item -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2830 msgid "Edit Hamlet" msgstr "ערוך כפר קטן" @@ -20823,5 +20973,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2824 +#: build/trans_presets.java:2836 msgid "Locality" msgstr "מקומיות" @@ -20829,10 +20979,10 @@ #. item #. -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2838 msgid "Edit Locality" msgstr "ערוך מקומיות" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2843 msgid "Island" msgstr "אי" @@ -20840,10 +20990,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2845 msgid "Edit Island" msgstr "ערוך אי" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2838 +#: build/trans_presets.java:2850 msgid "Islet" msgstr "" @@ -20851,5 +21001,5 @@ #. item #. -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2852 msgid "Edit Islet" msgstr "" @@ -20857,5 +21007,5 @@ #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2858 msgid "Cave Entrance" msgstr "פתח מערה" @@ -20863,10 +21013,10 @@ #. item #. -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2860 msgid "Edit Cave Entrance" msgstr "ערוך פתח מערה" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2864 msgid "Peak" msgstr "פסגה" @@ -20874,10 +21024,10 @@ #. item #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2866 msgid "Edit Peak" msgstr "ערוך פסגה" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2871 msgid "Glacier" msgstr "קרחון" @@ -20885,10 +21035,10 @@ #. item #. -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2873 msgid "Edit Glacier" msgstr "ערוך קרחון" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2878 msgid "Volcano" msgstr "הר געש" @@ -20896,70 +21046,70 @@ #. item #. -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2880 msgid "Edit Volcano" msgstr "ערוך הר געש" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2886 msgid "Boundaries" msgstr "גבולות" #. group "Boundaries" -#: build/trans_presets.java:2875 +#: build/trans_presets.java:2887 msgid "National" msgstr "לאומי" #. item -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2888 msgid "Edit National Boundary" msgstr "ערוך גבול לאומי" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2881 +#: build/trans_presets.java:2893 msgid "Administrative" msgstr "מנהלי" #. item -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2894 msgid "Edit Administrative Boundary" msgstr "ערוך גבול מנהלי" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2887 +#: build/trans_presets.java:2899 msgid "Civil" msgstr "אזרחי" #. item -#: build/trans_presets.java:2888 +#: build/trans_presets.java:2900 msgid "Edit Civil Boundary" msgstr "ערוך תחום אזרחי" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2893 +#: build/trans_presets.java:2905 msgid "Political" msgstr "פוליטי" #. item -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2906 msgid "Edit Political Boundary" msgstr "ערוך תחום פוליטי" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2911 msgid "National park" msgstr "גן לאומי" #. item -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2912 msgid "Edit National Park Boundary" msgstr "ערוך תחום גן לאומי" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2918 msgid "Land use" msgstr "" #. group "Land use" -#: build/trans_presets.java:2907 +#: build/trans_presets.java:2919 msgid "Tree" msgstr "עץ" @@ -20968,15 +21118,15 @@ #. -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2922 msgid "Edit Tree" msgstr "ערוך עץ" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2915 +#: build/trans_presets.java:2927 msgid "Botanical Name" msgstr "שם בוטני" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2929 msgid "Wood" msgstr "חורש" @@ -20985,5 +21135,5 @@ #. -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2932 msgid "Edit Wood" msgstr "ערוך חורש" @@ -20991,17 +21141,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "coniferous" msgstr "מחטני" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "deciduous" msgstr "נשיר" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "mixed" msgstr "מעורב" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2937 msgid "Forest" msgstr "יער" @@ -21010,14 +21160,14 @@ #. -#: build/trans_presets.java:2928 +#: build/trans_presets.java:2940 msgid "Edit Forest Landuse" msgstr "" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2946 msgid "Nature Reserve" msgstr "" #. item -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2947 msgid "Edit Nature Reserve" msgstr "" @@ -21025,25 +21175,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2952 msgid "Scree" msgstr "" #. item -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2953 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2957 msgid "Scrub" msgstr "" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:2958 msgid "Edit Scrub" msgstr "" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2962 msgid "Fell" msgstr "" @@ -21051,10 +21201,10 @@ #. item #. -#: build/trans_presets.java:2952 +#: build/trans_presets.java:2964 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2968 msgid "Heath" msgstr "שדה-בור" @@ -21062,5 +21212,5 @@ #. item #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2970 msgid "Edit Heath" msgstr "ערוך שדה-בור" @@ -21068,5 +21218,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2975 msgid "Farmyard" msgstr "חצר משק" @@ -21075,45 +21225,45 @@ #. -#: build/trans_presets.java:2966 +#: build/trans_presets.java:2978 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2983 msgid "Farmland" msgstr "אדמה חקלאית" #. item -#: build/trans_presets.java:2972 +#: build/trans_presets.java:2984 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2977 +#: build/trans_presets.java:2989 msgid "Meadow" msgstr "" #. item -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2990 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:2995 msgid "Vineyard" msgstr "כרם" #. item -#: build/trans_presets.java:2984 +#: build/trans_presets.java:2996 msgid "Edit Vineyard Landuse" msgstr "" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3001 msgid "Allotments" msgstr "" #. item -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3002 msgid "Edit Allotments Landuse" msgstr "" @@ -21121,25 +21271,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3008 msgid "Garden" msgstr "" #. item -#: build/trans_presets.java:2997 +#: build/trans_presets.java:3009 msgid "Edit Garden" msgstr "" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3013 msgid "Grass" msgstr "דשא" #. item -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3014 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3019 msgid "Village Green" msgstr "" @@ -21147,10 +21297,10 @@ #. item #. -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3021 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3026 msgid "Common" msgstr "" @@ -21158,20 +21308,20 @@ #. item #. -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3028 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3032 msgid "Park" msgstr "" #. item -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3033 msgid "Edit Park" msgstr "" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3037 msgid "Recreation Ground" msgstr "" @@ -21179,5 +21329,5 @@ #. item #. -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3039 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -21185,15 +21335,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3033 +#: build/trans_presets.java:3045 msgid "Residential area" msgstr "אזור מגורים" #. item -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3046 msgid "Edit Residential Landuse" msgstr "" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3051 msgid "Graveyard" msgstr "בית-קברות" @@ -21201,9 +21351,9 @@ #. item #. -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3053 msgid "Edit Graveyard" msgstr "ערוך בית-קברות" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3059 msgid "Cemetery" msgstr "בית עלמין" @@ -21211,39 +21361,39 @@ #. item #. -#: build/trans_presets.java:3049 +#: build/trans_presets.java:3061 msgid "Edit Cemetery Landuse" msgstr "" -#: build/trans_presets.java:3056 +#: build/trans_presets.java:3068 msgid "Retail" msgstr "קמעוני" #. item -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3069 msgid "Edit Retail Landuse" msgstr "" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3062 +#: build/trans_presets.java:3074 msgid "Commercial" msgstr "מסחרי" #. item -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3075 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3068 +#: build/trans_presets.java:3080 msgid "Industrial" msgstr "תעשייתי" #. item -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3081 msgid "Edit Industrial Landuse" msgstr "" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3086 msgid "Railway land" msgstr "" @@ -21251,15 +21401,15 @@ #. item #. -#: build/trans_presets.java:3076 +#: build/trans_presets.java:3088 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3081 +#: build/trans_presets.java:3093 msgid "Military" msgstr "צבאי" #. item -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3094 msgid "Edit Military Landuse" msgstr "" @@ -21267,55 +21417,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3100 msgid "Construction area" msgstr "אתר בניה" #. item -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3101 msgid "Edit Construction Landuse" msgstr "" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3094 +#: build/trans_presets.java:3106 msgid "Brownfield" msgstr "" #. item -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3107 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3100 +#: build/trans_presets.java:3112 msgid "Greenfield" msgstr "" #. item -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3113 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3118 msgid "Landfill" msgstr "" #. item -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3119 msgid "Edit Landfill Landuse" msgstr "" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3124 msgid "Quarry" msgstr "מחצבה" #. item -#: build/trans_presets.java:3113 +#: build/trans_presets.java:3125 msgid "Edit Quarry Landuse" msgstr "" #. group "Relations" -#: build/trans_presets.java:3122 +#: build/trans_presets.java:3134 msgid "Multipolygon" msgstr "" @@ -21325,5 +21475,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:3126 +#: build/trans_presets.java:3138 msgid "Edit Multipolygon" msgstr "" @@ -21332,10 +21482,10 @@ #. #. -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3144 msgid "outer segment" msgstr "" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3145 msgid "inner segment" msgstr "" @@ -21343,5 +21493,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3148 msgid "Turn restriction" msgstr "" @@ -21350,5 +21500,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3151 msgid "Edit Turn Restriction" msgstr "" @@ -21356,34 +21506,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_straight_on" msgstr "" @@ -21392,15 +21542,15 @@ #. #. -#: build/trans_presets.java:3146 +#: build/trans_presets.java:3158 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3159 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3148 +#: build/trans_presets.java:3160 msgid "to way" msgstr "" @@ -21408,5 +21558,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3151 +#: build/trans_presets.java:3163 msgid "Route" msgstr "" @@ -21415,5 +21565,5 @@ #. -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3166 msgid "Edit Route" msgstr "" @@ -21421,5 +21571,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "Route type" msgstr "" @@ -21491,5 +21641,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:233 +#: build/trans_presets.java:3168 build/trans_style.java:233 #: build/trans_style.java:683 build/trans_style.java:906 #: build/trans_style.java:914 build/trans_style.java:922 @@ -21498,17 +21648,17 @@ msgstr "אופניים" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "bus" msgstr "אוטובוס" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "road" msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ferry" msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ski" msgstr "" @@ -21561,5 +21711,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:247 +#: build/trans_presets.java:3168 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -21568,13 +21718,13 @@ msgstr "רגל" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "hiking" msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "tram" msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "detour" msgstr "" @@ -21588,10 +21738,10 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:1206 +#: build/trans_presets.java:3168 build/trans_style.java:1206 msgid "subway" msgstr "רכבת תחתית" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3159 +#: build/trans_presets.java:3171 msgid "Symbol description" msgstr "" @@ -21599,31 +21749,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3174 msgid "Network" msgstr "" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "proposed" msgstr "" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "alternate" msgstr "" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "temporary" msgstr "" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "connection" msgstr "" -#: build/trans_presets.java:3165 +#: build/trans_presets.java:3177 msgid "Color (hex)" msgstr "" @@ -21632,30 +21782,30 @@ #. #. -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3180 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3181 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3170 +#: build/trans_presets.java:3182 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3183 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3172 +#: build/trans_presets.java:3184 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3173 +#: build/trans_presets.java:3185 msgid "backward halt point" msgstr "" @@ -25793,4 +25943,19 @@ msgstr "" +#~ msgid "Combine ways with different memberships?" +#~ msgstr "לשלב שתי דרכים בעלות חברויות שונות?" + +#~ msgid "Combine Anyway" +#~ msgstr "אחד בכל זאת" + +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "" +#~ "לדרכים הנבחרות ישנם יחסים משתנים. האם אתה עדיין מעוניין לשלב ביניהם?" + +#~ msgid "Empty member in relation." +#~ msgstr "איבר ריק ביחס." + #~ msgid "Move" #~ msgstr "הזז" Index: /applications/editors/josm/i18n/po/is.po =================================================================== --- /applications/editors/josm/i18n/po/is.po (revision 17821) +++ /applications/editors/josm/i18n/po/is.po (revision 17822) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-22 17:52+0200\n" -"PO-Revision-Date: 2009-09-22 14:49+0000\n" +"POT-Creation-Date: 2009-09-28 16:38+0200\n" +"PO-Revision-Date: 2009-09-28 13:34+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: 2009-09-22 15:46+0000\n" +"X-Launchpad-Export-Date: 2009-09-28 14:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -66,8 +66,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250 @@ -90,9 +90,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -141,7 +141,7 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:172 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 @@ -154,5 +154,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 @@ -330,6 +329,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -339,6 +337,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 @@ -348,5 +346,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -357,5 +355,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180 @@ -364,5 +362,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -455,9 +453,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -489,10 +487,9 @@ msgstr "Veldu minnst fjóra hnúta" -#. FIXME: not sure whether this fits in a dialog #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:85 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -602,5 +599,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 #, java-format msgid "File: {0}" @@ -622,38 +619,22 @@ msgstr "Niðurhel lista yfir opin breytingarsett ..." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine Way" msgstr "Sameina vegi" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 msgid "Combine several ways into one." msgstr "Sameina marga vegi í einn." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 -msgid "Combine ways with different memberships?" -msgstr "Sameina vegi sem eru stak í mismunandi venslum?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -msgid "Combine Anyway" -msgstr "Sameina þá" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" -"Valdir vegir eru stak í mismundandi venslum. Viltu sameina þá þrátt fyrir " -"það?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 msgid "Change directions?" msgstr "Skipta um átt?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Reverse and Combine" msgstr "Skipta um átt og sameina" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -663,5 +644,5 @@ "haldist sér. Vilt þú skipta um átt sumra þeirra?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -671,10 +652,10 @@ "að sameina þá þurfa þeir að vera ein samfelld röð af hnútum" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 #, java-format msgid "Combine {0} ways" msgstr "Sameina {0} vegi" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 msgid "Please select at least two ways to combine." msgstr "Vinsamlegast veldu a.m.k. tvo vegi til að sameina." @@ -719,6 +700,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -783,5 +763,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -812,5 +792,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307 #, java-format msgid "There were {0} conflicts during import." @@ -828,5 +807,4 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Duplicate" @@ -857,10 +835,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:209 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Vista sem GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:208 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Vista gögnin í GPX sniði." @@ -871,8 +849,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -937,5 +915,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 @@ -978,6 +956,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1065,25 +1042,25 @@ msgstr "Sameina það lag sem nú er valið öðru lagi" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge Nodes" msgstr "Sameina hnúta" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 msgid "Merge nodes into the oldest one." msgstr "Sameina valda hnúta á staðsetningu þess elsta." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 msgid "Please select at least two nodes to merge." msgstr "Veldu minnst tvo hnúta til að sameina." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "Gat ekki sameinað hnúta: Hefði þurft að eyða veg sem enn er í notkun." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 #, java-format msgid "Merge {0} nodes" -msgstr "" +msgstr "Sameina {0} hnúta" #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19 @@ -1108,5 +1085,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 msgid "Please select at least one node or way." -msgstr "" +msgstr "Veldu minnst einn hnút eða veg." #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36 @@ -1152,5 +1129,4 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350 msgid "New" msgstr "Ný" @@ -1214,5 +1190,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63 msgid "Only two nodes allowed" -msgstr "" +msgstr "Aðeins er hægt að velja tvo hnúta" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76 @@ -1328,10 +1304,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Vista" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Vista þau gögn sem sjást núna." @@ -1386,10 +1362,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Vista sem..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Vista þau gögn sem sjást núna í nýja skrá." @@ -1432,5 +1408,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:961 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888 @@ -1455,5 +1431,9 @@ msgid_plural "The selected nodes are not in the middle of any way." msgstr[0] "" +"Hnúturinn sem þú valdir er ekki hluti af veg. Ekki er hægt að velja staka " +"hnúta eða hnúta á enda vegs." msgstr[1] "" +"Hnútarnir sem þú valdir eru ekki hluti af veg. Ekki er hægt að velja staka " +"hnúta eða hnúta á enda vegs." #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137 @@ -1465,20 +1445,24 @@ "way also." msgstr[0] "" +"Það er meira en einn vegur að nota hnútinn sem þú valdir. Veldu einnig " +"veginn sem þú vilt skipta." msgstr[1] "" +"Það er meira en einn vegur að nota hnútana sem þú valdir. Veldu einnig " +"veginn sem þú vilt skipta." #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 msgid "The selected nodes do not share the same way." -msgstr "" +msgstr "Valdir hnútar eru ekki hluti af sama veg" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Vegurinn sem þú valdir inniheldur ekki hnútinn sem þú valdir." +msgstr[1] "Vegirnir sem þú valdir innihalda ekki hnútana sem þú valdir." #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251 msgid "You must select two or more nodes to split a circular way." -msgstr "" +msgstr "Þú verður að velja tvo eða fleiri hnúta til að skipta hringlaga veg." #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257 @@ -1663,14 +1647,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 msgid "Upload to OSM..." msgstr "Upphala til OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload all changes to the OSM server." msgstr "Upphala öllum breytingum á OSM þjóninn." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 #, java-format msgid "" @@ -1679,23 +1663,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Ekkert til að upphala. Náðu í og breyttu einhverjum gögnum fyrst." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:171 msgid "No changes to upload." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +msgstr "Engar breytingar til að hlaða upp" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223 #, java-format msgid "Synchronize {0} {1} only" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 msgid "Synchronize entire dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:228 #, java-format msgid "" @@ -1709,17 +1693,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:283 msgid "Conflict detected" msgstr "" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:257 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 #, java-format msgid "Unexpected return value. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:272 #, java-format msgid "" @@ -1730,5 +1714,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:306 #, java-format msgid "" @@ -1738,35 +1722,40 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 msgid "Changeset closed" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:425 #, java-format msgid "Uploading failed.
{0}" msgstr "Upphal mistókst.
{0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:434 msgid "Upload to OSM API failed" msgstr "Upphal mót OSM forritunarviðmótinu mistókst" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457 msgid "Updating primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:514 #, java-format msgid "Uploading data for layer ''{0}''" msgstr "Hleð upp gögnum úr laginu „{0}“" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1854,13 +1843,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34 msgid "Downloading GPS data" msgstr "Sæki GPS gögn" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57 msgid "Downloaded GPX Data" msgstr "Niðurhöluð GPX gögn" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87 msgid "Raw GPS data" msgstr "GPS gögn" @@ -1874,4 +1863,8 @@ msgid "" "Ignoring exception because download has been cancelled. Exception was: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 +msgid "No data found in this area." msgstr "" @@ -1978,5 +1971,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932 msgid "Create new node." -msgstr "" +msgstr "Búa til nýjan hnút." #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937 @@ -2463,5 +2456,5 @@ #, java-format msgid "Add node {0}" -msgstr "" +msgstr "Bætti við hnút {0}" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 @@ -2478,5 +2471,5 @@ #, java-format msgid "Change node {0}" -msgstr "" +msgstr "Breytti hnút {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 @@ -2508,5 +2501,5 @@ #, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "" +msgstr "Setti {0}={1} á hnút „{2}“" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 @@ -2568,9 +2561,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 +#, java-format +msgid "" +"Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -2597,6 +2590,6 @@ msgid "Delete {0} node" msgid_plural "Delete {0} nodes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Eyða {0} hnút" +msgstr[1] "Eyða {0} hnútum" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133 @@ -2619,5 +2612,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Delete from relation" msgstr "Fjarlægja úr venslum" @@ -2673,14 +2666,15 @@ msgstr[1] "Færði {0} hnúta" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 -msgid "Purging 1 primitive" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 -#, java-format -msgid "removing reference from way {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 +#, fuzzy, java-format +msgid "Purged object ''{0}''" +msgstr "Nota forstillinguna „{0}“" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 +#, fuzzy, java-format +msgid "Purged {0} objects" +msgstr "Breyta {0} hlut" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 #, java-format msgid "" @@ -2689,12 +2683,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203 -#, java-format -msgid "removing reference from relation {0}" -msgstr "" +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 +#, fuzzy, java-format +msgid "Removing reference from relation {0}" +msgstr "Eyða valinu úr venslunum {0}?" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 #, java-format msgid "Resolve conflicts in member list of relation {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" @@ -2718,6 +2717,6 @@ msgid "Rotate {0} node" msgid_plural "Rotate {0} nodes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Snúa {0} hnút" +msgstr[1] "Snúa {0} hnútum" #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91 @@ -3036,24 +3035,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Error: {0}" msgstr "Villa: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Warning: {0}" msgstr "Viðvörun: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3061,5 +3060,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3085,6 +3084,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:244 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3140,120 +3139,113 @@ msgstr "" -#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed -#. TODO Remove useless nullcheck when RelationMember.member is encalupsed -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855 -msgid "Empty member in relation." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:850 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:861 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:607 msgid "More than one \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:613 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627 msgid "More than one \"via\" found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:632 #, java-format msgid "Unknown role ''{0}''." msgstr "Óþekkt hlutverk \"{0}\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:641 msgid "No \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645 msgid "No \"to\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:649 msgid "No \"via\" node or way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:658 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:662 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "" +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "" + #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693 -msgid "The \"from\" way doesn't start or end at the \"via\" way." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:870 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:882 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:940 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1029 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1041 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1094 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1120 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1324 msgid "untagged" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1325 msgid "text" msgstr "" @@ -3275,5 +3267,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:249 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 @@ -3284,5 +3276,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 @@ -3311,5 +3303,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:169 msgid "background" msgstr "bakgrunnur" @@ -3401,5 +3393,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "railway" msgstr "" @@ -3455,9 +3447,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +#, fuzzy +msgid "Not Found" +msgstr "Skrá fannst ekki" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 msgid "Unknown host" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:247 msgid "Primitive already deleted" msgstr "" @@ -4755,5 +4752,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -4967,43 +4964,43 @@ msgstr "Stak í" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 msgid "Add Properties" msgstr "Bæti vað eigindum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 msgid "Add a new key/value pair to all objects" msgstr "Bæta nýjum eigindum við valda hluti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 msgid "Edit Properties" msgstr "Breyta eigindum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 msgid "Edit the value of the selected key for all objects" msgstr "Breyta gildi valins lykils í öllum völdum hlutum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 msgid "Properties / Memberships" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 msgid "Change relation" msgstr "Breyta venslum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Eyða valinu úr venslunum {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:855 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 msgid "Delete the selected key in all objects" msgstr "Eyða völdum lykil í öllum völdum hlutum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 msgid "Delete Properties" msgstr "Eyða eigindum" @@ -5013,6 +5010,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168 -#: build/trans_presets.java:3121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 +#: build/trans_presets.java:3133 msgid "Relations" msgstr "Vensl" @@ -5022,25 +5019,30 @@ msgstr "Sýna lista yfir vensl" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:174 #, java-format msgid "Relations: {0}" msgstr "Vensl: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 msgid "Open an editor for the selected relation" msgstr "Opna ritil til að breyta völdum venslum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:325 msgid "Delete the selected relation" msgstr "Eyða völdum venslum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:363 msgid "Create a new relation" msgstr "Skapa ný vensl" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:400 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280 msgid "Create a copy of this relation and open it in another editor window" msgstr "Afrita þessi vensl og opna breytingarglugga fyrir afritið" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 +#, fuzzy +msgid "Set the current selection to the list of selected relations" +msgstr "Opna ritil til að breyta völdum venslum" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5081,9 +5083,9 @@ msgstr "Val: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 msgid "Undock the panel" msgstr "Opna þessa stiku sem glugga" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5092,5 +5094,5 @@ "vinstri tólastikunni." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 msgid "Click to minimize/maximize the panel content" msgstr "Smelltu til að minnka/hámarka innihald stikunnar" @@ -5115,5 +5117,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 msgid "Select primitives submitted by this user" -msgstr "" +msgstr "Velja hluti sem þessi notandi hefur vistað" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 @@ -5156,9 +5158,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:221 msgid "Download all child relations (recursively)" -msgstr "" +msgstr "Ná endurkvæmt í öll undirvensl" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:223 msgid "Download All Children" -msgstr "" +msgstr "Hala niður öllum undirvenslum" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:242 @@ -5187,4 +5189,6 @@ "loaded" msgstr "" +"Undirvenslunum
{0}
hefur verið eytt á þjóninum, ekki er hægt að " +"ná í þau." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:352 @@ -5212,9 +5216,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167 msgid "Parent Relations" -msgstr "" +msgstr "Yfirvensl" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 msgid "Child Relations" -msgstr "" +msgstr "Undirvensl" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 @@ -5241,8 +5245,11 @@ "html>" msgstr "" +"Í þessum venslum eru þegar eitt eða fleiri stök sem benda á hlutinn
" +"„{0}“.

Ertu viss um að þú viljir bæta við öðru staki sem bendir á " +"þennan hlut?" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" -msgstr "" +msgstr "Mörg stök benda á sama hlutinn" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 @@ -5300,9 +5307,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873 msgid "Select primitives for selected relation members" -msgstr "" +msgstr "Bæta völdum stökum á vallistann" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 msgid "Sort the relation members" -msgstr "" +msgstr "Raða stöknum" #. putValue(NAME, tr("Sort")); @@ -5331,5 +5338,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Remove the currently selected members from this relation" -msgstr "" +msgstr "Fjarlægja völd stök úr þessum venslum" #. putValue(NAME, tr("Remove")); @@ -5426,5 +5433,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 msgid "Edit the relation the currently selected relation member refers to" -msgstr "" +msgstr "Breyta venslunum sem valið stak bendir á" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 @@ -5469,5 +5476,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63 msgid "including immediate children of parent relations" -msgstr "" +msgstr "ná einnig í fyrsta-stigs undirvensl yfirvenslanna" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93 @@ -5477,5 +5484,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 msgid "Loading parent relations" -msgstr "" +msgstr "Næ í yfirvensl" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 @@ -5490,5 +5497,5 @@ #, java-format msgid "Create new relation in layer ''{0}''" -msgstr "" +msgstr "Búa til ný vensl í laginu „{0}“" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 @@ -5600,5 +5607,5 @@ #. group "Geography" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2771 msgid "Places" msgstr "Staðir" @@ -6272,6 +6279,4 @@ #. item "Man Made/Windmill" label "Edit Windmill" #. -#. item "Man Made/Pipeline" label "Edit Pipeline" -#. #. item "Man Made/Wastewater Plant" label "Edit Wastewater Plant" #. @@ -6284,4 +6289,6 @@ #. item "Man Made/Surveillance" label "Edit Surveillance Camera" #. +#. item "Man Made/Power Station" label "Edit Power Station" +#. #. item "Amenities/Fountain" label "Edit Fountain" #. @@ -6606,57 +6613,57 @@ #: build/trans_presets.java:2250 build/trans_presets.java:2258 #: build/trans_presets.java:2290 build/trans_presets.java:2295 -#: build/trans_presets.java:2300 build/trans_presets.java:2305 -#: build/trans_presets.java:2311 build/trans_presets.java:2317 -#: build/trans_presets.java:2323 build/trans_presets.java:2331 -#: build/trans_presets.java:2337 build/trans_presets.java:2343 -#: build/trans_presets.java:2349 build/trans_presets.java:2355 -#: build/trans_presets.java:2365 build/trans_presets.java:2462 -#: build/trans_presets.java:2469 build/trans_presets.java:2483 -#: build/trans_presets.java:2489 build/trans_presets.java:2496 -#: build/trans_presets.java:2503 build/trans_presets.java:2509 -#: build/trans_presets.java:2515 build/trans_presets.java:2537 -#: build/trans_presets.java:2544 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2305 build/trans_presets.java:2310 +#: build/trans_presets.java:2316 build/trans_presets.java:2322 +#: build/trans_presets.java:2339 build/trans_presets.java:2345 +#: build/trans_presets.java:2351 build/trans_presets.java:2357 +#: build/trans_presets.java:2363 build/trans_presets.java:2373 +#: build/trans_presets.java:2380 build/trans_presets.java:2474 +#: build/trans_presets.java:2481 build/trans_presets.java:2495 +#: build/trans_presets.java:2501 build/trans_presets.java:2508 +#: build/trans_presets.java:2515 build/trans_presets.java:2521 +#: build/trans_presets.java:2527 build/trans_presets.java:2549 +#: build/trans_presets.java:2556 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2576 #: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2594 build/trans_presets.java:2601 -#: build/trans_presets.java:2608 build/trans_presets.java:2615 -#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2594 build/trans_presets.java:2600 +#: build/trans_presets.java:2606 build/trans_presets.java:2613 +#: build/trans_presets.java:2620 build/trans_presets.java:2627 #: build/trans_presets.java:2633 build/trans_presets.java:2639 -#: build/trans_presets.java:2645 build/trans_presets.java:2652 -#: build/trans_presets.java:2659 build/trans_presets.java:2666 -#: build/trans_presets.java:2672 build/trans_presets.java:2678 -#: build/trans_presets.java:2688 build/trans_presets.java:2697 -#: build/trans_presets.java:2712 build/trans_presets.java:2718 -#: build/trans_presets.java:2726 build/trans_presets.java:2733 -#: build/trans_presets.java:2753 build/trans_presets.java:2764 -#: build/trans_presets.java:2770 build/trans_presets.java:2776 +#: build/trans_presets.java:2645 build/trans_presets.java:2651 +#: build/trans_presets.java:2657 build/trans_presets.java:2664 +#: build/trans_presets.java:2671 build/trans_presets.java:2678 +#: build/trans_presets.java:2684 build/trans_presets.java:2690 +#: build/trans_presets.java:2700 build/trans_presets.java:2709 +#: build/trans_presets.java:2724 build/trans_presets.java:2730 +#: build/trans_presets.java:2738 build/trans_presets.java:2745 +#: build/trans_presets.java:2765 build/trans_presets.java:2776 #: build/trans_presets.java:2782 build/trans_presets.java:2788 -#: build/trans_presets.java:2795 build/trans_presets.java:2802 -#: build/trans_presets.java:2809 build/trans_presets.java:2815 -#: build/trans_presets.java:2821 build/trans_presets.java:2829 -#: build/trans_presets.java:2836 build/trans_presets.java:2843 -#: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2879 build/trans_presets.java:2885 +#: build/trans_presets.java:2794 build/trans_presets.java:2800 +#: build/trans_presets.java:2807 build/trans_presets.java:2814 +#: build/trans_presets.java:2821 build/trans_presets.java:2827 +#: build/trans_presets.java:2833 build/trans_presets.java:2841 +#: build/trans_presets.java:2848 build/trans_presets.java:2855 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2875 build/trans_presets.java:2882 #: build/trans_presets.java:2891 build/trans_presets.java:2897 -#: build/trans_presets.java:2903 build/trans_presets.java:2912 -#: build/trans_presets.java:2922 build/trans_presets.java:2931 -#: build/trans_presets.java:2937 build/trans_presets.java:2943 -#: build/trans_presets.java:2948 build/trans_presets.java:2954 -#: build/trans_presets.java:2960 build/trans_presets.java:2969 -#: build/trans_presets.java:2975 build/trans_presets.java:2981 +#: build/trans_presets.java:2903 build/trans_presets.java:2909 +#: build/trans_presets.java:2915 build/trans_presets.java:2924 +#: build/trans_presets.java:2934 build/trans_presets.java:2943 +#: build/trans_presets.java:2949 build/trans_presets.java:2955 +#: build/trans_presets.java:2960 build/trans_presets.java:2966 +#: build/trans_presets.java:2972 build/trans_presets.java:2981 #: build/trans_presets.java:2987 build/trans_presets.java:2993 #: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3012 build/trans_presets.java:3018 -#: build/trans_presets.java:3023 build/trans_presets.java:3030 -#: build/trans_presets.java:3037 build/trans_presets.java:3043 -#: build/trans_presets.java:3052 build/trans_presets.java:3060 -#: build/trans_presets.java:3066 build/trans_presets.java:3072 -#: build/trans_presets.java:3079 build/trans_presets.java:3085 -#: build/trans_presets.java:3092 build/trans_presets.java:3098 +#: build/trans_presets.java:3011 build/trans_presets.java:3017 +#: build/trans_presets.java:3024 build/trans_presets.java:3030 +#: build/trans_presets.java:3035 build/trans_presets.java:3042 +#: build/trans_presets.java:3049 build/trans_presets.java:3055 +#: build/trans_presets.java:3064 build/trans_presets.java:3072 +#: build/trans_presets.java:3078 build/trans_presets.java:3084 +#: build/trans_presets.java:3091 build/trans_presets.java:3097 #: build/trans_presets.java:3104 build/trans_presets.java:3110 -#: build/trans_presets.java:3116 build/trans_presets.java:3129 -#: build/trans_presets.java:3143 build/trans_presets.java:3157 +#: build/trans_presets.java:3116 build/trans_presets.java:3122 +#: build/trans_presets.java:3128 build/trans_presets.java:3141 +#: build/trans_presets.java:3155 build/trans_presets.java:3169 msgid "Name" msgstr "Heiti" @@ -6719,5 +6726,4 @@ msgstr "Loka breytingarsettum" -#. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 msgid "Close the selected open changesets" @@ -6745,25 +6751,25 @@ msgstr "Velja skráarnafn" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "Yes" msgstr "Já" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "No" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47 #, java-format msgid "Layer ''{0}'' has modifications which should be uploaded to the server." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49 #, java-format msgid "Layer ''{0}'' has no modifications to be uploaded." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60 #, java-format msgid "" @@ -6772,29 +6778,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62 #, java-format msgid "Layer ''{0}'' has no modifications to be saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80 msgid "No file associated with this layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:83 msgid "Please select a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:86 #, java-format msgid "Layer ''{0}'' is not backed by a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:101 #, java-format msgid "File ''{0}'' is not writable. Please enter another file name." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:115 #, java-format msgid "Select to upload layer ''{0}'' to the server ''{1}''" @@ -6887,5 +6893,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -msgid "Save and Exit" +#, fuzzy +msgid "Save/Upload and Exit" msgstr "Vista og hætta" @@ -6895,5 +6902,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -msgid "Save and Delete" +#, fuzzy +msgid "Save/Upload and Delete" msgstr "Vista og eyða" @@ -6910,5 +6918,5 @@ msgid "" "An upload and/or save operation of one layer with modifications
was " -"cancelled or has been failed." +"cancelled or has failed." msgstr "" @@ -6994,6 +7002,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:891 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:921 msgid "Tags of new changeset" msgstr "Tögg fyrir nýtt breytingarsett" @@ -7094,7 +7102,6 @@ "breytingunum. Ekki verður hægt að bæta frekari gögnum við það." -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:909 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:933 #, java-format msgid "Tags of changeset {0}" @@ -7102,48 +7109,48 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:949 msgid "Load the list of your open changesets from the server" msgstr "Niðurhala lista yfir opin breytingarsett frá þjóninum" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:963 msgid "Close the currently selected open changeset" msgstr "Loka breytingarsettinu sem nú er valið" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1011 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106 msgid "Preparing primitives to upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325 msgid "No images with readable timestamps found." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format @@ -7151,29 +7158,29 @@ msgstr "Les {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:402 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246 msgid "Geotagged Images" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:587 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "GPS start: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 #, java-format msgid "GPS end: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594 #, java-format msgid "current delta: {0}s" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595 msgid "timezone difference: " msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284 msgid "image" @@ -7182,14 +7189,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #, java-format msgid "{0} within the track." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680 msgid "Sync clock" msgstr "Samstilla klukkur" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7197,32 +7204,32 @@ msgstr "JPEG myndir (*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:734 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 msgid "Image" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:752 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759 msgid "GPS unit timezone (difference to photo)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:767 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771 msgid "Synchronize Time with GPS Unit" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:790 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 msgid "Time entered could not be parsed." msgstr "" @@ -7306,5 +7313,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 #, java-format msgid "Name: {0}" @@ -7327,5 +7334,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3160 +#: build/trans_presets.java:3172 msgid "Description" msgstr "Lýsing" @@ -7379,5 +7386,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:587 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 @@ -7438,42 +7445,65 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:105 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:107 #, java-format msgid "Data Layer {0}" msgstr "Gagnalag {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 msgid "outside downloaded area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:252 #, java-format msgid "version {0}" msgstr "útgáfa {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:289 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:290 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 +#, java-format +msgid "There was {0} conflict detected." +msgid_plural "There were {0} conflicts detected." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 +#, java-format +msgid "" +"{0} object has been purged from the local dataset because it is deleted on " +"the server." +msgid_plural "" +"{0} objects have been purged from the local dataset because they are deleted " +"on the server." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 +#, fuzzy +msgid "Conflicts detected" +msgstr "Árekstrar" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 #, java-format msgid "{0} consists of:" msgstr "Tölfræði um {0}:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:476 #, java-format msgid " ({0} deleted.)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 #, java-format msgid "API version: {0}" msgstr "API útgáfa: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:501 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:584 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" @@ -7819,5 +7849,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:412 #: ../plugins/terracer/src/terracer/TerracerAction.java:430 @@ -8550,5 +8580,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261 msgid "More information about this feature" msgstr "Frekari upplýsingar um þessa forstillingu" @@ -8597,5 +8627,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:700 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -8605,18 +8635,18 @@ msgstr[1] "Breyta {0} hlutum" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Ekkert er valið!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 msgid "Selection unsuitable!" msgstr "Val óhæfilegt!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 msgid "Apply Preset" msgstr "Vista forstillingu" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788 msgid "Change Properties" msgstr "Breyta eigindum" @@ -8898,44 +8928,44 @@ msgstr "Loka breytingasetti..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 msgid "Preparing..." msgstr "Undirbý..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 msgid "Uploading..." msgstr "Hleð upp gögnum..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 msgid "Waiting 10 seconds ... " msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 msgid "OK - trying again." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9165,5 +9195,5 @@ msgid "" "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}''," -"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." +"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." msgstr "" @@ -9280,6 +9310,6 @@ #, java-format msgid "" -"Relation with external id ''{0}'' refers to missing primitive with external " -"id ''{1}''." +"Relation with external id ''{0}'' refers to a missing primitive with " +"external id ''{1}''." msgstr "" @@ -9375,32 +9405,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:73 msgid "Starting to upload with one request per primitive ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})" msgstr "{0}% ({1}/{2}), {3} eftir. Hleð upp hnút ''{4}'' (id: {5})" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" msgstr "{0}% ({1}/{2}), {3} eftir. Hleð upp veg ''{4}'' (id: {5})" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" msgstr "{0}% ({1}/{2}), {3} eftir. Hleð upp venslum ''{4}'' (id: {5})" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Starting to upload in one request ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 +#, java-format +msgid "Parameter ''{0}'' must not be null" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 msgid "Uploading data ..." msgstr "Hleð upp gögnum ..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 msgid "" "WARNING: no API version defined for data to upload. Falling back to version " @@ -9408,5 +9443,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:153 #, java-format msgid "" @@ -9574,5 +9609,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173 msgid "More details" -msgstr "" +msgstr "Frekari upplýsingar" #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60 @@ -9628,5 +9663,5 @@ #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:202 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:324 build/trans_presets.java:325 @@ -9648,6 +9683,6 @@ #: build/trans_presets.java:789 build/trans_presets.java:1333 #: build/trans_presets.java:1400 build/trans_presets.java:1401 -#: build/trans_presets.java:1402 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 +#: build/trans_presets.java:1402 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 msgid "unknown" msgstr "óskilgreint" @@ -9794,5 +9829,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:192 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:182 +#, java-format +msgid "" +"The OSM server ''{0}'' doesn't know about an object
you tried to read, " +"update, or delete. Either the respective object
doesn''t exist on the " +"server or you''re using an invalid URL to access
it. Please carefully " +"check the servers address ''{1}'' for typos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:209 #, java-format msgid "" @@ -9802,5 +9846,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:262 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:279 #, java-format msgid "" @@ -10059,17 +10103,15 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35 msgid "Define Address Interpolation" msgstr "" -#. Whether to re-trigger data changed for relation #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:413 #: ../plugins/terracer/src/terracer/TerracerAction.java:437 @@ -10077,99 +10119,99 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 msgid "Alphabetic" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161 #, java-format msgid "Relation: {0}" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173 msgid "Associate with street using:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184 msgid "Numbering Scheme:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 msgid "Starting #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188 msgid "Ending #:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 #, java-format msgid "Will associate {0} additional house number nodes" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 msgid "Starting address number must be less than ending address number" msgstr "" @@ -10895,4 +10937,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52 +#: build/trans_presets.java:2331 msgid "Location" msgstr "" @@ -11432,4 +11475,5 @@ msgstr "" +#. item "Man Made/Pipeline" combo "Type" #. color highway_track #. @@ -11475,7 +11519,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:990 build/trans_style.java:1007 -#: build/trans_style.java:1023 build/trans_style.java:3400 -#: build/trans_style.java:3408 +#: build/trans_presets.java:2330 build/trans_style.java:990 +#: build/trans_style.java:1007 build/trans_style.java:1023 +#: build/trans_style.java:3400 build/trans_style.java:3408 msgid "water" msgstr "vatn" @@ -11915,5 +11959,5 @@ #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50 msgid "Open Visible..." -msgstr "" +msgstr "Opna ferla sem þekja þetta svæði..." #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:49 @@ -11954,5 +11998,5 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 msgid "create new objects" -msgstr "" +msgstr "búa til nýja hluti" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 @@ -13956,5 +14000,5 @@ #: build/trans_presets.java:57 msgid "Highways" -msgstr "" +msgstr "Vegir" #. group "Highways" @@ -13999,9 +14043,11 @@ #. item "Public Transport/Airport" text "Name" #. +#. item "Man Made/Power Station" text "Operator" #. item "Relations/Route" text "Name" #: build/trans_presets.java:65 build/trans_presets.java:101 #: build/trans_presets.java:121 build/trans_presets.java:141 #: build/trans_presets.java:178 build/trans_presets.java:198 -#: build/trans_presets.java:1560 build/trans_presets.java:3158 +#: build/trans_presets.java:1560 build/trans_presets.java:2382 +#: build/trans_presets.java:3170 msgid "Reference" msgstr "Tilvísun" @@ -14563,5 +14609,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 msgid "metal" msgstr "" @@ -14581,5 +14627,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 #: build/trans_style.java:3375 msgid "wood" @@ -14868,7 +14914,7 @@ #: build/trans_presets.java:1401 build/trans_presets.java:1402 #: build/trans_presets.java:1767 build/trans_presets.java:1777 -#: build/trans_presets.java:2408 build/trans_presets.java:2444 -#: build/trans_presets.java:2453 build/trans_presets.java:2454 -#: build/trans_presets.java:2455 build/trans_presets.java:2725 +#: build/trans_presets.java:2420 build/trans_presets.java:2456 +#: build/trans_presets.java:2465 build/trans_presets.java:2466 +#: build/trans_presets.java:2467 build/trans_presets.java:2737 msgid "yes" msgstr "já" @@ -15017,8 +15063,8 @@ #: build/trans_presets.java:1400 build/trans_presets.java:1401 #: build/trans_presets.java:1402 build/trans_presets.java:1767 -#: build/trans_presets.java:1777 build/trans_presets.java:2408 -#: build/trans_presets.java:2444 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 -#: build/trans_presets.java:2725 +#: build/trans_presets.java:1777 build/trans_presets.java:2420 +#: build/trans_presets.java:2456 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 +#: build/trans_presets.java:2737 msgid "no" msgstr "nei" @@ -15156,6 +15202,8 @@ #. item "Water/Wetland" text "Name" #. item "Car/Parking" text "Reference number" +#. item "Man Made/Pipeline" text "Operator" #. item "Man Made/Power Generator" label "Edit Power Generator" #. +#. item "Man Made/Power Tower" label "Edit Power Tower" #. item "Land use/Tree" text "Name" #. item "Land use/Wood" text "Name" @@ -15163,7 +15211,8 @@ #: build/trans_presets.java:350 build/trans_presets.java:649 #: build/trans_presets.java:789 build/trans_presets.java:1137 -#: build/trans_presets.java:1395 build/trans_presets.java:2364 -#: build/trans_presets.java:2913 build/trans_presets.java:2923 -#: build/trans_presets.java:2932 +#: build/trans_presets.java:1395 build/trans_presets.java:2330 +#: build/trans_presets.java:2372 build/trans_presets.java:2398 +#: build/trans_presets.java:2925 build/trans_presets.java:2935 +#: build/trans_presets.java:2944 msgid "Type" msgstr "Gerð" @@ -15695,5 +15744,5 @@ #: build/trans_presets.java:759 msgid "Services" -msgstr "" +msgstr "Vegþjónustur" #. item @@ -15701,5 +15750,5 @@ #: build/trans_presets.java:761 msgid "Edit Service Station" -msgstr "" +msgstr "Breyti vegþjónustu" #. item "Waypoints/Services" text "Name" @@ -15713,10 +15762,10 @@ #. item "Tourism/Information Terminal" text "Closer description" #. item "Tourism/Audioguide" text "Closer description" -#. item "Man Made/Power Station" label "Edit Power Station" -#. +#. item "Man Made/Tower" text "Height (meters)" +#. item "Man Made/Pipeline" label "Edit Pipeline" +#. +#. item "Man Made/Power Station" text "Name" #. item "Man Made/Power Sub Station" label "Edit Power Sub Station" #. -#. item "Man Made/Power Line" label "Edit Power Line" -#. #. item #. #: build/trans_presets.java:1535 build/trans_presets.java:1789 -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2465 msgid "Shelter" msgstr "Skýli" @@ -17408,5 +17459,5 @@ #: build/trans_presets.java:1567 msgid "Travel" -msgstr "" +msgstr "Ferðamennska" #. group "Travel" @@ -17627,10 +17678,10 @@ #: build/trans_presets.java:1649 msgid "Biergarten" -msgstr "" +msgstr "Bjórgarður (þ. Biergarten)" #. item #: build/trans_presets.java:1650 msgid "Edit Biergarten" -msgstr "" +msgstr "Breyti bjórgarði (þýska: Biergarten)" #: build/trans_presets.java:1655 @@ -18074,7 +18125,7 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1877 build/trans_presets.java:2669 +#: build/trans_presets.java:1877 build/trans_presets.java:2681 msgid "Sports" -msgstr "" +msgstr "Íþróttir" #. group "Sports" @@ -19212,5 +19263,5 @@ #: build/trans_presets.java:2141 msgid "Man-Made" -msgstr "" +msgstr "Mannvirki" #. group "Man-Made" @@ -19425,6 +19476,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "Religion" msgstr "" @@ -19433,66 +19484,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "bahai" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "buddhist" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "christian" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "hindu" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jain" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jewish" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "muslim" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "sikh" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "spiritualist" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "taoist" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "zoroastrian" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "Denomination" msgstr "" @@ -19501,76 +19552,76 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "anglican" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "baptist" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "catholic" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "evangelical" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "jehovahs_witness" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "lutheran" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "methodist" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "mormon" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "orthodox" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "pentecostal" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "presbyterian" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "protestant" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "quaker" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "shia" msgstr "" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "sunni" msgstr "" @@ -19666,25 +19717,49 @@ #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2296 +#, fuzzy +msgid "Tower type" +msgstr "Turn" + +#. item "Man Made/Tower" combo "Tower type" +#: build/trans_presets.java:2296 +#, fuzzy +msgid "communication" +msgstr "Hringtorg" + +#: build/trans_presets.java:2296 +#, fuzzy +msgid "observation" +msgstr "Hæð (y/s)" + +#. +#: build/trans_presets.java:2298 +#, fuzzy +msgid "Height (meters)" +msgstr "Hámarkshæð (í metrum)" + +#. item "Man Made/Tower" text "Operator" +#. +#: build/trans_presets.java:2302 msgid "Water Tower" msgstr "Vatnsturn" #. item -#: build/trans_presets.java:2298 +#: build/trans_presets.java:2303 msgid "Edit Water Tower" msgstr "Breyti vatnsturni" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2307 msgid "Gasometer" msgstr "" #. item -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2308 msgid "Edit Gasometer" msgstr "" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2307 +#: build/trans_presets.java:2312 msgid "Lighthouse" msgstr "Viti" @@ -19692,10 +19767,10 @@ #. item #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2314 msgid "Edit Lighthouse" msgstr "Breyti vita" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2318 msgid "Windmill" msgstr "Vindmylla" @@ -19703,21 +19778,53 @@ #. item #. -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2320 msgid "Edit Windmill" msgstr "Breyti vindmyllu" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2319 +#: build/trans_presets.java:2324 msgid "Pipeline" msgstr "Leiðsla" #. item -#. -#: build/trans_presets.java:2321 +#. +#: build/trans_presets.java:2327 msgid "Edit Pipeline" msgstr "Breyti leiðslu" -#. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2330 +#, fuzzy +msgid "oil" +msgstr "Salerni" + +#: build/trans_presets.java:2330 build/trans_presets.java:2372 +msgid "gas" +msgstr "" + +#: build/trans_presets.java:2330 +msgid "sewage" +msgstr "" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "heat" +msgstr "Leikhús" + +#: build/trans_presets.java:2330 +msgid "any substance" +msgstr "" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "underwater" +msgstr "vatn" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "overground" +msgstr "bakgrunnur" + +#: build/trans_presets.java:2333 msgid "Wastewater Plant" msgstr "" @@ -19727,10 +19834,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:2329 +#: build/trans_presets.java:2337 msgid "Edit Wastewater Plant" msgstr "" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2333 +#: build/trans_presets.java:2341 msgid "Crane" msgstr "Krani" @@ -19738,10 +19845,10 @@ #. item #. -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2343 msgid "Edit Crane" msgstr "Breyti krana" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2347 msgid "Beacon" msgstr "" @@ -19749,10 +19856,10 @@ #. item #. -#: build/trans_presets.java:2341 +#: build/trans_presets.java:2349 msgid "Edit Beacon" msgstr "" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2353 msgid "Survey Point" msgstr "" @@ -19760,10 +19867,10 @@ #. item #. -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2355 msgid "Edit Survey Point" msgstr "" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2359 msgid "Surveillance" msgstr "Eftirlitsmyndavél" @@ -19771,5 +19878,5 @@ #. item #. -#: build/trans_presets.java:2353 +#: build/trans_presets.java:2361 msgid "Edit Surveillance Camera" msgstr "Breyti eftirlitsmyndavél" @@ -19777,5 +19884,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2366 msgid "Power Generator" msgstr "Rafall" @@ -19785,39 +19892,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:2362 +#: build/trans_presets.java:2370 msgid "Edit Power Generator" msgstr "Breyti rafli" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "wind" msgstr "" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "hydro" msgstr "" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "fossil" msgstr "" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "nuclear" msgstr "" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "coal" msgstr "" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "photovoltaic" msgstr "" -#: build/trans_presets.java:2364 -msgid "gas" -msgstr "" - #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2375 msgid "Power Station" msgstr "Orkuver" @@ -19826,10 +19929,10 @@ #. -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2378 msgid "Edit Power Station" msgstr "Breyti orkuveri" -#. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2374 +#. item "Man Made/Power Station" text "Reference" +#: build/trans_presets.java:2384 msgid "Power Sub Station" msgstr "Spennustöð" @@ -19838,5 +19941,5 @@ #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2387 msgid "Edit Power Sub Station" msgstr "Breyti spennustöð" @@ -19844,10 +19947,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2380 build/trans_presets.java:2396 +#: build/trans_presets.java:2390 build/trans_presets.java:2407 msgid "Line reference" msgstr "Tilvísunarnúmer línunnar" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2382 +#: build/trans_presets.java:2392 msgid "Power Tower" msgstr "Háspennustaur" @@ -19858,11 +19961,26 @@ #. 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:2387 +#: build/trans_presets.java:2397 msgid "Edit Power Tower" msgstr "Breyti háspennustaur" -#. item "Man Made/Power Tower" label "Edit Power Tower" -#. -#: build/trans_presets.java:2390 +#. item "Man Made/Power Tower" combo "Type" +#: build/trans_presets.java:2398 +#, fuzzy +msgid "tower" +msgstr "Turn" + +#: build/trans_presets.java:2398 +#, fuzzy +msgid "pole" +msgstr "Hlutverk" + +#: build/trans_presets.java:2399 +#, fuzzy +msgid "Tower reference" +msgstr "Tilvísunarnúmer línunnar" + +#. item "Man Made/Power Tower" text "Tower reference" +#: build/trans_presets.java:2401 msgid "Power Line" msgstr "Raflína" @@ -19871,40 +19989,82 @@ #. -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2404 msgid "Edit Power Line" msgstr "Breyti raflínu" +#. item "Man Made/Power Line" label "Edit Power Line" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "Line type" +msgstr "gerð" + +#. item "Man Made/Power Line" combo "Line type" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "line" +msgstr "tengd" + +#: build/trans_presets.java:2405 +#, fuzzy +msgid "minor_line" +msgstr "tengibraut á hraðbraut" + #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2408 msgid "Voltage" msgstr "Volt" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2398 -msgid "Amount of Wires" +#: build/trans_presets.java:2409 +#, fuzzy +msgid "Amount of Cables" msgstr "Fjöldi víra" -#. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2401 +#. item "Man Made/Power Line" text "Amount of Cables" +#: build/trans_presets.java:2410 +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:2410 +#, fuzzy +msgid "single" +msgstr "Horn" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "double" +msgstr "Hlutverk" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "triple" +msgstr "Skrá" + +#: build/trans_presets.java:2410 +msgid "quad" +msgstr "" + +#: build/trans_presets.java:2413 msgid "Amenities" msgstr "" #. group "Amenities" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2414 msgid "Toilets" msgstr "Salerni" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2409 build/trans_presets.java:2525 +#: build/trans_presets.java:2421 build/trans_presets.java:2537 msgid "Note" msgstr "Athugasemd" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2411 +#: build/trans_presets.java:2423 msgid "Post Box" msgstr "Póstkassi" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2428 msgid "Telephone" msgstr "Almenningssími" @@ -19913,5 +20073,5 @@ #. -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2431 msgid "Edit Telephone" msgstr "Breyti almenningssíma" @@ -19919,5 +20079,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2422 build/trans_presets.java:2526 +#: build/trans_presets.java:2434 build/trans_presets.java:2538 msgid "Coins" msgstr "Mynt" @@ -19925,5 +20085,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2423 build/trans_presets.java:2527 +#: build/trans_presets.java:2435 build/trans_presets.java:2539 msgid "Notes" msgstr "Athugasemd" @@ -19931,5 +20091,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2424 build/trans_presets.java:2528 +#: build/trans_presets.java:2436 build/trans_presets.java:2540 msgid "Electronic purses and Charge cards" msgstr "" @@ -19937,5 +20097,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2425 build/trans_presets.java:2529 +#: build/trans_presets.java:2437 build/trans_presets.java:2541 msgid "Debit cards" msgstr "Debetkort" @@ -19943,15 +20103,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2426 build/trans_presets.java:2530 +#: build/trans_presets.java:2438 build/trans_presets.java:2542 msgid "Credit cards" msgstr "Kreditkort" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2439 msgid "Telephone cards" msgstr "Símakort" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2429 +#: build/trans_presets.java:2441 msgid "Recycling" msgstr "Endurvinnsla" @@ -19960,5 +20120,5 @@ #. -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2444 msgid "Edit Recycling station" msgstr "Breyti endurvinnslustöð" @@ -19966,35 +20126,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2446 msgid "Batteries" msgstr "Rafhlöður" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2435 +#: build/trans_presets.java:2447 msgid "Cans" msgstr "Dósir" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2448 msgid "Clothes" msgstr "Föt" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2437 +#: build/trans_presets.java:2449 msgid "Glass" msgstr "Gler" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2450 msgid "Paper" msgstr "Pappír" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2451 msgid "Scrap Metal" msgstr "Brotajárn" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2453 msgid "Bench" msgstr "Bekkur" @@ -20003,31 +20163,31 @@ #. #. -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2456 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "stone" msgstr "" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "plastic" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "black" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "brown" msgstr "" @@ -20098,5 +20258,5 @@ #. #. -#: build/trans_presets.java:2446 build/trans_style.java:3063 +#: build/trans_presets.java:2458 build/trans_style.java:3063 #: build/trans_style.java:3071 build/trans_style.java:3079 #: build/trans_style.java:3087 build/trans_style.java:3135 @@ -20106,27 +20266,27 @@ msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "red" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "blue" msgstr "" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "white" msgstr "" -#: build/trans_presets.java:2447 +#: build/trans_presets.java:2459 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2461 msgid "Hunting Stand" msgstr "" #. item -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2462 msgid "Edit Hunting Stand" msgstr "" @@ -20135,30 +20295,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2452 build/trans_presets.java:2914 +#: build/trans_presets.java:2464 build/trans_presets.java:2926 msgid "Height" msgstr "Hæð" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "low" msgstr "" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "half" msgstr "" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "full" msgstr "" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2466 msgid "Hide" msgstr "" -#: build/trans_presets.java:2455 +#: build/trans_presets.java:2467 msgid "Lock" msgstr "" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2469 msgid "Fountain" msgstr "Gosbrunnur" @@ -20167,10 +20327,10 @@ #. -#: build/trans_presets.java:2460 +#: build/trans_presets.java:2472 msgid "Edit Fountain" msgstr "Breyti gosbrunn" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2476 msgid "Drinking Water" msgstr "Drykkjarvatn" @@ -20179,10 +20339,10 @@ #. -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2479 msgid "Edit Drinking Water" msgstr "Breyti drykkjarvatni" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2471 +#: build/trans_presets.java:2483 msgid "Baby Hatch" msgstr "Barnalúga" @@ -20190,33 +20350,33 @@ #. item #. -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2485 msgid "Edit Baby Hatch" msgstr "Breyti barnalúgu" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2491 msgid "Shops" msgstr "Verslanir" #. group "Shops" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2492 msgid "Supermarket" msgstr "" #. item -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2493 msgid "Edit Supermarket" msgstr "" -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2498 msgid "Chemist" msgstr "" #. item -#: build/trans_presets.java:2487 +#: build/trans_presets.java:2499 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2504 msgid "Convenience Store" msgstr "" @@ -20224,9 +20384,9 @@ #. item #. -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2506 msgid "Edit Convenience Store" msgstr "" -#: build/trans_presets.java:2499 +#: build/trans_presets.java:2511 msgid "Kiosk" msgstr "Sjoppa" @@ -20234,27 +20394,27 @@ #. item #. -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2513 msgid "Edit Kiosk" msgstr "Breyti sjoppu" -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2518 msgid "Book Store" msgstr "" #. item -#: build/trans_presets.java:2507 +#: build/trans_presets.java:2519 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2524 msgid "Travel Agency" -msgstr "" - -#. item -#: build/trans_presets.java:2513 +msgstr "Ferðaskrifstofa" + +#. item +#: build/trans_presets.java:2525 msgid "Edit Travel Agency" -msgstr "" - -#: build/trans_presets.java:2518 +msgstr "Breyti ferðaskrifstofu" + +#: build/trans_presets.java:2530 msgid "Vending machine" msgstr "Sjálfsali" @@ -20262,5 +20422,5 @@ #. item #. -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2532 msgid "Edit Vending machine" msgstr "" @@ -20268,88 +20428,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "Vending products" msgstr "" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_tickets" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "parking_tickets" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "food" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "drinks" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "sweets" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "cigarettes" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "photos" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "animal_food" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "news_papers" msgstr "dagblöð" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "toys" msgstr "dót" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "stamps" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "SIM-cards" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "telephone_vouchers" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "condoms" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "tampons" msgstr "" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "excrement_bags" msgstr "" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2543 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2545 msgid "Butcher" msgstr "Slátrari" @@ -20357,9 +20517,9 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2547 msgid "Edit Butcher" msgstr "Breyti slátrara" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2552 msgid "Baker" msgstr "Bakarí" @@ -20367,9 +20527,9 @@ #. item #. -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2554 msgid "Edit Baker" msgstr "Breyti bakaríi" -#: build/trans_presets.java:2547 +#: build/trans_presets.java:2559 msgid "Florist" msgstr "Blómabúð" @@ -20377,18 +20537,18 @@ #. item #. -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2561 msgid "Edit Florist" msgstr "Breyti blómabúð" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2566 msgid "Organic" msgstr "Lífræn búð" #. item -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2567 msgid "Edit Organic Shop" msgstr "Breyti lífrænni búð" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2572 msgid "Alcohol" msgstr "" @@ -20396,54 +20556,54 @@ #. item #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2574 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2579 msgid "Beverages" msgstr "Vínbúð" #. item -#: build/trans_presets.java:2568 +#: build/trans_presets.java:2580 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2573 +#: build/trans_presets.java:2585 msgid "Computer" msgstr "Tölvubúð" #. item -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2586 msgid "Edit Computer Shop" msgstr "Breyti tölvubúð" -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2591 msgid "Electronics" msgstr "Raftækjabúð" #. item -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2592 msgid "Edit Electronics Shop" msgstr "Breyti raftækjabúð" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2597 msgid "Hifi" msgstr "Hljómtækjaverslun" #. item -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2598 msgid "Edit Hifi Shop" msgstr "Breyti hljómtækjaverslun" -#: build/trans_presets.java:2591 +#: build/trans_presets.java:2603 msgid "Furniture" msgstr "Húsgagnaverslun" #. item -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2604 msgid "Edit Furniture Shop" msgstr "Breyti húsgagnaverslun" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2609 msgid "Garden Centre" msgstr "" @@ -20451,9 +20611,9 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2611 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2616 msgid "Hardware" msgstr "" @@ -20461,9 +20621,9 @@ #. item #. -#: build/trans_presets.java:2606 +#: build/trans_presets.java:2618 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2623 msgid "Do-it-yourself-store" msgstr "" @@ -20471,54 +20631,54 @@ #. item #. -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2625 msgid "Edit Do-it-yourself-store" msgstr "" -#: build/trans_presets.java:2618 +#: build/trans_presets.java:2630 msgid "Stationery" msgstr "Skrifstofuvörur" #. item -#: build/trans_presets.java:2619 +#: build/trans_presets.java:2631 msgid "Edit Stationery Shop" msgstr "Breyti skrifstofuvörum" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2636 msgid "Hairdresser" msgstr "Hársnyrtir" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2637 msgid "Edit Hairdresser" msgstr "Breyti hársnyrti" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2642 msgid "Shoes" msgstr "Skóbúð" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2643 msgid "Edit Shoe Shop" msgstr "Breyti skóbúð" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2648 msgid "Toys" msgstr "Dótabúð" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2649 msgid "Edit Toy Shop" msgstr "Breyti dótabúð" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2654 msgid "Video" msgstr "" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2655 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2660 msgid "Dry Cleaning" msgstr "Efnalaug" @@ -20526,9 +20686,9 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2662 msgid "Edit Dry Cleaning" msgstr "Breyti efnalaug" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2667 msgid "Laundry" msgstr "Þvottahús" @@ -20536,9 +20696,9 @@ #. item #. -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2669 msgid "Edit Laundry" msgstr "Breyti þvottahúsi" -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2674 msgid "Outdoor" msgstr "Útivistarbúð" @@ -20546,28 +20706,28 @@ #. item #. -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2676 msgid "Edit Outdoor Shop" msgstr "Breyti útivistarbúð" #. item -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2682 msgid "Edit Sports Shop" msgstr "" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2687 msgid "Optician" msgstr "" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2688 msgid "Edit Optician" msgstr "Breyti sjóntækjasmið" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2695 msgid "Cash" msgstr "Fjármál" #. group "Cash" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2696 msgid "Bank" msgstr "Banki" @@ -20575,14 +20735,14 @@ #. item #. -#: build/trans_presets.java:2686 +#: build/trans_presets.java:2698 msgid "Edit Bank" msgstr "Breyti banka" -#: build/trans_presets.java:2691 build/trans_presets.java:2700 +#: build/trans_presets.java:2703 build/trans_presets.java:2712 msgid "Automated Teller Machine" msgstr "Hraðbanki" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2705 msgid "Money Exchange" msgstr "Gjaldeyrisskipti" @@ -20590,5 +20750,5 @@ #. item #. -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2707 msgid "Edit Money Exchange" msgstr "Breyti gjaldeyrisskiptum" @@ -20596,15 +20756,15 @@ #. item #. -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2714 msgid "Edit Automated Teller Machine" msgstr "Breyti hraðbanka" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2719 msgid "Health" msgstr "Heilsa" #. group "Health" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2720 msgid "Doctors" msgstr "Læknir" @@ -20612,18 +20772,18 @@ #. item #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2722 msgid "Edit Doctors" msgstr "Breyti lækni" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2727 msgid "Dentist" msgstr "Tannlæknir" #. item -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2728 msgid "Edit Dentist" msgstr "Breyti tannlækni" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2733 msgid "Pharmacy" msgstr "Apótek" @@ -20631,5 +20791,5 @@ #. item #. -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2735 msgid "Edit Pharmacy" msgstr "Apótek" @@ -20637,9 +20797,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2737 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2741 msgid "Hospital" msgstr "Spítali" @@ -20647,10 +20807,10 @@ #. item #. -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2743 msgid "Edit Hospital" msgstr "Breyti spítala" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2747 msgid "Emergency Access Point" msgstr "" @@ -20659,5 +20819,5 @@ #. -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2750 msgid "Edit Emergency Access Point" msgstr "" @@ -20666,20 +20826,20 @@ #. #. -#: build/trans_presets.java:2741 +#: build/trans_presets.java:2753 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2742 +#: build/trans_presets.java:2754 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2756 msgid "Phone Number" msgstr "" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2757 msgid "(Use international code, like +12-345-67890)" msgstr "" @@ -20687,5 +20847,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2760 msgid "Veterinary" msgstr "Dýralæknir" @@ -20694,59 +20854,59 @@ #. -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2763 msgid "Edit Veterinary" msgstr "Breyti dýralækni" -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2770 msgid "Geography" -msgstr "" +msgstr "Landafræði" #. group "Places" -#: build/trans_presets.java:2760 +#: build/trans_presets.java:2772 msgid "Continent" msgstr "Heimsálfa" #. item -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2773 msgid "Edit Continent" msgstr "Breyti heimsálfu" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2766 +#: build/trans_presets.java:2778 msgid "Country" msgstr "Land" #. item -#: build/trans_presets.java:2767 +#: build/trans_presets.java:2779 msgid "Edit Country" msgstr "Breyti landi" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2784 msgid "State" msgstr "Fylki" #. item -#: build/trans_presets.java:2773 +#: build/trans_presets.java:2785 msgid "Edit State" msgstr "Breyti fylki" #. item "Places/State" text "Name" -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2790 msgid "Region" msgstr "Svæði" #. item -#: build/trans_presets.java:2779 +#: build/trans_presets.java:2791 msgid "Edit Region" msgstr "Breyti svæði" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2796 msgid "County" msgstr "Sýsla" #. item -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2797 msgid "Edit County" msgstr "Breyti sýslu" @@ -20754,15 +20914,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2803 msgid "City" msgstr "Borg" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2804 msgid "Edit City" msgstr "Breyti borg" #. item "Places/City" text "Name" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2809 msgid "Town" msgstr "Bær" @@ -20770,10 +20930,10 @@ #. item #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2811 msgid "Edit Town" msgstr "Breyti bæ" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2804 +#: build/trans_presets.java:2816 msgid "Suburb" msgstr "Hverfi" @@ -20781,25 +20941,25 @@ #. item #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2818 msgid "Edit Suburb" msgstr "Breyti hverfi" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2823 msgid "Village" msgstr "Þorp" #. item -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2824 msgid "Edit Village" msgstr "Breyti þorpi" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2817 +#: build/trans_presets.java:2829 msgid "Hamlet" msgstr "Smáþorp" #. item -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2830 msgid "Edit Hamlet" msgstr "Breyti smáþorpi" @@ -20807,5 +20967,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2824 +#: build/trans_presets.java:2836 msgid "Locality" msgstr "" @@ -20813,10 +20973,10 @@ #. item #. -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2838 msgid "Edit Locality" msgstr "" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2843 msgid "Island" msgstr "Eyja" @@ -20824,10 +20984,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2845 msgid "Edit Island" msgstr "Breyti eyju" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2838 +#: build/trans_presets.java:2850 msgid "Islet" msgstr "" @@ -20835,5 +20995,5 @@ #. item #. -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2852 msgid "Edit Islet" msgstr "" @@ -20841,5 +21001,5 @@ #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2858 msgid "Cave Entrance" msgstr "Hellismunni" @@ -20847,10 +21007,10 @@ #. item #. -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2860 msgid "Edit Cave Entrance" msgstr "Breyti hellismunna" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2864 msgid "Peak" msgstr "Tindur" @@ -20858,10 +21018,10 @@ #. item #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2866 msgid "Edit Peak" msgstr "Breyti tind" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2871 msgid "Glacier" msgstr "Jökull" @@ -20869,10 +21029,10 @@ #. item #. -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2873 msgid "Edit Glacier" msgstr "Breyti jökli" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2878 msgid "Volcano" msgstr "Eldfjall" @@ -20880,70 +21040,70 @@ #. item #. -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2880 msgid "Edit Volcano" msgstr "Breyti eldfjalli" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2886 msgid "Boundaries" msgstr "Landamæri" #. group "Boundaries" -#: build/trans_presets.java:2875 +#: build/trans_presets.java:2887 msgid "National" msgstr "" #. item -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2888 msgid "Edit National Boundary" msgstr "" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2881 +#: build/trans_presets.java:2893 msgid "Administrative" msgstr "" #. item -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2894 msgid "Edit Administrative Boundary" msgstr "" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2887 +#: build/trans_presets.java:2899 msgid "Civil" msgstr "" #. item -#: build/trans_presets.java:2888 +#: build/trans_presets.java:2900 msgid "Edit Civil Boundary" msgstr "" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2893 +#: build/trans_presets.java:2905 msgid "Political" msgstr "" #. item -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2906 msgid "Edit Political Boundary" msgstr "" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2911 msgid "National park" msgstr "" #. item -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2912 msgid "Edit National Park Boundary" msgstr "Breyti landamærum þjóðgarðs" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2918 msgid "Land use" msgstr "Landnýting" #. group "Land use" -#: build/trans_presets.java:2907 +#: build/trans_presets.java:2919 msgid "Tree" msgstr "Tré" @@ -20952,15 +21112,15 @@ #. -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2922 msgid "Edit Tree" msgstr "Breyti tré" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2915 +#: build/trans_presets.java:2927 msgid "Botanical Name" msgstr "Fræðiheiti" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2929 msgid "Wood" msgstr "Skógur" @@ -20969,5 +21129,5 @@ #. -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2932 msgid "Edit Wood" msgstr "Breyti skóg" @@ -20975,17 +21135,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "coniferous" msgstr "barrskógur" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "deciduous" msgstr "laufskógur" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "mixed" msgstr "blandaður" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2937 msgid "Forest" msgstr "Skógur (ræktaður)" @@ -20994,14 +21154,14 @@ #. -#: build/trans_presets.java:2928 +#: build/trans_presets.java:2940 msgid "Edit Forest Landuse" msgstr "Breyti ræktuðum skóg" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2946 msgid "Nature Reserve" msgstr "" #. item -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2947 msgid "Edit Nature Reserve" msgstr "" @@ -21009,25 +21169,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2952 msgid "Scree" msgstr "" #. item -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2953 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2957 msgid "Scrub" msgstr "" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:2958 msgid "Edit Scrub" msgstr "" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2962 msgid "Fell" msgstr "" @@ -21035,10 +21195,10 @@ #. item #. -#: build/trans_presets.java:2952 +#: build/trans_presets.java:2964 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2968 msgid "Heath" msgstr "" @@ -21046,5 +21206,5 @@ #. item #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2970 msgid "Edit Heath" msgstr "" @@ -21052,5 +21212,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2975 msgid "Farmyard" msgstr "" @@ -21059,45 +21219,45 @@ #. -#: build/trans_presets.java:2966 +#: build/trans_presets.java:2978 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2983 msgid "Farmland" msgstr "" #. item -#: build/trans_presets.java:2972 +#: build/trans_presets.java:2984 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2977 +#: build/trans_presets.java:2989 msgid "Meadow" msgstr "" #. item -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2990 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:2995 msgid "Vineyard" msgstr "" #. item -#: build/trans_presets.java:2984 +#: build/trans_presets.java:2996 msgid "Edit Vineyard Landuse" msgstr "" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3001 msgid "Allotments" msgstr "" #. item -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3002 msgid "Edit Allotments Landuse" msgstr "" @@ -21105,25 +21265,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3008 msgid "Garden" msgstr "Garður" #. item -#: build/trans_presets.java:2997 +#: build/trans_presets.java:3009 msgid "Edit Garden" msgstr "Breyti garði" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3013 msgid "Grass" msgstr "" #. item -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3014 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3019 msgid "Village Green" msgstr "" @@ -21131,10 +21291,10 @@ #. item #. -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3021 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3026 msgid "Common" msgstr "" @@ -21142,20 +21302,20 @@ #. item #. -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3028 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3032 msgid "Park" msgstr "Almenningsgarður" #. item -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3033 msgid "Edit Park" msgstr "Breyti almenningsgarð" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3037 msgid "Recreation Ground" msgstr "" @@ -21163,5 +21323,5 @@ #. item #. -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3039 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -21169,15 +21329,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3033 +#: build/trans_presets.java:3045 msgid "Residential area" msgstr "Íbúðarsvæði" #. item -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3046 msgid "Edit Residential Landuse" msgstr "Breyti íbúðarlandnýtingu" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3051 msgid "Graveyard" msgstr "Grafreitur" @@ -21185,9 +21345,9 @@ #. item #. -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3053 msgid "Edit Graveyard" msgstr "Breyti grafreit" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3059 msgid "Cemetery" msgstr "" @@ -21195,39 +21355,39 @@ #. item #. -#: build/trans_presets.java:3049 +#: build/trans_presets.java:3061 msgid "Edit Cemetery Landuse" msgstr "Breyti kirkjugarðslandnýtingu" -#: build/trans_presets.java:3056 +#: build/trans_presets.java:3068 msgid "Retail" msgstr "Smásala" #. item -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3069 msgid "Edit Retail Landuse" msgstr "Breyti smásölulandnýtingu" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3062 +#: build/trans_presets.java:3074 msgid "Commercial" msgstr "Skrifstofur" #. item -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3075 msgid "Edit Commercial Landuse" msgstr "Breyti skrifstofulandnýtingu" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3068 +#: build/trans_presets.java:3080 msgid "Industrial" msgstr "Iðnaður" #. item -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3081 msgid "Edit Industrial Landuse" msgstr "Breyti iðnaðarlandnýtingu" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3086 msgid "Railway land" msgstr "" @@ -21235,15 +21395,15 @@ #. item #. -#: build/trans_presets.java:3076 +#: build/trans_presets.java:3088 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3081 +#: build/trans_presets.java:3093 msgid "Military" msgstr "" #. item -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3094 msgid "Edit Military Landuse" msgstr "" @@ -21251,57 +21411,57 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3100 msgid "Construction area" msgstr "Byggingarsvæði" #. item -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3101 msgid "Edit Construction Landuse" msgstr "Breyti byggingarsvæðislandnýtingu" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3094 +#: build/trans_presets.java:3106 msgid "Brownfield" msgstr "" #. item -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3107 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3100 +#: build/trans_presets.java:3112 msgid "Greenfield" msgstr "" #. item -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3113 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3118 msgid "Landfill" msgstr "" #. item -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3119 msgid "Edit Landfill Landuse" msgstr "" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3124 msgid "Quarry" msgstr "" #. item -#: build/trans_presets.java:3113 +#: build/trans_presets.java:3125 msgid "Edit Quarry Landuse" msgstr "" #. group "Relations" -#: build/trans_presets.java:3122 +#: build/trans_presets.java:3134 msgid "Multipolygon" -msgstr "" +msgstr "Marghyrningur" #. item @@ -21309,17 +21469,17 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3126 +#: build/trans_presets.java:3138 msgid "Edit Multipolygon" -msgstr "" +msgstr "Breyta marghyrningi" #. item "Relations/Multipolygon" text "Name" #. #. -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3144 msgid "outer segment" msgstr "" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3145 msgid "inner segment" msgstr "" @@ -21327,47 +21487,47 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3148 msgid "Turn restriction" -msgstr "" +msgstr "Beygjutakmörkun" #. item #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3151 msgid "Edit Turn Restriction" -msgstr "" +msgstr "Breyti beygjutakmörkun" #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_left_turn" -msgstr "" - -#: build/trans_presets.java:3141 +msgstr "vinstri beygjur óleyfilegar" + +#: build/trans_presets.java:3153 msgid "no_right_turn" -msgstr "" - -#: build/trans_presets.java:3141 +msgstr "hægri beygjur óleyfilegar" + +#: build/trans_presets.java:3153 msgid "no_straight_on" -msgstr "" - -#: build/trans_presets.java:3141 +msgstr "óleyfilegt að halda beint áfrám" + +#: build/trans_presets.java:3153 msgid "no_u_turn" -msgstr "" - -#: build/trans_presets.java:3141 +msgstr "óleyfilegt að taka U-beygju" + +#: build/trans_presets.java:3153 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_straight_on" msgstr "aðeins_beint_fram" @@ -21376,15 +21536,15 @@ #. #. -#: build/trans_presets.java:3146 +#: build/trans_presets.java:3158 msgid "from way" msgstr "af vegi" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3159 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:3148 +#: build/trans_presets.java:3160 msgid "to way" msgstr "að vegi" @@ -21392,5 +21552,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3151 +#: build/trans_presets.java:3163 msgid "Route" msgstr "" @@ -21399,5 +21559,5 @@ #. -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3166 msgid "Edit Route" msgstr "" @@ -21405,5 +21565,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "Route type" msgstr "" @@ -21475,5 +21635,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:233 +#: build/trans_presets.java:3168 build/trans_style.java:233 #: build/trans_style.java:683 build/trans_style.java:906 #: build/trans_style.java:914 build/trans_style.java:922 @@ -21482,17 +21642,17 @@ msgstr "hjól" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "bus" msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "road" msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ferry" msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ski" msgstr "" @@ -21545,5 +21705,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:247 +#: build/trans_presets.java:3168 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -21552,13 +21712,13 @@ msgstr "fótgangandi" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "hiking" msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "tram" msgstr "" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "detour" msgstr "" @@ -21572,10 +21732,10 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:1206 +#: build/trans_presets.java:3168 build/trans_style.java:1206 msgid "subway" msgstr "" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3159 +#: build/trans_presets.java:3171 msgid "Symbol description" msgstr "" @@ -21583,31 +21743,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3174 msgid "Network" msgstr "" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "proposed" msgstr "" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "alternate" msgstr "" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "temporary" msgstr "" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "connection" msgstr "" -#: build/trans_presets.java:3165 +#: build/trans_presets.java:3177 msgid "Color (hex)" msgstr "" @@ -21616,30 +21776,30 @@ #. #. -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3180 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3181 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3170 +#: build/trans_presets.java:3182 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3183 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3172 +#: build/trans_presets.java:3184 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3173 +#: build/trans_presets.java:3185 msgid "backward halt point" msgstr "" @@ -22546,5 +22706,5 @@ #: build/trans_style.java:839 msgid "services" -msgstr "" +msgstr "vegþjónustur" #. color services @@ -25777,4 +25937,17 @@ msgstr "" +#~ msgid "Combine ways with different memberships?" +#~ msgstr "Sameina vegi sem eru stak í mismunandi venslum?" + +#~ msgid "Combine Anyway" +#~ msgstr "Sameina þá" + +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "" +#~ "Valdir vegir eru stak í mismundandi venslum. Viltu sameina þá þrátt fyrir " +#~ "það?" + #~ msgid "Aborting..." #~ msgstr "Hætti við..." @@ -25921,7 +26094,4 @@ #~ msgstr "Stök: {0} (tengd: {1})" -#~ msgid "linked" -#~ msgstr "tengd" - #~ msgid "" #~ "No data to update found. Have you already opened or downloaded a data " Index: /applications/editors/josm/i18n/po/it.po =================================================================== --- /applications/editors/josm/i18n/po/it.po (revision 17821) +++ /applications/editors/josm/i18n/po/it.po (revision 17822) @@ -5,7 +5,7 @@ "Project-Id-Version: josm 20081003\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-22 17:52+0200\n" -"PO-Revision-Date: 2009-09-22 15:14+0000\n" -"Last-Translator: FabC \n" +"POT-Creation-Date: 2009-09-28 16:38+0200\n" +"PO-Revision-Date: 2009-09-24 13:52+0000\n" +"Last-Translator: Davide Prade \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: 2009-09-22 15:46+0000\n" +"X-Launchpad-Export-Date: 2009-09-28 14:32+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -64,8 +64,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250 @@ -88,9 +88,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -123,6 +123,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -139,7 +139,7 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:172 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 @@ -152,5 +152,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 @@ -334,6 +333,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -343,6 +341,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 @@ -352,5 +350,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -361,5 +359,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180 @@ -368,5 +366,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -460,9 +458,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -494,10 +492,9 @@ msgstr "Selezionare almeno quattro nodi." -#. FIXME: not sure whether this fits in a dialog #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:85 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -592,10 +589,10 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32 msgid "Close open changesets" -msgstr "" +msgstr "Chiudi i gruppi di modifiche aperti" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 msgid "Closes open changesets" -msgstr "" +msgstr "Chiude i gruppi di modifiche aperti" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -607,5 +604,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 #, java-format msgid "File: {0}" @@ -615,50 +612,34 @@ #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" -msgstr "" +msgstr "Non ci sono gruppi di modifiche aperti" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" -msgstr "" +msgstr "Nessun gruppo di modifiche aperto" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 +msgstr "Scaricamento dei gruppi di modifiche aperti ..." + #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine Way" msgstr "Unisci percorso" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 msgid "Combine several ways into one." msgstr "Unisce diversi percorsi in uno." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 -msgid "Combine ways with different memberships?" -msgstr "Unire i percorsi con diverse appartenenze?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -msgid "Combine Anyway" -msgstr "Unisci comunque" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" -"I percorsi selezionati appartengono a relazioni differenti. Vuoi comunque " -"unirli?" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 msgid "Change directions?" msgstr "Inverti direzione?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Reverse and Combine" msgstr "Inverti direzione e unisci" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -668,18 +649,18 @@ "la direzione di qualcuno?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 msgid "" "Could not combine ways (They could not be merged into a single string of " "nodes)" msgstr "" -"Impossibile unire le way (non possono essere fuse in una singola stringa di " -"nodi)" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +"Impossibile unire i percorsi (non possono essere fuse in una singola stringa " +"di nodi)" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 #, java-format msgid "Combine {0} ways" msgstr "Unisci {0} percorsi" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 msgid "Please select at least two ways to combine." msgstr "Selezionare almeno due percorsi da unire." @@ -726,6 +707,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -790,5 +770,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -821,5 +801,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307 #, java-format msgid "There were {0} conflicts during import." @@ -837,5 +816,4 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Duplicate" @@ -866,10 +844,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:209 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "Esporta in GPX..." #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:208 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "Esporta i dati in un file GPX." @@ -880,8 +858,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -946,5 +924,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 @@ -987,6 +965,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1079,22 +1056,22 @@ msgstr "Unisci il livello corrente con un altro livello" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge Nodes" msgstr "Fondi nodi" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 msgid "Merge nodes into the oldest one." msgstr "Unisci i nuovi nodi in quello più vecchio." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 msgid "Please select at least two nodes to merge." msgstr "Seleziona almeno due nodi da unire." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "Impossibile unire i nodi. Cancellare un percorso attualmente usato." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 #, java-format msgid "Merge {0} nodes" @@ -1166,5 +1143,4 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350 msgid "New" msgstr "Nuovo" @@ -1345,10 +1321,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "Salva" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "Salva i dati attuali." @@ -1405,10 +1381,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "Salva come..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "Salva i dati correnti su un nuovo file." @@ -1453,5 +1429,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:961 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888 @@ -1706,14 +1682,14 @@ msgstr "Selezione vuota" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 msgid "Upload to OSM..." msgstr "Carica su OSM..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload all changes to the OSM server." msgstr "Carica tutti i cambiamenti sul server OSM." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 #, java-format msgid "" @@ -1722,23 +1698,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "Niente da caricare. Prima è necessario ottenere dei dati." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:171 msgid "No changes to upload." msgstr "Nessun cambiamento da caricare." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223 #, java-format msgid "Synchronize {0} {1} only" msgstr "Sincronizza solamente {0} {1}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 msgid "Synchronize entire dataset" msgstr "Sincronizza l'intero dataset" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:228 #, java-format msgid "" @@ -1761,17 +1737,17 @@ "
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:283 msgid "Conflict detected" msgstr "Rilevato un conflitto" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:257 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 #, java-format msgid "Unexpected return value. Got {0}." msgstr "Valore di ritorno inatteso. Ottenuto {0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:272 #, java-format msgid "" @@ -1787,5 +1763,5 @@ "continuare ad apportare delle modifiche.
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:306 #, java-format msgid "" @@ -1794,39 +1770,46 @@ "again with a new or an existing open changeset." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310 +"Caricamento fallito a causa dell''utilizzo
del " +"gruppo di modifiche {0} che era già stato chiuso a {1}.
Caricare " +"nuovamente con un gruppo di modifiche nuovo o esistente aperto." + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 msgid "Changeset closed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +msgstr "Gruppo di modifiche chiuso" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "" -"Attenzione: l'intestazione dell' errore {0} non coincideva con il pattern " +"Attenzione: l'intestazione dell'errore {0} non coincideva con lo schema " "atteso \"{1}\"" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "" -"L'header dell'errore \"{0}\" non corrisponde allo schema atteso \"{1}\"" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:425 #, java-format msgid "Uploading failed.
{0}" msgstr "Upload fallito.
{0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:434 msgid "Upload to OSM API failed" msgstr "Invio alle API di OSM fallito" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457 msgid "Updating primitive" msgstr "Aggiornamento della primitiva" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:514 #, java-format msgid "Uploading data for layer ''{0}''" msgstr "Sto caricando dati per layer \"{0}\"" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1914,13 +1897,13 @@ msgstr "Avanzamento lento" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34 msgid "Downloading GPS data" msgstr "Scaricamento dei dati GPS" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57 msgid "Downloaded GPX Data" msgstr "Scarica dati GPX" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87 msgid "Raw GPS data" msgstr "Dati GPS grezzi" @@ -1935,4 +1918,11 @@ "Ignoring exception because download has been cancelled. Exception was: {0}" msgstr "" +"L''eccezione verrà ignorata perché lo scaricamento è stato annullato. " +"Eccezione: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 +#, fuzzy +msgid "No data found in this area." +msgstr "Nessun dato trovato sul dispositivo." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2156,5 +2146,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 msgid "Always move and don't show dialog again" -msgstr "" +msgstr "Sposta sempre e non visualizzare più la finestra di dialogo" #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 @@ -2205,9 +2195,9 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52 msgid "Can't search because there is no loaded data." -msgstr "" +msgstr "Impossibile effettuare la ricerca perché non ci sono dati caricati." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 msgid "Please enter a filter string." -msgstr "" +msgstr "Inserire una stringa di filtro." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 @@ -2229,5 +2219,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "find in selection" -msgstr "" +msgstr "cerca nella selezione" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2290,5 +2280,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "id:... - object with given ID (0 for new objects)" -msgstr "" +msgstr "id:... - oggetto con un dato ID (0 per nuovi oggetti)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 @@ -2357,5 +2347,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "Submit filter" -msgstr "" +msgstr "Invia filtro" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 @@ -2382,4 +2372,5 @@ msgid "Nothing find in selection by searching for ''{0}''" msgstr "" +"Non è stato trovato niente nella selezione durante la ricerca di ''''{0}''''" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2421,5 +2412,5 @@ #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" -msgstr "" +msgstr "Errore nella sintassi dello schema: lo schema {0} in {1} non è valido!" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 @@ -2539,5 +2530,5 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 msgid "Cyclic dependency between relations:" -msgstr "" +msgstr "Dipendenza ciclica tra relazioni:" #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47 @@ -2551,73 +2542,73 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53 msgid "Relation ..." -msgstr "" +msgstr "Relazione ..." #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54 msgid "... refers to relation" -msgstr "" +msgstr "... fa riferimento alla relazione" #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87 msgid "Cycling dependencies" -msgstr "" +msgstr "Dipendenze cicliche" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66 #, java-format msgid "Add node {0}" -msgstr "" +msgstr "Aggiungi nodo {0}" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 #, java-format msgid "Add way {0}" -msgstr "" +msgstr "Aggiungi percorso {0}" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 #, java-format msgid "Add relation {0}" -msgstr "" +msgstr "Aggiungi relazione {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 #, java-format msgid "Change node {0}" -msgstr "" +msgstr "Modifica nodo {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 #, java-format msgid "Change way {0}" -msgstr "" +msgstr "Modifica percorso {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 #, java-format msgid "Change relation {0}" -msgstr "" +msgstr "Modifica relazione {0}" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 #, java-format msgid "Remove \"{0}\" for node ''{1}''" -msgstr "" +msgstr "Rimuovi \"{0}\" per il nodo ''{1}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103 #, java-format msgid "Remove \"{0}\" for way ''{1}''" -msgstr "" +msgstr "Rimuovi \"{0}\" per il percorso ''{1}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104 #, java-format msgid "Remove \"{0}\" for relation ''{1}''" -msgstr "" +msgstr "Rimuovi \"{0}\" per la relazione ''{1}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109 #, java-format msgid "Set {0}={1} for node ''{2}''" -msgstr "" +msgstr "Imposta {0}={1} per il nodo ''{2}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110 #, java-format msgid "Set {0}={1} for way ''{2}''" -msgstr "" +msgstr "Imposta {0}={1} per il percorso ''{2}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111 #, java-format msgid "Set {0}={1} for relation ''{2}''" -msgstr "" +msgstr "Imposta {0}={1} per la relazione ''{2}''" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117 @@ -2651,4 +2642,6 @@ "conflict can't be added." msgstr "" +"Il livello ''{0}'' possiede già un conflitto per la " +"primitiva
''{1}''.
Questo conflitto non può essere aggiunto." #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 @@ -2658,20 +2651,22 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 -#, fuzzy, java-format +#, java-format msgid "" "Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitive ''{1}''." -msgstr "Un conflitto per la primitca \"{0}\" è già stato registrato" +msgstr "" +"Attenzione: Il livello ''{0}'' non esiste più. Non è possibile rimuovere il " +"conflitto per la primitiva ''{1}''." #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70 #, java-format msgid "Add conflict for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +msgstr "Aggiungi conflitto per ''{0}''" + +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 +#, fuzzy, java-format +msgid "" +"Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" "Impossibile annullare il comando \"{0}\" perchè il layer {1} non è più " @@ -2693,6 +2688,6 @@ msgid "Delete {0} object" msgid_plural "Delete {0} objects" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Elimina {0} oggetto" +msgstr[1] "Elimina {0} oggetti" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132 @@ -2700,6 +2695,6 @@ msgid "Delete {0} node" msgid_plural "Delete {0} nodes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Elimina {0} nodo" +msgstr[1] "Elimina {0} nodi" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133 @@ -2707,6 +2702,6 @@ msgid "Delete {0} way" msgid_plural "Delete {0} ways" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Elimina {0} percorso" +msgstr[1] "Elimina {0} percorsi" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134 @@ -2714,6 +2709,6 @@ msgid "Delete {0} relation" msgid_plural "Delete {0} relations" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Elimina {0} relazione" +msgstr[1] "Elimina {0} relazioni" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196 @@ -2722,5 +2717,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Delete from relation" msgstr "Elimina dalla relazione" @@ -2732,4 +2727,6 @@ "from relation?" msgstr "" +"La selezione \"{0}\" è utilizzata dalla relazione \"{1}\" con ruolo " +"{2}.
Eliminare dalla relazione?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:214 @@ -2739,4 +2736,6 @@ "" msgstr "" +"La selezione \"{0}\" è utilizzata dalla relazione \"{1}\"." +"
Eliminare dalla relazione?" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456 @@ -2773,14 +2772,15 @@ msgstr[1] "Sposta {0} nodi" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 -msgid "Purging 1 primitive" -msgstr "Eliminazione di 1 primitiva" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 -#, java-format -msgid "removing reference from way {0}" -msgstr "rimozione del riferimento dal percorso {0}" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 +#, fuzzy, java-format +msgid "Purged object ''{0}''" +msgstr "Sposta oggetti {0}" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 +#, fuzzy, java-format +msgid "Purged {0} objects" +msgstr "Modifica {0} oggetto" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 #, java-format msgid "" @@ -2789,7 +2789,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203 -#, java-format -msgid "removing reference from relation {0}" +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 +#, fuzzy, java-format +msgid "Removing reference from relation {0}" msgstr "rimozione del riferimento dalla relazione {0}" @@ -2799,13 +2799,20 @@ msgstr "Risolvi conflitti nella lista dei membri della relazione {0}" +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +msgstr "" +"Impossibile annullare il comando \"{0}\" perchè il layer {1} non è più " +"disponibile" + #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 #, java-format msgid "Remove node ''{0}'' at position {1} from relation ''{2}''" -msgstr "" +msgstr "Rimuovi il nodo ''{0}'' alla posizione {1} dalla relazione ''{2}''" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:70 #, java-format msgid "Remove way ''{0}'' at position {1} from relation ''{2}''" -msgstr "" +msgstr "Rimuovi il percorso ''{0}'' alla posizione {1} dalla relazione ''{2}''" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:71 @@ -2813,4 +2820,5 @@ msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''" msgstr "" +"Rimuovi la relazione ''{0}'' alla posizione {1} dalla relazione ''{2}''" #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:141 @@ -2828,15 +2836,15 @@ #, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "" +msgstr "Risolvi {0} conflitti di etichette nel nodo {1}" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 #, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "" +msgstr "Risolvi {0} conflitti di etichette nel percorso {1}" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "" +msgstr "Risolvi {0} conflitti di etichette nella relazione {1}" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2848,20 +2856,20 @@ #, java-format msgid "Resolve version conflicts for node {0}" -msgstr "" +msgstr "Risolvi i conflitti di versione per il nodo {0}" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42 #, java-format msgid "Resolve version conflicts for way {0}" -msgstr "" +msgstr "Risolvi i conflitti di versione per il percorso {0}" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43 #, java-format msgid "Resolve version conflicts for relation {0}" -msgstr "" +msgstr "Risolvi i conflitti di versione per la relazione {0}" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 #, java-format msgid "Resolve conflicts in node list of way {0}" -msgstr "" +msgstr "Risolvi i conflitti nella lista dei nodi del percorso {0}" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 @@ -3074,5 +3082,5 @@ #, java-format msgid "Changeset {0}" -msgstr "" +msgstr "Gruppo di modifiche {0}" #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:393 @@ -3139,33 +3147,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Error: {0}" msgstr "Errore: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Warning: {0}" msgstr "Attenzione: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 #, java-format msgid "Expected ID >= 0. Got {0}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302 +msgstr "Era atteso ID >= 0. Ottenuto {0}." + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 msgid "A primitive with ID = 0 can't be invisible." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338 +msgstr "Una primitiva con ID = 0 non può essere invisibile." + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format msgid "ID > 0 expected. Got {0}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340 +msgstr "Atteso ID > 0 . Ottenuto {0}." + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 #, java-format msgid "Version > 0 expected. Got {0}." -msgstr "" +msgstr "attesa versione > 0 . Ottenuto {0}." #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25 @@ -3187,10 +3195,12 @@ "multiple values." msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230 +"La collezione di etichette non può essere applicata ad una primitiva perché " +"ci sono chiavi con valori multipli." + +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:244 #, java-format msgid "Cannot add node {0} to incomplete way {1}." -msgstr "" +msgstr "Impossibile aggiungere il nodo {0} al percorso incompleto {1}." #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154 @@ -3207,8 +3217,10 @@ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''." msgstr "" +"Era atteso che il valore del parametro ''{0}\" fosse nell''intervallo 0.." +"{1}. Ottenuto ''{2}''." #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180 msgid "No earliest version found. History is empty." -msgstr "" +msgstr "Non è stata trovata alcuna versione precedente. Lo storico è vuoto." #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186 @@ -3243,120 +3255,113 @@ msgstr "il percorso multi-poligonale ''{0}'' non è chiuso." -#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed -#. TODO Remove useless nullcheck when RelationMember.member is encalupsed -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855 -msgid "Empty member in relation." -msgstr "Membro vuoto nella relazione." - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:850 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "Eliminato il membro ''{0}'' nella relazione." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:861 #, java-format msgid "Way ''{0}'' with less than two points." msgstr "Percorso ''{0}'' con meno di due punti." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 msgid "More than one \"from\" way found." msgstr "E' stato trovato più di un percorso \"from\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:607 msgid "More than one \"to\" way found." msgstr "E' stato trovato più di un percorso \"to\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:613 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627 msgid "More than one \"via\" found." msgstr "E' stata trovata più di una \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:632 #, java-format msgid "Unknown role ''{0}''." msgstr "Ruolo ''{0}'' sconosciuto." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 #, java-format msgid "Unknown member type for ''{0}''." msgstr "Tipo di membro sconosciuto per ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:641 msgid "No \"from\" way found." msgstr "Non è stato trovato un percorso \"from\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645 msgid "No \"to\" way found." msgstr "Non è stato trovato un percorso \"to\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:649 msgid "No \"via\" node or way found." msgstr "Non è stato trovato alcun nodo o percorso \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:658 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "Il percorso \"from\" non inizia o non finisce su un nodo \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:662 msgid "The \"to\" way doesn't start or end at a \"via\" node." msgstr "Il percorso \"to\" non inizia o finisce su un nodo \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689 msgid "The \"from\" way doesn't start or end at the \"via\" way." msgstr "Il percorso \"from\" non inizia o finisce sul percorso \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693 msgid "The \"to\" way doesn't start or end at the \"via\" way." msgstr "Il percorso \"to\" non inizia o finisce sul percorso \"via\"." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816 #, java-format msgid "Style for restriction {0} not found." msgstr "Non è stato trovato lo stile per la restrizione {0}." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:870 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "Regola ''{0}'' non utile per il percorso ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:882 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "Non-percorso ''{0}'' nel multi-poligono." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:940 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "Nessun percorso esterno per il multi-poligono ''{0}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1029 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." msgstr "Intersezione tra i percorsi ''{0}'' e ''{1}''." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1041 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "Il percorso interno ''{0}'' è esterno." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1094 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "Lo stile per il percorso interno ''{0}'' è uguale al multi-poligono." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1120 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "Lo stile per il percorso esterno ''{0}'' è discordante." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1324 msgid "untagged" msgstr "senza etichetta" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1325 msgid "text" msgstr "testo" @@ -3378,5 +3383,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:249 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 @@ -3387,5 +3392,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 @@ -3414,5 +3419,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:169 msgid "background" msgstr "sfondo" @@ -3428,5 +3433,5 @@ #: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215 msgid "Gauss-Laborde Réunion 1947" -msgstr "" +msgstr "Gauss-Laborde Réunion 1947" #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 @@ -3467,13 +3472,13 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 msgid "UTM20N Guadeloupe Fort-Marigot 1949" -msgstr "" +msgstr "UTM20N Guadeloupe Fort-Marigot 1949" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 msgid "UTM20N Guadeloupe Ste-Anne 1948" -msgstr "" +msgstr "UTM20N Guadeloupe Ste-Anne 1948" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 msgid "UTM20N Martinique Fort Desaix 1952" -msgstr "" +msgstr "UTM20N Martinique Fort Desaix 1952" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 @@ -3509,5 +3514,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "railway" msgstr "ferrovia" @@ -3545,5 +3550,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81 msgid "Security exception" -msgstr "" +msgstr "Eccezione di sicurezza" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95 @@ -3557,15 +3562,20 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120 msgid "Internal Server Error" -msgstr "" +msgstr "Errore interno del server" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130 msgid "Bad Request" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 +msgstr "Richiesta errata" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +#, fuzzy +msgid "Not Found" +msgstr "Non connesso" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 msgid "Unknown host" msgstr "Host sconosciuto" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:247 msgid "Primitive already deleted" msgstr "Primitiva già eliminata" @@ -3705,13 +3715,13 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114 msgid "options provided as Java system properties" -msgstr "" +msgstr "opzioni fornite come proprietà di sistema Java" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "/PATH/TO/JOSM/FOLDER/ " -msgstr "" +msgstr "/PERCORSO/DELLA/CARTELLA/JOSM/ " #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115 msgid "Change the folder for all user settings" -msgstr "" +msgstr "Cambia la cartella per tutte le impostazioni utente" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116 @@ -3721,4 +3731,8 @@ " Java option to increase the maximum size of allocated memory" msgstr "" +"nota: Per alcune funzionalità JOSM ha bisogno di molta memoria. Può essere " +"necessario aggiungere la seguente\n" +" opzione Java per incrementare la dimensione massima della memoria " +"allocata" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 @@ -3882,5 +3896,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 msgid "User:" -msgstr "" +msgstr "Utente:" #: ../core/src/org/openstreetmap/josm/gui/MapView.java:286 @@ -4600,5 +4614,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97 msgid "Conflicts when combining primitives" -msgstr "" +msgstr "Conflitti durante l'unione delle primitive" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103 @@ -4606,23 +4620,24 @@ msgid "Conflicts when combining ways - combined way is ''{0}''" msgstr "" +"Conflitti durante l''unione dei percorsi - il percorso unito è ''''{0}''''" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" -msgstr "" +msgstr "Conflitti durante l''unione dei nodi - il nodo unito è ''''{0}''''" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 msgid "No conflicts to resolve" -msgstr "" +msgstr "Nessun conflitto da risolvere" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254 msgid "Cancel conflict resolution" -msgstr "" +msgstr "Annulla la risoluzione del conflitto" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 msgid "Apply resolved conflicts" -msgstr "" +msgstr "Applica i conflitti risolti" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 @@ -4645,9 +4660,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 msgid "Choose a value" -msgstr "" +msgstr "Selezionare un valore" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 msgid "Please decided which values to keep" -msgstr "" +msgstr "Selezionare quali valori mantenere" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59 @@ -4669,5 +4684,5 @@ #, java-format msgid "Parameter ''{0}'' must not be empty." -msgstr "" +msgstr "il parametro ''{0}'' non deve essere vuoto." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55 @@ -4685,21 +4700,21 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270 msgid "Not decided yet." -msgstr "" +msgstr "Non ancora deciso." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 msgid "Tags from nodes" -msgstr "" +msgstr "Etichette dei nodi" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 msgid "Tags from ways" -msgstr "" +msgstr "Etichette dei percorsi" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 msgid "Tags from relations" -msgstr "" +msgstr "Etichette delle relazioni" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 msgid "Conflicts in pasted tags" -msgstr "" +msgstr "Conflitti nelle etichette incollate" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148 @@ -4726,15 +4741,15 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 msgid "Paste ..." -msgstr "" +msgstr "Incolla ..." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 msgid "From ..." -msgstr "" +msgstr "Da ..." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 msgid "To ..." -msgstr "" +msgstr "A ..." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425 @@ -4742,6 +4757,6 @@ msgid "{0} tag" msgid_plural "{0} tags" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{0} etichetta" +msgstr[1] "{0} etichette" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 @@ -4749,14 +4764,15 @@ msgid "Position {0} is out of range. Current number of members is {1}." msgstr "" +"La posizione {0} è fuori dai limiti. Il numero di membri corrente è {1}." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53 msgid "Remove this relation member from the relation" -msgstr "" +msgstr "Rimuovi questo membro dalla relazione" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57 msgid "Replace" -msgstr "" +msgstr "Sostituisci" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 @@ -4764,14 +4780,16 @@ msgid "Replace the way this member refers to with the combined way" msgstr "" +"Sostituisci il percorso a cui fa riferimento questo membro con il percorso " +"unito" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62 msgid "Undecided" -msgstr "" +msgstr "Non deciso" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63 msgid "Not decided yet" -msgstr "" +msgstr "Non ancora deciso" #. --- role editing @@ -4783,5 +4801,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:65 msgid "Tag modified relations with " -msgstr "" +msgstr "Etichette modificate assieme alle relazioni " #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:68 @@ -4792,21 +4810,21 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70 msgid "Value:" -msgstr "" +msgstr "Valore:" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86 msgid "Apply this role to all members" -msgstr "" +msgstr "Applica questo ruolo a tutti i membri" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." -msgstr "" +msgstr "Pos." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51 msgid "Orig. Way" -msgstr "" +msgstr "Percorso Orig." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 msgid "Decision" -msgstr "" +msgstr "Decisione" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4912,12 +4930,12 @@ #, java-format msgid "Resolve conflicts for ''{0}''" -msgstr "" +msgstr "Risolvi i conflitti per ''{0}''" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 msgid "Filter objects and hide/disable them." -msgstr "" +msgstr "Filtra oggetti e nascondili/disabilitali." #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -4936,41 +4954,41 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 msgid "Add filter." -msgstr "" +msgstr "Aggiungi filtro." #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 msgid "Edit filter." -msgstr "" +msgstr "Modifica filtro." #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 msgid "Delete filter." -msgstr "" +msgstr "Elimina filtro." #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Move filter up." -msgstr "" +msgstr "Sposta filtro in alto." #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Move filter down." -msgstr "" +msgstr "Sposta filtro in basso." #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128 msgid "Enable filter" -msgstr "" +msgstr "Abilita filtro" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 msgid "Hide elements" -msgstr "" +msgstr "Nascondi elementi" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131 msgid "Apply also for children" -msgstr "" +msgstr "Applica anche ai figli" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Inverse filter" -msgstr "" +msgstr "Filtro inverso" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Filter mode" -msgstr "" +msgstr "Modalità filtro" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157 @@ -4999,5 +5017,5 @@ #, java-format msgid "Way {0}" -msgstr "" +msgstr "Percorso {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272 @@ -5005,5 +5023,5 @@ #, java-format msgid "Relation {0}" -msgstr "" +msgstr "Relazione {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300 @@ -5059,5 +5077,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 msgid "Merge this layer into another layer" -msgstr "" +msgstr "Unisci questo livello con un altro livello" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 @@ -5131,43 +5149,43 @@ msgstr "Membro di" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 msgid "Add Properties" msgstr "Aggiungi proprietà" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 msgid "Add a new key/value pair to all objects" msgstr "Aggiungi una nuova coppia chiave/valore a tutti gli oggetti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 msgid "Edit Properties" msgstr "Modifica proprietà" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 msgid "Edit the value of the selected key for all objects" msgstr "Modifica il valore della chiave selezionata per tutti gli oggetti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Proprietà: {0} / Appartenenze: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 msgid "Properties / Memberships" msgstr "Proprietà / Appartenenze" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 msgid "Change relation" msgstr "Cambia relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Vuoi veramente cancellare la selezione dalla relazione {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:855 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 msgid "Delete the selected key in all objects" msgstr "Cancella la chiave selezionata in tutti gli oggetti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 msgid "Delete Properties" msgstr "Elimina proprietà" @@ -5177,6 +5195,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168 -#: build/trans_presets.java:3121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 +#: build/trans_presets.java:3133 msgid "Relations" msgstr "Relazioni" @@ -5186,25 +5204,31 @@ msgstr "Apri tutte le relazioni in una lista" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:174 #, java-format msgid "Relations: {0}" msgstr "Relazioni: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 msgid "Open an editor for the selected relation" msgstr "Apri le relazioni selezionate in un editor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:325 msgid "Delete the selected relation" msgstr "Cancella le relazioni selezionate" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:363 msgid "Create a new relation" msgstr "Crea una nuova relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:400 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280 msgid "Create a copy of this relation and open it in another editor window" msgstr "" +"Crea una copia di questa relazione e aprila in un'altra finestra dell'editor" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 +#, fuzzy +msgid "Set the current selection to the list of selected relations" +msgstr "La selezione attuale non può essere usata per la divisione." #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5245,9 +5269,9 @@ msgstr "Selezione: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 msgid "Undock the panel" msgstr "Stacca il pannello" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5256,5 +5280,5 @@ "degli strumenti a sinistra." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 msgid "Click to minimize/maximize the panel content" msgstr "Cliccare per minimizzare/massimizzare il contenuto del pannello" @@ -5276,18 +5300,18 @@ msgid "{0} Author" msgid_plural "{0} Authors" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{0} Autore" +msgstr[1] "{0} Autori" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142 msgid "Select primitives submitted by this user" -msgstr "" +msgstr "Seleziona le primitive caricate da questo utente" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172 msgid "Show info" -msgstr "" +msgstr "Mostra informazioni" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173 msgid "Launches a browser with information about the user" -msgstr "" +msgstr "Avvia un browser con le informazioni dell'utente" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185 @@ -5296,4 +5320,6 @@ "Warning: only launching info browsers for the first {0} of {1} selected users" msgstr "" +"Attenzione: avviati i browser delle informazioni per i primi {0} dei {1} " +"utenti selezionati" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208 @@ -5306,5 +5332,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210 msgid "Missing encoding" -msgstr "" +msgstr "Codifica mancante" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272 @@ -5319,4 +5345,6 @@ msgid "Edit the relation the currently selected relation member refers to." msgstr "" +"Modifica la relazione a cui fa riferimento il membro della relazione " +"correntemente selezionato." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:221 @@ -5410,5 +5438,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" -msgstr "" +msgstr "Più membri fanno riferimento alla stessa primitiva" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 @@ -5449,5 +5477,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 msgid "Relation Editor: Remove Selected" -msgstr "" +msgstr "Editor delle relazioni: Rimuovi selezione" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 @@ -5470,10 +5498,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 msgid "Sort the relation members" -msgstr "" +msgstr "Ordina i membri della relazione" #. putValue(NAME, tr("Sort")); #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897 msgid "Relation Editor: Sort" -msgstr "" +msgstr "Editor delle relazioni: Ordina" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909 @@ -5484,5 +5512,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912 msgid "Relation Editor: Move Up" -msgstr "" +msgstr "Editor delle relazioni: Sposta in alto" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 @@ -5493,22 +5521,22 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931 msgid "Relation Editor: Move Down" -msgstr "" +msgstr "Editor delle relazioni: Sposta in basso" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 msgid "Remove the currently selected members from this relation" -msgstr "" +msgstr "Rimuovi i membri correntemente selezionati da questa relazione" #. putValue(NAME, tr("Remove")); #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Remove" -msgstr "" +msgstr "Editor delle relazioni: Rimuovi" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 msgid "Delete the currently edited relation" -msgstr "" +msgstr "Elimina la relazione correntemente modificata" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049 msgid "Yes, create a conflict and close" -msgstr "" +msgstr "Si, crea un conflitto e chiudi" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 @@ -5560,5 +5588,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190 msgid "Relation Editor: Download Members" -msgstr "" +msgstr "Editor delle relazioni: Scarica membri" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208 @@ -5593,4 +5621,6 @@ msgid "Edit the relation the currently selected relation member refers to" msgstr "" +"Modifica la relazione a cui fa riferimento il membro della relazione " +"correntemente selezionato." #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 @@ -5768,5 +5798,5 @@ #. group "Geography" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2771 msgid "Places" msgstr "Luoghi" @@ -5878,15 +5908,15 @@ #, java-format msgid "History for node {0}" -msgstr "" +msgstr "Storico per il nodo {0}" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 #, java-format msgid "History for way {0}" -msgstr "" +msgstr "Storico per il percorso {0}" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 #, java-format msgid "History for relation {0}" -msgstr "" +msgstr "Storico per la relazione {0}" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 @@ -5896,5 +5926,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 msgid "Reload the history from the server" -msgstr "" +msgstr "Ricarica lo storico dal server" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180 @@ -5935,15 +5965,15 @@ #, java-format msgid "Loading history for node {0}" -msgstr "" +msgstr "Caricamento dello storico per il nodo {0}" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116 #, java-format msgid "Loading history for way {0}" -msgstr "" +msgstr "Caricamento dello storico per il percorso {0}" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117 #, java-format msgid "Loading history for relation {0}" -msgstr "" +msgstr "Caricamento dello storico per la relazione {0}" #. item "Streets/Motorway" text "Reference" @@ -6442,6 +6472,4 @@ #. item "Man Made/Windmill" label "Edit Windmill" #. -#. item "Man Made/Pipeline" label "Edit Pipeline" -#. #. item "Man Made/Wastewater Plant" label "Edit Wastewater Plant" #. @@ -6454,4 +6482,6 @@ #. item "Man Made/Surveillance" label "Edit Surveillance Camera" #. +#. item "Man Made/Power Station" label "Edit Power Station" +#. #. item "Amenities/Fountain" label "Edit Fountain" #. @@ -6776,57 +6806,57 @@ #: build/trans_presets.java:2250 build/trans_presets.java:2258 #: build/trans_presets.java:2290 build/trans_presets.java:2295 -#: build/trans_presets.java:2300 build/trans_presets.java:2305 -#: build/trans_presets.java:2311 build/trans_presets.java:2317 -#: build/trans_presets.java:2323 build/trans_presets.java:2331 -#: build/trans_presets.java:2337 build/trans_presets.java:2343 -#: build/trans_presets.java:2349 build/trans_presets.java:2355 -#: build/trans_presets.java:2365 build/trans_presets.java:2462 -#: build/trans_presets.java:2469 build/trans_presets.java:2483 -#: build/trans_presets.java:2489 build/trans_presets.java:2496 -#: build/trans_presets.java:2503 build/trans_presets.java:2509 -#: build/trans_presets.java:2515 build/trans_presets.java:2537 -#: build/trans_presets.java:2544 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2305 build/trans_presets.java:2310 +#: build/trans_presets.java:2316 build/trans_presets.java:2322 +#: build/trans_presets.java:2339 build/trans_presets.java:2345 +#: build/trans_presets.java:2351 build/trans_presets.java:2357 +#: build/trans_presets.java:2363 build/trans_presets.java:2373 +#: build/trans_presets.java:2380 build/trans_presets.java:2474 +#: build/trans_presets.java:2481 build/trans_presets.java:2495 +#: build/trans_presets.java:2501 build/trans_presets.java:2508 +#: build/trans_presets.java:2515 build/trans_presets.java:2521 +#: build/trans_presets.java:2527 build/trans_presets.java:2549 +#: build/trans_presets.java:2556 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2576 #: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2594 build/trans_presets.java:2601 -#: build/trans_presets.java:2608 build/trans_presets.java:2615 -#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2594 build/trans_presets.java:2600 +#: build/trans_presets.java:2606 build/trans_presets.java:2613 +#: build/trans_presets.java:2620 build/trans_presets.java:2627 #: build/trans_presets.java:2633 build/trans_presets.java:2639 -#: build/trans_presets.java:2645 build/trans_presets.java:2652 -#: build/trans_presets.java:2659 build/trans_presets.java:2666 -#: build/trans_presets.java:2672 build/trans_presets.java:2678 -#: build/trans_presets.java:2688 build/trans_presets.java:2697 -#: build/trans_presets.java:2712 build/trans_presets.java:2718 -#: build/trans_presets.java:2726 build/trans_presets.java:2733 -#: build/trans_presets.java:2753 build/trans_presets.java:2764 -#: build/trans_presets.java:2770 build/trans_presets.java:2776 +#: build/trans_presets.java:2645 build/trans_presets.java:2651 +#: build/trans_presets.java:2657 build/trans_presets.java:2664 +#: build/trans_presets.java:2671 build/trans_presets.java:2678 +#: build/trans_presets.java:2684 build/trans_presets.java:2690 +#: build/trans_presets.java:2700 build/trans_presets.java:2709 +#: build/trans_presets.java:2724 build/trans_presets.java:2730 +#: build/trans_presets.java:2738 build/trans_presets.java:2745 +#: build/trans_presets.java:2765 build/trans_presets.java:2776 #: build/trans_presets.java:2782 build/trans_presets.java:2788 -#: build/trans_presets.java:2795 build/trans_presets.java:2802 -#: build/trans_presets.java:2809 build/trans_presets.java:2815 -#: build/trans_presets.java:2821 build/trans_presets.java:2829 -#: build/trans_presets.java:2836 build/trans_presets.java:2843 -#: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2879 build/trans_presets.java:2885 +#: build/trans_presets.java:2794 build/trans_presets.java:2800 +#: build/trans_presets.java:2807 build/trans_presets.java:2814 +#: build/trans_presets.java:2821 build/trans_presets.java:2827 +#: build/trans_presets.java:2833 build/trans_presets.java:2841 +#: build/trans_presets.java:2848 build/trans_presets.java:2855 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2875 build/trans_presets.java:2882 #: build/trans_presets.java:2891 build/trans_presets.java:2897 -#: build/trans_presets.java:2903 build/trans_presets.java:2912 -#: build/trans_presets.java:2922 build/trans_presets.java:2931 -#: build/trans_presets.java:2937 build/trans_presets.java:2943 -#: build/trans_presets.java:2948 build/trans_presets.java:2954 -#: build/trans_presets.java:2960 build/trans_presets.java:2969 -#: build/trans_presets.java:2975 build/trans_presets.java:2981 +#: build/trans_presets.java:2903 build/trans_presets.java:2909 +#: build/trans_presets.java:2915 build/trans_presets.java:2924 +#: build/trans_presets.java:2934 build/trans_presets.java:2943 +#: build/trans_presets.java:2949 build/trans_presets.java:2955 +#: build/trans_presets.java:2960 build/trans_presets.java:2966 +#: build/trans_presets.java:2972 build/trans_presets.java:2981 #: build/trans_presets.java:2987 build/trans_presets.java:2993 #: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3012 build/trans_presets.java:3018 -#: build/trans_presets.java:3023 build/trans_presets.java:3030 -#: build/trans_presets.java:3037 build/trans_presets.java:3043 -#: build/trans_presets.java:3052 build/trans_presets.java:3060 -#: build/trans_presets.java:3066 build/trans_presets.java:3072 -#: build/trans_presets.java:3079 build/trans_presets.java:3085 -#: build/trans_presets.java:3092 build/trans_presets.java:3098 +#: build/trans_presets.java:3011 build/trans_presets.java:3017 +#: build/trans_presets.java:3024 build/trans_presets.java:3030 +#: build/trans_presets.java:3035 build/trans_presets.java:3042 +#: build/trans_presets.java:3049 build/trans_presets.java:3055 +#: build/trans_presets.java:3064 build/trans_presets.java:3072 +#: build/trans_presets.java:3078 build/trans_presets.java:3084 +#: build/trans_presets.java:3091 build/trans_presets.java:3097 #: build/trans_presets.java:3104 build/trans_presets.java:3110 -#: build/trans_presets.java:3116 build/trans_presets.java:3129 -#: build/trans_presets.java:3143 build/trans_presets.java:3157 +#: build/trans_presets.java:3116 build/trans_presets.java:3122 +#: build/trans_presets.java:3128 build/trans_presets.java:3141 +#: build/trans_presets.java:3155 build/trans_presets.java:3169 msgid "Name" msgstr "Nome" @@ -6841,5 +6871,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 msgid "Changeset info" -msgstr "" +msgstr "Informazioni sul gruppo di modifiche" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 @@ -6850,5 +6880,5 @@ #, java-format msgid "Show changeset {0}" -msgstr "" +msgstr "Visualizza il gruppo di modifiche {0}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6863,5 +6893,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" -msgstr "" +msgstr "Identificativo del gruppo di modifiche:" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 @@ -6871,5 +6901,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 msgid "Changeset comment:" -msgstr "" +msgstr "Commento del gruppo di modifiche:" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6880,21 +6910,21 @@ msgid "Please select the changesets you want to close" msgstr "" +"Selezionare il gruppo di modifiche che si desidera chiudere" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74 msgid "Open changesets" -msgstr "" +msgstr "Apri gruppi di modifiche" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101 msgid "Close changesets" -msgstr "" - -#. putValue(SMALL_ICON, ImageProvider.get("cancel")); +msgstr "Chiudi gruppi di modifiche" + #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 msgid "Close the selected open changesets" -msgstr "" +msgstr "Chiudi i gruppi di modifiche aperti selezionati" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126 msgid "Cancel closing of changesets" -msgstr "" +msgstr "Annulla la chiusura dei gruppi di modifiche" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 @@ -6905,5 +6935,5 @@ #, java-format msgid "Closing changeset {0}" -msgstr "" +msgstr "Chiusura del gruppo di modifiche {0}" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -6913,27 +6943,27 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 msgid "Select filename" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +msgstr "Seleziona il nome del file" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "Yes" msgstr "Si" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "No" msgstr "No" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47 #, java-format msgid "Layer ''{0}'' has modifications which should be uploaded to the server." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49 #, java-format msgid "Layer ''{0}'' has no modifications to be uploaded." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60 #, java-format msgid "" @@ -6942,29 +6972,29 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62 #, java-format msgid "Layer ''{0}'' has no modifications to be saved." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80 msgid "No file associated with this layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:83 msgid "Please select a file" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +msgstr "Selezionare un file" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:86 #, java-format msgid "Layer ''{0}'' is not backed by a file" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:101 #, java-format msgid "File ''{0}'' is not writable. Please enter another file name." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:115 #, java-format msgid "Select to upload layer ''{0}'' to the server ''{1}''" @@ -7001,5 +7031,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205 msgid "Unsaved data and conflicts" -msgstr "" +msgstr "Dati non salvati e conflitti" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212 @@ -7050,12 +7080,14 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322 msgid "Discard and Delete" -msgstr "" +msgstr "Scarta ed elimina" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323 msgid "Delete layers without saving. Unsaved changes are lost." msgstr "" +"Elimina i livelli senza salvare. Le modifiche non salvate saranno perse." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -msgid "Save and Exit" +#, fuzzy +msgid "Save/Upload and Exit" msgstr "Salva ed Esci" @@ -7063,22 +7095,26 @@ msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved." msgstr "" +"Esci da JOSM salvando. Le modifiche non salvate saranno caricate e/o salvate." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -msgid "Save and Delete" -msgstr "" +#, fuzzy +msgid "Save/Upload and Delete" +msgstr "Salva ed elimina" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." msgstr "" +"Salva/Carica i livelli prima di eliminare. Le modifiche non salvate non " +"saranno perse." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 #, java-format msgid "Preparing layer ''{0}'' for upload ..." -msgstr "" +msgstr "Preparazione del livello ''{0}'' per il caricamento ..." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481 msgid "" "An upload and/or save operation of one layer with modifications
was " -"cancelled or has been failed." +"cancelled or has failed." msgstr "" @@ -7151,19 +7187,19 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 msgid "Filename" -msgstr "" +msgstr "Nome del file" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200 msgid "Upload" -msgstr "" +msgstr "Carica" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 msgid "Settings" -msgstr "" +msgstr "Impostazioni" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:891 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:921 msgid "Tags of new changeset" msgstr "" @@ -7263,7 +7299,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:909 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:933 #, java-format msgid "Tags of changeset {0}" @@ -7271,48 +7306,48 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:949 msgid "Load the list of your open changesets from the server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:963 msgid "Close the currently selected open changeset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1011 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 #, java-format msgid "Changeset ID > 0 expected. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106 msgid "Preparing primitives to upload ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "Immagini per {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "Leggi GPX..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "Informazioni di tempo non disponibili per il punto {0} x {1}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Impossibile leggere il tempo \"{0}\" per il punto {1} x {2}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325 msgid "No images with readable timestamps found." msgstr "Non è stata trovata nessuna immagine con una data leggibile." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format @@ -7320,29 +7355,29 @@ msgstr "Lettura di {0}..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:402 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246 msgid "Geotagged Images" msgstr "Immagini geoetichettate" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:587 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "GPS start: {0}" msgstr "GPS inizio: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 #, java-format msgid "GPS end: {0}" msgstr "GPS fine: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594 #, java-format msgid "current delta: {0}s" msgstr "differenza attuale: {0}s" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595 msgid "timezone difference: " msgstr "differenza fuso orario: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284 msgid "image" @@ -7351,14 +7386,14 @@ msgstr[1] "immagini" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #, java-format msgid "{0} within the track." msgstr "{0} in questa traccia." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680 msgid "Sync clock" msgstr "Sincronizza tempo" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7366,32 +7401,32 @@ msgstr "Immagini JPEG (*.jpeg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:734 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "Impossibile leggere la data nel file \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "Orario non presente nei dati EXIF del file \"{0}\"." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 msgid "Image" msgstr "Immagine" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:752 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Inserisci la data visualizzata (mm/gg/aaaa HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759 msgid "GPS unit timezone (difference to photo)" msgstr "Fuso orario del GPS (differenza rispetto alle foto)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:767 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771 msgid "Synchronize Time with GPS Unit" msgstr "Sincronizza l'orario con l'unità GPS" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:790 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 msgid "Time entered could not be parsed." msgstr "Impossibile decodificare l'orario inserito." @@ -7475,5 +7510,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 #, java-format msgid "Name: {0}" @@ -7496,5 +7531,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3160 +#: build/trans_presets.java:3172 msgid "Description" msgstr "Descrizione" @@ -7506,5 +7541,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 msgid "Length" -msgstr "" +msgstr "Lunghezza" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -7550,5 +7585,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:587 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 @@ -7616,19 +7651,19 @@ "tracciato per poter essere giustamente calcolati." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:105 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:107 #, java-format msgid "Data Layer {0}" msgstr "Livello dati {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:171 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 msgid "outside downloaded area" msgstr "al di fuori dell'area scaricata" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:252 #, java-format msgid "version {0}" msgstr "versione {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:289 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:290 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" @@ -7636,24 +7671,47 @@ "nella versione 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 +#, fuzzy, java-format +msgid "There was {0} conflict detected." +msgid_plural "There were {0} conflicts detected." +msgstr[0] "Ci sono stati {0} conflitti durante l'importazione" +msgstr[1] "Ci sono stati {0} conflitti durante l'importazione" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 +#, java-format +msgid "" +"{0} object has been purged from the local dataset because it is deleted on " +"the server." +msgid_plural "" +"{0} objects have been purged from the local dataset because they are deleted " +"on the server." +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 +#, fuzzy +msgid "Conflicts detected" +msgstr "Rilevato un conflitto" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 #, java-format msgid "{0} consists of:" msgstr "{0} è composto da:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:476 #, java-format msgid " ({0} deleted.)" msgstr " ({0} eliminati)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 msgid "unset" msgstr "disattiva" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 #, java-format msgid "API version: {0}" msgstr "Versione delle API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:501 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:584 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" @@ -7670,6 +7728,6 @@ msgid "track" msgid_plural "tracks" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "tracciato" +msgstr[1] "tracciati" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 @@ -8028,5 +8086,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:412 #: ../plugins/terracer/src/terracer/TerracerAction.java:430 @@ -8812,5 +8870,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261 msgid "More information about this feature" msgstr "Ulteriori informazioni su questa caratteristica" @@ -8859,5 +8917,5 @@ msgstr "Sono supportati elementi di tipo {0}." -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:700 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -8867,18 +8925,18 @@ msgstr[1] "Modifica {0} oggetti" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "Non è stato selezionato niente!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 msgid "Selection unsuitable!" msgstr "Selezione non adatta!" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 msgid "Apply Preset" msgstr "Applica preimpostazione" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788 msgid "Change Properties" msgstr "Modifica Proprietà" @@ -9172,45 +9230,45 @@ msgstr "Chiusura del gruppo di modifiche..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "" "Non è presente alcun gruppo di modifiche per il caricamento differenziale" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 msgid "Preparing..." msgstr "Preparazione in corso..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 msgid "Uploading..." msgstr "Invio in corso..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 msgid "Waiting 10 seconds ... " msgstr "Attesa di 10 secondi ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 msgid "OK - trying again." msgstr "OK - nuovo tentativo." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9456,5 +9514,5 @@ msgid "" "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}''," -"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." +"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." msgstr "" @@ -9571,6 +9629,6 @@ #, java-format msgid "" -"Relation with external id ''{0}'' refers to missing primitive with external " -"id ''{1}''." +"Relation with external id ''{0}'' refers to a missing primitive with " +"external id ''{1}''." msgstr "" @@ -9667,32 +9725,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:73 msgid "Starting to upload with one request per primitive ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Starting to upload in one request ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 +#, fuzzy, java-format +msgid "Parameter ''{0}'' must not be null" +msgstr "il parametro ''{0}'' non deve essere nullo" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 msgid "Uploading data ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 msgid "" "WARNING: no API version defined for data to upload. Falling back to version " @@ -9700,5 +9763,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:153 #, java-format msgid "" @@ -9931,5 +9994,5 @@ #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:202 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:324 build/trans_presets.java:325 @@ -9951,6 +10014,6 @@ #: build/trans_presets.java:789 build/trans_presets.java:1333 #: build/trans_presets.java:1400 build/trans_presets.java:1401 -#: build/trans_presets.java:1402 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 +#: build/trans_presets.java:1402 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 msgid "unknown" msgstr "sconosciuto" @@ -10100,5 +10163,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:192 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:182 +#, java-format +msgid "" +"The OSM server ''{0}'' doesn't know about an object
you tried to read, " +"update, or delete. Either the respective object
doesn''t exist on the " +"server or you''re using an invalid URL to access
it. Please carefully " +"check the servers address ''{1}'' for typos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:209 #, java-format msgid "" @@ -10108,5 +10180,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:262 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:279 #, java-format msgid "" @@ -10282,5 +10354,5 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135 msgid "Visibility" -msgstr "" +msgstr "Visibilità" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136 @@ -10377,17 +10449,15 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35 msgid "Define Address Interpolation" msgstr "" -#. Whether to re-trigger data changed for relation #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "Dispari" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:413 #: ../plugins/terracer/src/terracer/TerracerAction.java:437 @@ -10395,99 +10465,102 @@ msgstr "Pari" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 msgid "Alphabetic" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 +msgstr "Alfabetico" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161 #, java-format msgid "Relation: {0}" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173 msgid "Associate with street using:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184 msgid "Numbering Scheme:" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186 +msgstr "Schema della numerazione:" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 msgid "Starting #:" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 +msgstr "# iniziale:" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188 msgid "Ending #:" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240 +msgstr "# finale:" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 #, java-format msgid "Will associate {0} additional house number nodes" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286 +msgstr "Assocerà {0} nodi supplementari per la numerazione degli edifici" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 msgid "City:" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287 +msgstr "Città:" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 msgid "State:" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288 +msgstr "Stato:" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 msgid "Post Code:" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289 +msgstr "Codice postale:" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 msgid "Country:" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290 +msgstr "Nazione:" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 msgid "Full Address:" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325 +msgstr "Indirizzo completo:" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 msgid "Optional Information:" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512 +msgstr "Informazioni aggiuntive:" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 msgid "Please select a street to associate with address interpolation way" msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525 +"Selezionare una strada da associare al percorso di interpolazione degli " +"indirizzi" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 msgid "Please select address interpolation way for this street" msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631 +"Selezionare un percorso di interpolazione degli indirizzi per questa strada" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 msgid "Country code must be 2 letters" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790 +msgstr "Il codice della nazione deve essere composto da 2 lettere" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 msgid "Starting address number must be less than ending address number" msgstr "" @@ -11256,4 +11329,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52 +#: build/trans_presets.java:2331 msgid "Location" msgstr "Posizione" @@ -11807,4 +11881,5 @@ msgstr "sudest" +#. item "Man Made/Pipeline" combo "Type" #. color highway_track #. @@ -11850,7 +11925,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:990 build/trans_style.java:1007 -#: build/trans_style.java:1023 build/trans_style.java:3400 -#: build/trans_style.java:3408 +#: build/trans_presets.java:2330 build/trans_style.java:990 +#: build/trans_style.java:1007 build/trans_style.java:1023 +#: build/trans_style.java:3400 build/trans_style.java:3408 msgid "water" msgstr "acqua" @@ -13153,5 +13228,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501 msgid "Updating map ..." -msgstr "" +msgstr "Aggiornamento mappa ..." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69 @@ -13201,5 +13276,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83 msgid "Nodes at same position" -msgstr "" +msgstr "Nodi nella stessa posizione" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145 @@ -13210,5 +13285,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79 msgid "Duplicated ways" -msgstr "" +msgstr "Percorsi duplicati" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60 @@ -13220,5 +13295,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144 msgid "Delete duplicate ways" -msgstr "" +msgstr "Elimina percorsi duplicati" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -13999,5 +14074,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 msgid "(deactivated)" -msgstr "" +msgstr "(disattivato)" #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:143 @@ -14023,9 +14098,9 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:196 msgid "Yes, fetch images" -msgstr "" +msgstr "Si, preleva le immagini" #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202 msgid "Invalid URL?" -msgstr "" +msgstr "Indirizzo URL non valido?" #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225 @@ -14121,5 +14196,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120 msgid "Please select at least one row to copy." -msgstr "" +msgstr "Selezionare almeno una riga da copiare." #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164 @@ -14142,5 +14217,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10 msgid "WMS Files (*.wms)" -msgstr "" +msgstr "File WMS (*.wms)" #. * @@ -14566,9 +14641,11 @@ #. item "Public Transport/Airport" text "Name" #. +#. item "Man Made/Power Station" text "Operator" #. item "Relations/Route" text "Name" #: build/trans_presets.java:65 build/trans_presets.java:101 #: build/trans_presets.java:121 build/trans_presets.java:141 #: build/trans_presets.java:178 build/trans_presets.java:198 -#: build/trans_presets.java:1560 build/trans_presets.java:3158 +#: build/trans_presets.java:1560 build/trans_presets.java:2382 +#: build/trans_presets.java:3170 msgid "Reference" msgstr "Riferimento" @@ -15111,5 +15188,5 @@ #: build/trans_presets.java:1309 msgid "asphalt" -msgstr "" +msgstr "asfalto" #: build/trans_presets.java:243 build/trans_presets.java:261 @@ -15130,7 +15207,7 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 msgid "metal" -msgstr "" +msgstr "metallo" #. color heath @@ -15148,5 +15225,5 @@ #: build/trans_presets.java:472 build/trans_presets.java:491 #: build/trans_presets.java:510 build/trans_presets.java:666 -#: build/trans_presets.java:1309 build/trans_presets.java:2445 +#: build/trans_presets.java:1309 build/trans_presets.java:2457 #: build/trans_style.java:3375 msgid "wood" @@ -15161,5 +15238,5 @@ #: build/trans_presets.java:1309 msgid "paving_stones" -msgstr "" +msgstr "lastricato" #. item "Ways/Track Grade 2" combo "Surface" @@ -15196,5 +15273,5 @@ #: build/trans_presets.java:1309 msgid "pebblestone" -msgstr "" +msgstr "ciottoli" #: build/trans_presets.java:243 build/trans_presets.java:261 @@ -15206,5 +15283,5 @@ #: build/trans_presets.java:1309 msgid "compacted" -msgstr "" +msgstr "compattato" #: build/trans_presets.java:243 build/trans_presets.java:261 @@ -15216,5 +15293,5 @@ #: build/trans_presets.java:1309 msgid "grass_paver" -msgstr "" +msgstr "erba" #: build/trans_presets.java:243 build/trans_presets.java:261 @@ -15435,7 +15512,7 @@ #: build/trans_presets.java:1401 build/trans_presets.java:1402 #: build/trans_presets.java:1767 build/trans_presets.java:1777 -#: build/trans_presets.java:2408 build/trans_presets.java:2444 -#: build/trans_presets.java:2453 build/trans_presets.java:2454 -#: build/trans_presets.java:2455 build/trans_presets.java:2725 +#: build/trans_presets.java:2420 build/trans_presets.java:2456 +#: build/trans_presets.java:2465 build/trans_presets.java:2466 +#: build/trans_presets.java:2467 build/trans_presets.java:2737 msgid "yes" msgstr "si" @@ -15584,8 +15661,8 @@ #: build/trans_presets.java:1400 build/trans_presets.java:1401 #: build/trans_presets.java:1402 build/trans_presets.java:1767 -#: build/trans_presets.java:1777 build/trans_presets.java:2408 -#: build/trans_presets.java:2444 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 -#: build/trans_presets.java:2725 +#: build/trans_presets.java:1777 build/trans_presets.java:2420 +#: build/trans_presets.java:2456 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 +#: build/trans_presets.java:2737 msgid "no" msgstr "no" @@ -15723,6 +15800,8 @@ #. item "Water/Wetland" text "Name" #. item "Car/Parking" text "Reference number" +#. item "Man Made/Pipeline" text "Operator" #. item "Man Made/Power Generator" label "Edit Power Generator" #. +#. item "Man Made/Power Tower" label "Edit Power Tower" #. item "Land use/Tree" text "Name" #. item "Land use/Wood" text "Name" @@ -15730,7 +15809,8 @@ #: build/trans_presets.java:350 build/trans_presets.java:649 #: build/trans_presets.java:789 build/trans_presets.java:1137 -#: build/trans_presets.java:1395 build/trans_presets.java:2364 -#: build/trans_presets.java:2913 build/trans_presets.java:2923 -#: build/trans_presets.java:2932 +#: build/trans_presets.java:1395 build/trans_presets.java:2330 +#: build/trans_presets.java:2372 build/trans_presets.java:2398 +#: build/trans_presets.java:2925 build/trans_presets.java:2935 +#: build/trans_presets.java:2944 msgid "Type" msgstr "Tipo" @@ -16002,5 +16082,5 @@ #: build/trans_presets.java:450 msgid "Pedestrians" -msgstr "" +msgstr "Pedoni" #. item "Ways/Cycleway" text "Width (meters)" @@ -16020,5 +16100,5 @@ #: build/trans_presets.java:470 msgid "Bikes" -msgstr "" +msgstr "Biciclette" #. item "Ways/Footway" text "Width (meters)" @@ -16280,10 +16360,10 @@ #. item "Tourism/Information Terminal" text "Closer description" #. item "Tourism/Audioguide" text "Closer description" -#. item "Man Made/Power Station" label "Edit Power Station" -#. +#. item "Man Made/Tower" text "Height (meters)" +#. item "Man Made/Pipeline" label "Edit Pipeline" +#. +#. item "Man Made/Power Station" text "Name" #. item "Man Made/Power Sub Station" label "Edit Power Sub Station" #. -#. item "Man Made/Power Line" label "Edit Power Line" -#. #. item #. #: build/trans_presets.java:1535 build/trans_presets.java:1789 -#: build/trans_presets.java:2453 +#: build/trans_presets.java:2465 msgid "Shelter" msgstr "Pensilina/ricovero" @@ -17975,5 +18057,5 @@ #: build/trans_presets.java:1567 msgid "Travel" -msgstr "" +msgstr "Viaggio" #. group "Travel" @@ -18305,10 +18387,10 @@ #: build/trans_presets.java:1724 msgid "Detail Grade" -msgstr "" +msgstr "Grado di dettaglio" #. item "Tourism/Map" combo "Detail Grade" #: build/trans_presets.java:1724 msgid "topo" -msgstr "" +msgstr "topografico" #. color tertiary @@ -18352,22 +18434,22 @@ #: build/trans_presets.java:1724 msgid "scheme" -msgstr "" +msgstr "schema" #: build/trans_presets.java:1725 msgid "Shown Area" -msgstr "" +msgstr "Area visualizzata" #. item "Tourism/Map" combo "Shown Area" #: build/trans_presets.java:1725 msgid "site" -msgstr "" +msgstr "sito" #: build/trans_presets.java:1725 msgid "city" -msgstr "" +msgstr "città" #: build/trans_presets.java:1725 msgid "region" -msgstr "" +msgstr "regione" #. item "Tourism/Other Information Points" text "Name" @@ -18383,5 +18465,5 @@ #: build/trans_presets.java:1728 build/trans_presets.java:1751 msgid "Routes shown for:" -msgstr "" +msgstr "Percorsi segnalati per:" #. item "Tourism/Map" check "Hiking" @@ -18396,5 +18478,5 @@ #: build/trans_presets.java:1731 build/trans_presets.java:1754 msgid "Mountainbiking" -msgstr "" +msgstr "Mountain bike" #. item "Tourism/Map" check "Mountainbiking" @@ -18409,5 +18491,5 @@ #: build/trans_presets.java:1733 build/trans_presets.java:1756 msgid "Riding" -msgstr "" +msgstr "Equitazione" #. item "Tourism/Map" check "Riding" @@ -18415,5 +18497,5 @@ #: build/trans_presets.java:1734 build/trans_presets.java:1757 msgid "... other transportation modes possible" -msgstr "" +msgstr "... altre modalità di trasporto possibili" #. item "Tourism/Map" label "... other transportation modes possible" @@ -18425,10 +18507,10 @@ #: build/trans_presets.java:1741 msgid "Board Content" -msgstr "" +msgstr "Contenuto del cartello" #. item "Tourism/Information Board" combo "Board Content" #: build/trans_presets.java:1741 msgid "notice" -msgstr "" +msgstr "avviso" #: build/trans_presets.java:1741 @@ -18446,10 +18528,10 @@ #: build/trans_presets.java:1741 msgid "plants" -msgstr "" +msgstr "piantine" #. item "Tourism/Information Board" text "Closer Description" #: build/trans_presets.java:1744 msgid "Guidepost" -msgstr "" +msgstr "Indicatore stradale" #. item "Tourism/Guidepost" label "... other transportation modes possible" @@ -18462,19 +18544,19 @@ #: build/trans_presets.java:1764 build/trans_presets.java:1774 msgid "Closer description" -msgstr "" +msgstr "Descrizione dettagliata" #: build/trans_presets.java:1769 msgid "Audioguide" -msgstr "" +msgstr "Audio-guida" #. #: build/trans_presets.java:1779 msgid "Audioguide via mobile phone?" -msgstr "" +msgstr "Audio-guida tramite cellulare?" #. item "Tourism/Audioguide" label "Audioguide via mobile phone?" #: build/trans_presets.java:1780 msgid "Phone number" -msgstr "" +msgstr "Numero di telefono" #. item "Tourism/Audioguide" text "Phone number" @@ -18641,5 +18723,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1877 build/trans_presets.java:2669 +#: build/trans_presets.java:1877 build/trans_presets.java:2681 msgid "Sports" msgstr "Articoli sportivi" @@ -19427,5 +19509,5 @@ #: build/trans_presets.java:2131 build/trans_presets.java:2137 msgid "track" -msgstr "" +msgstr "tracciato" #: build/trans_presets.java:1935 @@ -19992,6 +20074,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "Religion" msgstr "Religione" @@ -20000,66 +20082,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "bahai" msgstr "bahaismo" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "buddhist" msgstr "Buddista" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "christian" msgstr "Cristiana" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "hindu" msgstr "induismo" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jain" msgstr "giainismo" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "jewish" msgstr "Ebraica" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "muslim" msgstr "Mussulmana" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "spiritualist" msgstr "Spiritualista" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "taoist" msgstr "taoismo" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "unitarian" msgstr "unitariano" -#: build/trans_presets.java:2259 build/trans_presets.java:3044 -#: build/trans_presets.java:3053 +#: build/trans_presets.java:2259 build/trans_presets.java:3056 +#: build/trans_presets.java:3065 msgid "zoroastrian" msgstr "zoroastrismo" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "Denomination" msgstr "Denominazione" @@ -20068,76 +20150,76 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "anglican" msgstr "Anglicana" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "baptist" msgstr "Battista" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "catholic" msgstr "Cattolica" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "evangelical" msgstr "Evangelica" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "jehovahs_witness" msgstr "Testimoni di Geova" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "lutheran" msgstr "Luterana" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "methodist" msgstr "Metodista" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "mormon" msgstr "Mormone" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "orthodox" msgstr "Ortodossa" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "pentecostal" msgstr "Pentecostale" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "presbyterian" msgstr "Prebiteriana" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "protestant" msgstr "Protestante" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "quaker" msgstr "Quacchera" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "shia" msgstr "sciismo" -#: build/trans_presets.java:2260 build/trans_presets.java:3045 -#: build/trans_presets.java:3054 +#: build/trans_presets.java:2260 build/trans_presets.java:3057 +#: build/trans_presets.java:3066 msgid "sunni" msgstr "sunnismo" @@ -20233,25 +20315,49 @@ #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2296 +#, fuzzy +msgid "Tower type" +msgstr "Tipo di percorso" + +#. item "Man Made/Tower" combo "Tower type" +#: build/trans_presets.java:2296 +#, fuzzy +msgid "communication" +msgstr "collegamento" + +#: build/trans_presets.java:2296 +#, fuzzy +msgid "observation" +msgstr "Elevazione" + +#. +#: build/trans_presets.java:2298 +#, fuzzy +msgid "Height (meters)" +msgstr "Altezza massima (metri)" + +#. item "Man Made/Tower" text "Operator" +#. +#: build/trans_presets.java:2302 msgid "Water Tower" msgstr "Torre idrica" #. item -#: build/trans_presets.java:2298 +#: build/trans_presets.java:2303 msgid "Edit Water Tower" msgstr "Modifica torre idrica" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2307 msgid "Gasometer" msgstr "Gasometro" #. item -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2308 msgid "Edit Gasometer" msgstr "Modifica gasometro" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2307 +#: build/trans_presets.java:2312 msgid "Lighthouse" msgstr "Faro" @@ -20259,10 +20365,10 @@ #. item #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2314 msgid "Edit Lighthouse" msgstr "Modifica faro" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2313 +#: build/trans_presets.java:2318 msgid "Windmill" msgstr "Mulino a vento" @@ -20270,21 +20376,55 @@ #. item #. -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2320 msgid "Edit Windmill" msgstr "Modifica mulino a vento" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2319 +#: build/trans_presets.java:2324 msgid "Pipeline" msgstr "Conduttura" #. item -#. -#: build/trans_presets.java:2321 +#. +#: build/trans_presets.java:2327 msgid "Edit Pipeline" msgstr "Modifica conduttura" -#. item "Man Made/Pipeline" text "Name" -#: build/trans_presets.java:2325 +#: build/trans_presets.java:2330 +#, fuzzy +msgid "oil" +msgstr "a combustibile fossile" + +#: build/trans_presets.java:2330 build/trans_presets.java:2372 +msgid "gas" +msgstr "gas" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "sewage" +msgstr "uso" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "heat" +msgstr "brughiera" + +#: build/trans_presets.java:2330 +#, fuzzy +msgid "any substance" +msgstr "A in distanza" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "underwater" +msgstr "acqua" + +#: build/trans_presets.java:2331 +#, fuzzy +msgid "overground" +msgstr "sotterraneo" + +#: build/trans_presets.java:2333 msgid "Wastewater Plant" msgstr "Depuratore acqua" @@ -20294,10 +20434,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:2329 +#: build/trans_presets.java:2337 msgid "Edit Wastewater Plant" msgstr "Modifica depuratore acqua" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2333 +#: build/trans_presets.java:2341 msgid "Crane" msgstr "Gru permanente" @@ -20305,10 +20445,10 @@ #. item #. -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2343 msgid "Edit Crane" msgstr "Modifica gru permanente" #. item "Man Made/Crane" text "Name" -#: build/trans_presets.java:2339 +#: build/trans_presets.java:2347 msgid "Beacon" msgstr "Torre radio" @@ -20316,10 +20456,10 @@ #. item #. -#: build/trans_presets.java:2341 +#: build/trans_presets.java:2349 msgid "Edit Beacon" msgstr "Modifica torre radio" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2345 +#: build/trans_presets.java:2353 msgid "Survey Point" msgstr "Punto geodetico o altra stazione fissa" @@ -20327,10 +20467,10 @@ #. item #. -#: build/trans_presets.java:2347 +#: build/trans_presets.java:2355 msgid "Edit Survey Point" msgstr "Modifica punto geodetico o altra stazione fissa" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2351 +#: build/trans_presets.java:2359 msgid "Surveillance" msgstr "Telecamera di sorveglianza" @@ -20338,5 +20478,5 @@ #. item #. -#: build/trans_presets.java:2353 +#: build/trans_presets.java:2361 msgid "Edit Surveillance Camera" msgstr "Modifica telecamera di sorveglianza" @@ -20344,5 +20484,5 @@ #. item "Man Made/Surveillance" text "Name" #. -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2366 msgid "Power Generator" msgstr "Centrale elettrica" @@ -20352,39 +20492,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:2362 +#: build/trans_presets.java:2370 msgid "Edit Power Generator" msgstr "Modifica centrale elettrica" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "wind" msgstr "eolica" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "hydro" msgstr "idroelettrica" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "fossil" msgstr "a combustibile fossile" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "nuclear" msgstr "fissione nucleare" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "coal" msgstr "carbone" -#: build/trans_presets.java:2364 +#: build/trans_presets.java:2372 msgid "photovoltaic" msgstr "fotovoltaico" -#: build/trans_presets.java:2364 -msgid "gas" -msgstr "gas" - #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2367 +#: build/trans_presets.java:2375 msgid "Power Station" msgstr "Stazione elettrica" @@ -20393,10 +20529,10 @@ #. -#: build/trans_presets.java:2370 +#: build/trans_presets.java:2378 msgid "Edit Power Station" msgstr "Modifica stazione elettrica" -#. item "Man Made/Power Station" text "Operator" -#: build/trans_presets.java:2374 +#. item "Man Made/Power Station" text "Reference" +#: build/trans_presets.java:2384 msgid "Power Sub Station" msgstr "Sottostazione elettrica" @@ -20405,5 +20541,5 @@ #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2387 msgid "Edit Power Sub Station" msgstr "Modifica sottostazione elettrica" @@ -20411,10 +20547,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2380 build/trans_presets.java:2396 +#: build/trans_presets.java:2390 build/trans_presets.java:2407 msgid "Line reference" msgstr "Riferimento linea" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2382 +#: build/trans_presets.java:2392 msgid "Power Tower" msgstr "Pilone (elettricità)" @@ -20425,11 +20561,26 @@ #. 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:2387 +#: build/trans_presets.java:2397 msgid "Edit Power Tower" msgstr "Modifica pilone (elettricità)" -#. item "Man Made/Power Tower" label "Edit Power Tower" -#. -#: build/trans_presets.java:2390 +#. item "Man Made/Power Tower" combo "Type" +#: build/trans_presets.java:2398 +#, fuzzy +msgid "tower" +msgstr "Torre" + +#: build/trans_presets.java:2398 +#, fuzzy +msgid "pole" +msgstr "Ruolo" + +#: build/trans_presets.java:2399 +#, fuzzy +msgid "Tower reference" +msgstr "Riferimento linea" + +#. item "Man Made/Power Tower" text "Tower reference" +#: build/trans_presets.java:2401 msgid "Power Line" msgstr "Linea elettrica" @@ -20438,40 +20589,83 @@ #. -#: build/trans_presets.java:2393 +#: build/trans_presets.java:2404 msgid "Edit Power Line" msgstr "Modifica linea elettrica" +#. item "Man Made/Power Line" label "Edit Power Line" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "Line type" +msgstr "Tipo di pista" + +#. item "Man Made/Power Line" combo "Line type" +#: build/trans_presets.java:2405 +#, fuzzy +msgid "line" +msgstr "collegato" + +#: build/trans_presets.java:2405 +#, fuzzy +msgid "minor_line" +msgstr "motorway_link" + #. item "Man Made/Power Line" text "Line reference" -#: build/trans_presets.java:2397 +#: build/trans_presets.java:2408 msgid "Voltage" msgstr "Tensione" #. item "Man Made/Power Line" text "Voltage" -#: build/trans_presets.java:2398 -msgid "Amount of Wires" +#: build/trans_presets.java:2409 +#, fuzzy +msgid "Amount of Cables" msgstr "Numero di linee" -#. item "Man Made/Power Line" text "Amount of Wires" -#: build/trans_presets.java:2401 +#. item "Man Made/Power Line" text "Amount of Cables" +#: build/trans_presets.java:2410 +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:2410 +#, fuzzy +msgid "single" +msgstr "Angolo" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "double" +msgstr "Boule (sport popolare in Francia)" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "triple" +msgstr "Stile" + +#: build/trans_presets.java:2410 +#, fuzzy +msgid "quad" +msgstr "Quacchera" + +#: build/trans_presets.java:2413 msgid "Amenities" msgstr "Servizi" #. group "Amenities" -#: build/trans_presets.java:2402 +#: build/trans_presets.java:2414 msgid "Toilets" msgstr "Bagni" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2409 build/trans_presets.java:2525 +#: build/trans_presets.java:2421 build/trans_presets.java:2537 msgid "Note" msgstr "Nota" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2411 +#: build/trans_presets.java:2423 msgid "Post Box" msgstr "Cassetta Postale" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2428 msgid "Telephone" msgstr "Telefono" @@ -20480,5 +20674,5 @@ #. -#: build/trans_presets.java:2419 +#: build/trans_presets.java:2431 msgid "Edit Telephone" msgstr "Modifica Telefono" @@ -20486,5 +20680,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2422 build/trans_presets.java:2526 +#: build/trans_presets.java:2434 build/trans_presets.java:2538 msgid "Coins" msgstr "Monete" @@ -20492,5 +20686,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2423 build/trans_presets.java:2527 +#: build/trans_presets.java:2435 build/trans_presets.java:2539 msgid "Notes" msgstr "Note" @@ -20498,5 +20692,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2424 build/trans_presets.java:2528 +#: build/trans_presets.java:2436 build/trans_presets.java:2540 msgid "Electronic purses and Charge cards" msgstr "Portafogli elettronici e carte di debito" @@ -20504,5 +20698,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2425 build/trans_presets.java:2529 +#: build/trans_presets.java:2437 build/trans_presets.java:2541 msgid "Debit cards" msgstr "Carte di debito" @@ -20510,15 +20704,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2426 build/trans_presets.java:2530 +#: build/trans_presets.java:2438 build/trans_presets.java:2542 msgid "Credit cards" msgstr "Carte di credito" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2439 msgid "Telephone cards" msgstr "Carte telefoniche" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2429 +#: build/trans_presets.java:2441 msgid "Recycling" msgstr "Riciclaggio" @@ -20527,5 +20721,5 @@ #. -#: build/trans_presets.java:2432 +#: build/trans_presets.java:2444 msgid "Edit Recycling station" msgstr "Modifica Stazione di riciclaggio" @@ -20533,35 +20727,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2446 msgid "Batteries" msgstr "Batterie" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2435 +#: build/trans_presets.java:2447 msgid "Cans" msgstr "Lattine" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2436 +#: build/trans_presets.java:2448 msgid "Clothes" msgstr "Vestiti" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2437 +#: build/trans_presets.java:2449 msgid "Glass" msgstr "Vetro" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2438 +#: build/trans_presets.java:2450 msgid "Paper" msgstr "Carta" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2451 msgid "Scrap Metal" msgstr "Rottami metallici" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2441 +#: build/trans_presets.java:2453 msgid "Bench" msgstr "Panchina" @@ -20570,33 +20764,33 @@ #. #. -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2456 msgid "Backrest" -msgstr "" - -#: build/trans_presets.java:2445 +msgstr "Schienale" + +#: build/trans_presets.java:2457 msgid "Material" -msgstr "" +msgstr "Materiale" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2445 +#: build/trans_presets.java:2457 msgid "stone" -msgstr "" - -#: build/trans_presets.java:2445 +msgstr "pietra" + +#: build/trans_presets.java:2457 msgid "plastic" -msgstr "" - -#: build/trans_presets.java:2446 +msgstr "plastica" + +#: build/trans_presets.java:2458 msgid "Colour" -msgstr "" +msgstr "Colore" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "black" -msgstr "" - -#: build/trans_presets.java:2446 +msgstr "nero" + +#: build/trans_presets.java:2458 msgid "brown" -msgstr "" +msgstr "marrone" #. color historic @@ -20665,5 +20859,5 @@ #. #. -#: build/trans_presets.java:2446 build/trans_style.java:3063 +#: build/trans_presets.java:2458 build/trans_style.java:3063 #: build/trans_style.java:3071 build/trans_style.java:3079 #: build/trans_style.java:3087 build/trans_style.java:3135 @@ -20673,27 +20867,27 @@ msgstr "verde" -#: build/trans_presets.java:2446 +#: build/trans_presets.java:2458 msgid "red" -msgstr "" - -#: build/trans_presets.java:2446 +msgstr "rosso" + +#: build/trans_presets.java:2458 msgid "blue" -msgstr "" - -#: build/trans_presets.java:2446 +msgstr "blu" + +#: build/trans_presets.java:2458 msgid "white" -msgstr "" - -#: build/trans_presets.java:2447 +msgstr "bianco" + +#: build/trans_presets.java:2459 msgid "Amount of Seats" -msgstr "" +msgstr "Quantità di posti" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2449 +#: build/trans_presets.java:2461 msgid "Hunting Stand" msgstr "Postazione di caccia" #. item -#: build/trans_presets.java:2450 +#: build/trans_presets.java:2462 msgid "Edit Hunting Stand" msgstr "Modifica una postazione di caccia" @@ -20702,30 +20896,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2452 build/trans_presets.java:2914 +#: build/trans_presets.java:2464 build/trans_presets.java:2926 msgid "Height" msgstr "Modifica Albero" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "low" msgstr "basso" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "half" msgstr "mezzo" -#: build/trans_presets.java:2452 +#: build/trans_presets.java:2464 msgid "full" msgstr "completo" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2466 msgid "Hide" msgstr "Nascondi" -#: build/trans_presets.java:2455 +#: build/trans_presets.java:2467 msgid "Lock" msgstr "Blocco" -#: build/trans_presets.java:2457 +#: build/trans_presets.java:2469 msgid "Fountain" msgstr "Fontana" @@ -20734,10 +20928,10 @@ #. -#: build/trans_presets.java:2460 +#: build/trans_presets.java:2472 msgid "Edit Fountain" msgstr "Modifica Fontana" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2464 +#: build/trans_presets.java:2476 msgid "Drinking Water" msgstr "Acqua potabile" @@ -20746,10 +20940,10 @@ #. -#: build/trans_presets.java:2467 +#: build/trans_presets.java:2479 msgid "Edit Drinking Water" msgstr "Modifica acqua potabile" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2471 +#: build/trans_presets.java:2483 msgid "Baby Hatch" msgstr "Culla per la vita" @@ -20757,33 +20951,33 @@ #. item #. -#: build/trans_presets.java:2473 +#: build/trans_presets.java:2485 msgid "Edit Baby Hatch" msgstr "Modifica culla per la vita" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2491 msgid "Shops" msgstr "Negozi" #. group "Shops" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2492 msgid "Supermarket" msgstr "Supermercato" #. item -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2493 msgid "Edit Supermarket" msgstr "Modifica Supermercato" -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2498 msgid "Chemist" -msgstr "" - -#. item -#: build/trans_presets.java:2487 +msgstr "Farmacista" + +#. item +#: build/trans_presets.java:2499 msgid "Edit Chemist" -msgstr "" - -#: build/trans_presets.java:2492 +msgstr "Modifica farmacista" + +#: build/trans_presets.java:2504 msgid "Convenience Store" msgstr "Minimarket" @@ -20791,9 +20985,9 @@ #. item #. -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2506 msgid "Edit Convenience Store" msgstr "Modifica minimarket" -#: build/trans_presets.java:2499 +#: build/trans_presets.java:2511 msgid "Kiosk" msgstr "Chiosco" @@ -20801,27 +20995,27 @@ #. item #. -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2513 msgid "Edit Kiosk" msgstr "Modificia Chiosco" -#: build/trans_presets.java:2506 +#: build/trans_presets.java:2518 msgid "Book Store" -msgstr "" - -#. item -#: build/trans_presets.java:2507 +msgstr "Libreria" + +#. item +#: build/trans_presets.java:2519 msgid "Edit Book Store" -msgstr "" - -#: build/trans_presets.java:2512 +msgstr "Modifica libreria" + +#: build/trans_presets.java:2524 msgid "Travel Agency" -msgstr "" - -#. item -#: build/trans_presets.java:2513 +msgstr "Agenzia di viaggi" + +#. item +#: build/trans_presets.java:2525 msgid "Edit Travel Agency" -msgstr "" - -#: build/trans_presets.java:2518 +msgstr "Modifica agenzia di viaggi" + +#: build/trans_presets.java:2530 msgid "Vending machine" msgstr "Distributore automatico" @@ -20829,5 +21023,5 @@ #. item #. -#: build/trans_presets.java:2520 +#: build/trans_presets.java:2532 msgid "Edit Vending machine" msgstr "Modifica Distributore automatico" @@ -20835,88 +21029,88 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "Vending products" msgstr "Distributore automatico" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_tickets" msgstr "Biglietti trasporto pubblico" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "public_transport_plans" msgstr "Orari trasporto pubblico" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "parking_tickets" msgstr "Biglietti per il parcheggio" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "food" msgstr "Alimenti" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "drinks" msgstr "Bevande" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "sweets" msgstr "Dolci" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "cigarettes" msgstr "Sigarette" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "photos" msgstr "fotografie" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "animal_food" msgstr "Cibo per animali" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "news_papers" msgstr "Giornali" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "toys" msgstr "giocattoli" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "stamps" msgstr "francobolli" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "SIM-cards" msgstr "Schede SIM" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "telephone_vouchers" msgstr "buoni_telefonici" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "vouchers" msgstr "buoni" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "condoms" msgstr "preservativi" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "tampons" msgstr "assorbenti" -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2534 msgid "excrement_bags" msgstr "Sacchetto per escrementi" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2531 +#: build/trans_presets.java:2543 msgid "Account or loyalty cards" msgstr "Conto o carta fedeltà" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2545 msgid "Butcher" msgstr "Macellaio" @@ -20924,9 +21118,9 @@ #. item #. -#: build/trans_presets.java:2535 +#: build/trans_presets.java:2547 msgid "Edit Butcher" msgstr "Modifica Macellaio" -#: build/trans_presets.java:2540 +#: build/trans_presets.java:2552 msgid "Baker" msgstr "Panificio" @@ -20934,9 +21128,9 @@ #. item #. -#: build/trans_presets.java:2542 +#: build/trans_presets.java:2554 msgid "Edit Baker" msgstr "Modifica Panificio" -#: build/trans_presets.java:2547 +#: build/trans_presets.java:2559 msgid "Florist" msgstr "Fiorista" @@ -20944,18 +21138,18 @@ #. item #. -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2561 msgid "Edit Florist" msgstr "Modifica Fiorista" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2566 msgid "Organic" msgstr "Prodotti biologici" #. item -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2567 msgid "Edit Organic Shop" msgstr "Modifica negozio di prodotti biologici" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2572 msgid "Alcohol" msgstr "Alcolici (non in Italia)" @@ -20963,54 +21157,54 @@ #. item #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2574 msgid "Edit Alcohol Shop" msgstr "Modifica negozio di alcolici (non in Italia)" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2579 msgid "Beverages" msgstr "Bevande" #. item -#: build/trans_presets.java:2568 +#: build/trans_presets.java:2580 msgid "Edit Beverages Shop" msgstr "Modifica negozio di bevande" -#: build/trans_presets.java:2573 +#: build/trans_presets.java:2585 msgid "Computer" msgstr "Computer" #. item -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2586 msgid "Edit Computer Shop" msgstr "Modifica negozio di informatica" -#: build/trans_presets.java:2579 +#: build/trans_presets.java:2591 msgid "Electronics" msgstr "Elettronica" #. item -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2592 msgid "Edit Electronics Shop" msgstr "Modifica Negozio di Elettronica" -#: build/trans_presets.java:2585 +#: build/trans_presets.java:2597 msgid "Hifi" msgstr "Hi-Fi" #. item -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2598 msgid "Edit Hifi Shop" msgstr "Modifica negozio di Hi-Fi" -#: build/trans_presets.java:2591 +#: build/trans_presets.java:2603 msgid "Furniture" msgstr "Mobilia" #. item -#: build/trans_presets.java:2592 +#: build/trans_presets.java:2604 msgid "Edit Furniture Shop" msgstr "Modifica Negozio di Mobilia" -#: build/trans_presets.java:2597 +#: build/trans_presets.java:2609 msgid "Garden Centre" msgstr "Giardinaggio" @@ -21018,9 +21212,9 @@ #. item #. -#: build/trans_presets.java:2599 +#: build/trans_presets.java:2611 msgid "Edit Garden Centre" msgstr "Modifica giardinaggio" -#: build/trans_presets.java:2604 +#: build/trans_presets.java:2616 msgid "Hardware" msgstr "Ferramenta" @@ -21028,9 +21222,9 @@ #. item #. -#: build/trans_presets.java:2606 +#: build/trans_presets.java:2618 msgid "Edit Hardware Store" msgstr "Modifica Negozio di Ferramenta" -#: build/trans_presets.java:2611 +#: build/trans_presets.java:2623 msgid "Do-it-yourself-store" msgstr "Fai-da-te" @@ -21038,54 +21232,54 @@ #. item #. -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2625 msgid "Edit Do-it-yourself-store" msgstr "Modifica negozio Fai-da-te" -#: build/trans_presets.java:2618 +#: build/trans_presets.java:2630 msgid "Stationery" msgstr "Cartoleria" #. item -#: build/trans_presets.java:2619 +#: build/trans_presets.java:2631 msgid "Edit Stationery Shop" msgstr "Modifica cartoleria" -#: build/trans_presets.java:2624 +#: build/trans_presets.java:2636 msgid "Hairdresser" msgstr "Parrucchiere/barbiere" #. item -#: build/trans_presets.java:2625 +#: build/trans_presets.java:2637 msgid "Edit Hairdresser" msgstr "Modifica parrucchiere/barbiere" -#: build/trans_presets.java:2630 +#: build/trans_presets.java:2642 msgid "Shoes" msgstr "Calzature" #. item -#: build/trans_presets.java:2631 +#: build/trans_presets.java:2643 msgid "Edit Shoe Shop" msgstr "Modifica Negozio di Scarpe" -#: build/trans_presets.java:2636 +#: build/trans_presets.java:2648 msgid "Toys" msgstr "Giocattoli" #. item -#: build/trans_presets.java:2637 +#: build/trans_presets.java:2649 msgid "Edit Toy Shop" msgstr "Modifica Negozio di Giocattoli" -#: build/trans_presets.java:2642 +#: build/trans_presets.java:2654 msgid "Video" msgstr "Videoteca" #. item -#: build/trans_presets.java:2643 +#: build/trans_presets.java:2655 msgid "Edit Video Shop" msgstr "Modifica videoteca" -#: build/trans_presets.java:2648 +#: build/trans_presets.java:2660 msgid "Dry Cleaning" msgstr "Lavanderia a secco" @@ -21093,9 +21287,9 @@ #. item #. -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2662 msgid "Edit Dry Cleaning" msgstr "Modifica Lavanderia a secco" -#: build/trans_presets.java:2655 +#: build/trans_presets.java:2667 msgid "Laundry" msgstr "Lavanderia" @@ -21103,9 +21297,9 @@ #. item #. -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2669 msgid "Edit Laundry" msgstr "Modifica lavanderia" -#: build/trans_presets.java:2662 +#: build/trans_presets.java:2674 msgid "Outdoor" msgstr "Sport all'aperto" @@ -21113,28 +21307,28 @@ #. item #. -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2676 msgid "Edit Outdoor Shop" msgstr "Modifica sport all'aperto" #. item -#: build/trans_presets.java:2670 +#: build/trans_presets.java:2682 msgid "Edit Sports Shop" msgstr "Modifica articoli sportivi" -#: build/trans_presets.java:2675 +#: build/trans_presets.java:2687 msgid "Optician" msgstr "Ottico" #. item -#: build/trans_presets.java:2676 +#: build/trans_presets.java:2688 msgid "Edit Optician" msgstr "Modifica Ottico" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2695 msgid "Cash" msgstr "Contanti" #. group "Cash" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2696 msgid "Bank" msgstr "Banca" @@ -21142,14 +21336,14 @@ #. item #. -#: build/trans_presets.java:2686 +#: build/trans_presets.java:2698 msgid "Edit Bank" msgstr "Modifica banca" -#: build/trans_presets.java:2691 build/trans_presets.java:2700 +#: build/trans_presets.java:2703 build/trans_presets.java:2712 msgid "Automated Teller Machine" msgstr "Bancomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2693 +#: build/trans_presets.java:2705 msgid "Money Exchange" msgstr "Cambiavalute" @@ -21157,5 +21351,5 @@ #. item #. -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2707 msgid "Edit Money Exchange" msgstr "Modifica cambiavalute" @@ -21163,15 +21357,15 @@ #. item #. -#: build/trans_presets.java:2702 +#: build/trans_presets.java:2714 msgid "Edit Automated Teller Machine" msgstr "Modifica bancomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2707 +#: build/trans_presets.java:2719 msgid "Health" msgstr "Salute" #. group "Health" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2720 msgid "Doctors" msgstr "Ambulatorio" @@ -21179,18 +21373,18 @@ #. item #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2722 msgid "Edit Doctors" msgstr "Modifica ambulatorio" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2727 msgid "Dentist" msgstr "Dentista" #. item -#: build/trans_presets.java:2716 +#: build/trans_presets.java:2728 msgid "Edit Dentist" msgstr "Modifica dentista" -#: build/trans_presets.java:2721 +#: build/trans_presets.java:2733 msgid "Pharmacy" msgstr "Farmacia" @@ -21198,5 +21392,5 @@ #. item #. -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2735 msgid "Edit Pharmacy" msgstr "Modifica Farmacia" @@ -21204,9 +21398,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2725 +#: build/trans_presets.java:2737 msgid "Dispensing" msgstr "Vendita medicinali con obbligo di prescrizione" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2741 msgid "Hospital" msgstr "Ospedale" @@ -21214,10 +21408,10 @@ #. item #. -#: build/trans_presets.java:2731 +#: build/trans_presets.java:2743 msgid "Edit Hospital" msgstr "Modifica Ospedale" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2747 msgid "Emergency Access Point" msgstr "Colonnina SOS" @@ -21226,5 +21420,5 @@ #. -#: build/trans_presets.java:2738 +#: build/trans_presets.java:2750 msgid "Edit Emergency Access Point" msgstr "Modifica Colonnina SOS" @@ -21233,20 +21427,20 @@ #. #. -#: build/trans_presets.java:2741 +#: build/trans_presets.java:2753 msgid "Point Number" msgstr "Numero del punto" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2742 +#: build/trans_presets.java:2754 msgid "Point Name" msgstr "Nome del punto" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2744 +#: build/trans_presets.java:2756 msgid "Phone Number" msgstr "Numero di telefono" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2745 +#: build/trans_presets.java:2757 msgid "(Use international code, like +12-345-67890)" msgstr "(Usare prefisso internazionale, es. +12-345-67890)" @@ -21254,5 +21448,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2760 msgid "Veterinary" msgstr "Veterinario" @@ -21261,59 +21455,59 @@ #. -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2763 msgid "Edit Veterinary" msgstr "Modifica veterinario" -#: build/trans_presets.java:2758 +#: build/trans_presets.java:2770 msgid "Geography" -msgstr "" +msgstr "Geografia" #. group "Places" -#: build/trans_presets.java:2760 +#: build/trans_presets.java:2772 msgid "Continent" msgstr "Continente" #. item -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2773 msgid "Edit Continent" msgstr "Modifica continente" #. item "Places/Continent" text "Name" -#: build/trans_presets.java:2766 +#: build/trans_presets.java:2778 msgid "Country" -msgstr "Stato" - -#. item -#: build/trans_presets.java:2767 +msgstr "Nazione" + +#. item +#: build/trans_presets.java:2779 msgid "Edit Country" -msgstr "Modifica stato" +msgstr "Modifica nazione" #. item "Places/Country" text "Name" -#: build/trans_presets.java:2772 +#: build/trans_presets.java:2784 msgid "State" msgstr "Regione" #. item -#: build/trans_presets.java:2773 +#: build/trans_presets.java:2785 msgid "Edit State" msgstr "Modifica regione" #. item "Places/State" text "Name" -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2790 msgid "Region" msgstr "Provincia" #. item -#: build/trans_presets.java:2779 +#: build/trans_presets.java:2791 msgid "Edit Region" msgstr "Modifica provincia" #. item "Places/Region" text "Name" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2796 msgid "County" msgstr "Contea (in Italia NON usare)" #. item -#: build/trans_presets.java:2785 +#: build/trans_presets.java:2797 msgid "Edit County" msgstr "Modifica contea (in Italia NON usare)" @@ -21321,15 +21515,15 @@ #. item "Places/County" text "Name" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2803 msgid "City" msgstr "Città" #. item -#: build/trans_presets.java:2792 +#: build/trans_presets.java:2804 msgid "Edit City" msgstr "Modifica città" #. item "Places/City" text "Name" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2809 msgid "Town" msgstr "Paese" @@ -21337,10 +21531,10 @@ #. item #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2811 msgid "Edit Town" msgstr "Modifica Paese" #. item "Places/Town" text "Name" -#: build/trans_presets.java:2804 +#: build/trans_presets.java:2816 msgid "Suburb" msgstr "Sobborgo" @@ -21348,25 +21542,25 @@ #. item #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2818 msgid "Edit Suburb" msgstr "Modifica Sobborgo" #. item "Places/Suburb" text "Name" -#: build/trans_presets.java:2811 +#: build/trans_presets.java:2823 msgid "Village" msgstr "Frazione" #. item -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2824 msgid "Edit Village" msgstr "Modifica Frazione" #. item "Places/Village" text "Name" -#: build/trans_presets.java:2817 +#: build/trans_presets.java:2829 msgid "Hamlet" msgstr "Borgo" #. item -#: build/trans_presets.java:2818 +#: build/trans_presets.java:2830 msgid "Edit Hamlet" msgstr "Modifica Borgo" @@ -21374,5 +21568,5 @@ #. item "Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2824 +#: build/trans_presets.java:2836 msgid "Locality" msgstr "Luogo che ha un nome, ma non popolato" @@ -21380,10 +21574,10 @@ #. item #. -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2838 msgid "Edit Locality" msgstr "Località" #. item "Places/Locality" text "Name" -#: build/trans_presets.java:2831 +#: build/trans_presets.java:2843 msgid "Island" msgstr "Isola" @@ -21391,10 +21585,10 @@ #. item #. -#: build/trans_presets.java:2833 +#: build/trans_presets.java:2845 msgid "Edit Island" msgstr "Modifica isola" #. item "Places/Island" text "Name" -#: build/trans_presets.java:2838 +#: build/trans_presets.java:2850 msgid "Islet" msgstr "" @@ -21402,5 +21596,5 @@ #. item #. -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2852 msgid "Edit Islet" msgstr "" @@ -21408,5 +21602,5 @@ #. item "Places/Islet" text "Name" #. -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2858 msgid "Cave Entrance" msgstr "Entrata di una grotta/caverna" @@ -21414,10 +21608,10 @@ #. item #. -#: build/trans_presets.java:2848 +#: build/trans_presets.java:2860 msgid "Edit Cave Entrance" msgstr "Modifica entrata di una grotta/caverna" #. item "Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2864 msgid "Peak" msgstr "Picco montuoso" @@ -21425,10 +21619,10 @@ #. item #. -#: build/trans_presets.java:2854 +#: build/trans_presets.java:2866 msgid "Edit Peak" msgstr "Modifica picco montuoso" #. item "Places/Peak" text "Elevation" -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2871 msgid "Glacier" msgstr "Ghiacciaio" @@ -21436,10 +21630,10 @@ #. item #. -#: build/trans_presets.java:2861 +#: build/trans_presets.java:2873 msgid "Edit Glacier" msgstr "Modifica Ghiacciaio" #. item "Places/Glacier" text "Elevation" -#: build/trans_presets.java:2866 +#: build/trans_presets.java:2878 msgid "Volcano" msgstr "Vulcano" @@ -21447,70 +21641,70 @@ #. item #. -#: build/trans_presets.java:2868 +#: build/trans_presets.java:2880 msgid "Edit Volcano" msgstr "Modifica vulcano" #. item "Places/Volcano" text "Elevation" -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2886 msgid "Boundaries" msgstr "Confini" #. group "Boundaries" -#: build/trans_presets.java:2875 +#: build/trans_presets.java:2887 msgid "National" msgstr "Nazionale" #. item -#: build/trans_presets.java:2876 +#: build/trans_presets.java:2888 msgid "Edit National Boundary" msgstr "Modifica confine nazionale" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2881 +#: build/trans_presets.java:2893 msgid "Administrative" msgstr "Amministrativo" #. item -#: build/trans_presets.java:2882 +#: build/trans_presets.java:2894 msgid "Edit Administrative Boundary" msgstr "Modifica confine amministrativo" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2887 +#: build/trans_presets.java:2899 msgid "Civil" msgstr "Civile" #. item -#: build/trans_presets.java:2888 +#: build/trans_presets.java:2900 msgid "Edit Civil Boundary" msgstr "Modifica confine civile" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2893 +#: build/trans_presets.java:2905 msgid "Political" msgstr "Politico" #. item -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2906 msgid "Edit Political Boundary" msgstr "Modifica confine politico" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2911 msgid "National park" msgstr "Parco nazionale" #. item -#: build/trans_presets.java:2900 +#: build/trans_presets.java:2912 msgid "Edit National Park Boundary" msgstr "Modifica Confine Parco Nazionale" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2918 msgid "Land use" msgstr "Uso del terreno" #. group "Land use" -#: build/trans_presets.java:2907 +#: build/trans_presets.java:2919 msgid "Tree" msgstr "Albero" @@ -21519,15 +21713,15 @@ #. -#: build/trans_presets.java:2910 +#: build/trans_presets.java:2922 msgid "Edit Tree" msgstr "Modifica albero singolo" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2915 +#: build/trans_presets.java:2927 msgid "Botanical Name" msgstr "Nome Botanico" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2917 +#: build/trans_presets.java:2929 msgid "Wood" msgstr "Bosco" @@ -21536,5 +21730,5 @@ #. -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2932 msgid "Edit Wood" msgstr "Modifica bosco" @@ -21542,17 +21736,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "coniferous" msgstr "Conifere" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "deciduous" msgstr "deciduo (caducifoglie)" -#: build/trans_presets.java:2923 build/trans_presets.java:2932 +#: build/trans_presets.java:2935 build/trans_presets.java:2944 msgid "mixed" msgstr "Mista" -#: build/trans_presets.java:2925 +#: build/trans_presets.java:2937 msgid "Forest" msgstr "Foresta" @@ -21561,14 +21755,14 @@ #. -#: build/trans_presets.java:2928 +#: build/trans_presets.java:2940 msgid "Edit Forest Landuse" msgstr "Modifica area di foresta" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2946 msgid "Nature Reserve" msgstr "Riserva naturale" #. item -#: build/trans_presets.java:2935 +#: build/trans_presets.java:2947 msgid "Edit Nature Reserve" msgstr "Modifica riserva naturale" @@ -21576,25 +21770,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:2940 +#: build/trans_presets.java:2952 msgid "Scree" msgstr "Ghiaione" #. item -#: build/trans_presets.java:2941 +#: build/trans_presets.java:2953 msgid "Edit Scree" msgstr "Modifica Ghiaione" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:2945 +#: build/trans_presets.java:2957 msgid "Scrub" msgstr "Boscaglia" #. item -#: build/trans_presets.java:2946 +#: build/trans_presets.java:2958 msgid "Edit Scrub" msgstr "Modifica boscaglia" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2962 msgid "Fell" msgstr "Fell" @@ -21602,10 +21796,10 @@ #. item #. -#: build/trans_presets.java:2952 +#: build/trans_presets.java:2964 msgid "Edit Fell" msgstr "Modifica Fell" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2968 msgid "Heath" msgstr "Brughiera" @@ -21613,5 +21807,5 @@ #. item #. -#: build/trans_presets.java:2958 +#: build/trans_presets.java:2970 msgid "Edit Heath" msgstr "Modifica brughiera" @@ -21619,5 +21813,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:2963 +#: build/trans_presets.java:2975 msgid "Farmyard" msgstr "Aia" @@ -21626,45 +21820,45 @@ #. -#: build/trans_presets.java:2966 +#: build/trans_presets.java:2978 msgid "Edit Farmyard Landuse" msgstr "Modifica aia" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:2971 +#: build/trans_presets.java:2983 msgid "Farmland" msgstr "Area agricola" #. item -#: build/trans_presets.java:2972 +#: build/trans_presets.java:2984 msgid "Edit Farmland Landuse" msgstr "Modifica area agricola" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:2977 +#: build/trans_presets.java:2989 msgid "Meadow" msgstr "Prato" #. item -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2990 msgid "Edit Meadow Landuse" msgstr "Modifica area a prato" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:2995 msgid "Vineyard" msgstr "Vigna" #. item -#: build/trans_presets.java:2984 +#: build/trans_presets.java:2996 msgid "Edit Vineyard Landuse" msgstr "Modifica area di vigneto" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:2989 +#: build/trans_presets.java:3001 msgid "Allotments" msgstr "Area pubblica concessa ai cittadini per la realizzazione di orti" #. item -#: build/trans_presets.java:2990 +#: build/trans_presets.java:3002 msgid "Edit Allotments Landuse" msgstr "" @@ -21673,25 +21867,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3008 msgid "Garden" msgstr "Giardino" #. item -#: build/trans_presets.java:2997 +#: build/trans_presets.java:3009 msgid "Edit Garden" msgstr "Modifica giardino" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3001 +#: build/trans_presets.java:3013 msgid "Grass" msgstr "Erba" #. item -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3014 msgid "Edit Grass Landuse" msgstr "Modifica area di prato" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3007 +#: build/trans_presets.java:3019 msgid "Village Green" msgstr "Village Green" @@ -21699,10 +21893,10 @@ #. item #. -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3021 msgid "Edit Village Green Landuse" msgstr "Modifica Village Green" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3026 msgid "Common" msgstr "Common (UK)" @@ -21710,20 +21904,20 @@ #. item #. -#: build/trans_presets.java:3016 +#: build/trans_presets.java:3028 msgid "Edit Common" msgstr "Modifica una Common (UK)" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3032 msgid "Park" msgstr "Parco" #. item -#: build/trans_presets.java:3021 +#: build/trans_presets.java:3033 msgid "Edit Park" msgstr "Modifica parco" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3025 +#: build/trans_presets.java:3037 msgid "Recreation Ground" msgstr "Area di svago" @@ -21731,5 +21925,5 @@ #. item #. -#: build/trans_presets.java:3027 +#: build/trans_presets.java:3039 msgid "Edit Recreation Ground Landuse" msgstr "Modifica area di svago" @@ -21737,15 +21931,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3033 +#: build/trans_presets.java:3045 msgid "Residential area" msgstr "Residential Landuse" #. item -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3046 msgid "Edit Residential Landuse" msgstr "Modifica Residential Landuse" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3051 msgid "Graveyard" msgstr "Cimitero" @@ -21753,9 +21947,9 @@ #. item #. -#: build/trans_presets.java:3041 +#: build/trans_presets.java:3053 msgid "Edit Graveyard" msgstr "Modifica Cimitero" -#: build/trans_presets.java:3047 +#: build/trans_presets.java:3059 msgid "Cemetery" msgstr "Cimitero" @@ -21763,39 +21957,39 @@ #. item #. -#: build/trans_presets.java:3049 +#: build/trans_presets.java:3061 msgid "Edit Cemetery Landuse" msgstr "Modifica area di cimitero (esteso)" -#: build/trans_presets.java:3056 +#: build/trans_presets.java:3068 msgid "Retail" msgstr "Commerciale (negozi)" #. item -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3069 msgid "Edit Retail Landuse" msgstr "Modifica area commerciale (negozi)" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3062 +#: build/trans_presets.java:3074 msgid "Commercial" msgstr "Commerciale (uffici)" #. item -#: build/trans_presets.java:3063 +#: build/trans_presets.java:3075 msgid "Edit Commercial Landuse" msgstr "Modifica area commerciale (uffici)" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3068 +#: build/trans_presets.java:3080 msgid "Industrial" msgstr "Industriale" #. item -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3081 msgid "Edit Industrial Landuse" msgstr "Modifica area industriale" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3074 +#: build/trans_presets.java:3086 msgid "Railway land" msgstr "Deposito materiale ferroviario" @@ -21803,15 +21997,15 @@ #. item #. -#: build/trans_presets.java:3076 +#: build/trans_presets.java:3088 msgid "Edit Railway Landuse" msgstr "Modifica deposito materiale ferroviario" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3081 +#: build/trans_presets.java:3093 msgid "Military" msgstr "Militare" #. item -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3094 msgid "Edit Military Landuse" msgstr "Modifica area militare" @@ -21819,55 +22013,55 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3100 msgid "Construction area" msgstr "Area in costruzione" #. item -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3101 msgid "Edit Construction Landuse" msgstr "Modifica area in costruzione" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3094 +#: build/trans_presets.java:3106 msgid "Brownfield" msgstr "Ridestinazione d'uso" #. item -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3107 msgid "Edit Brownfield Landuse" msgstr "Modifica area di ridestinazione d'uso" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3100 +#: build/trans_presets.java:3112 msgid "Greenfield" msgstr "Area agricola destinata alla costruzione" #. item -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3113 msgid "Edit Greenfield Landuse" msgstr "Modifica area agricola destinata alla costruzione" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3106 +#: build/trans_presets.java:3118 msgid "Landfill" msgstr "Discarica" #. item -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3119 msgid "Edit Landfill Landuse" msgstr "Modifica area di discarica" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3112 +#: build/trans_presets.java:3124 msgid "Quarry" msgstr "Cava" #. item -#: build/trans_presets.java:3113 +#: build/trans_presets.java:3125 msgid "Edit Quarry Landuse" msgstr "Modifica area di cava/miniera" #. group "Relations" -#: build/trans_presets.java:3122 +#: build/trans_presets.java:3134 msgid "Multipolygon" msgstr "Multi-poligono" @@ -21877,5 +22071,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:3126 +#: build/trans_presets.java:3138 msgid "Edit Multipolygon" msgstr "Modifica un multi-poligono" @@ -21884,10 +22078,10 @@ #. #. -#: build/trans_presets.java:3132 +#: build/trans_presets.java:3144 msgid "outer segment" msgstr "segmento esterno" #. item "Relations/Multipolygon" role "outer segment" -#: build/trans_presets.java:3133 +#: build/trans_presets.java:3145 msgid "inner segment" msgstr "segmento interno" @@ -21895,5 +22089,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3148 msgid "Turn restriction" msgstr "Divieto di svolta" @@ -21902,5 +22096,5 @@ #. -#: build/trans_presets.java:3139 +#: build/trans_presets.java:3151 msgid "Edit Turn Restriction" msgstr "Modifica un divieto di svolta" @@ -21908,34 +22102,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "Restriction" msgstr "Divieto" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_left_turn" msgstr "no svolta a sinistra" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_right_turn" msgstr "no svolta a destra" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_straight_on" msgstr "non diritto" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "no_u_turn" msgstr "no inversione di marcia" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_right_turn" msgstr "solo svolta a destra" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_left_turn" msgstr "solo svolta a sinistra" -#: build/trans_presets.java:3141 +#: build/trans_presets.java:3153 msgid "only_straight_on" msgstr "solo diritto" @@ -21944,15 +22138,15 @@ #. #. -#: build/trans_presets.java:3146 +#: build/trans_presets.java:3158 msgid "from way" msgstr "dal percorso" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3147 +#: build/trans_presets.java:3159 msgid "via node or way" msgstr "attraverso il nodo o percorso" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3148 +#: build/trans_presets.java:3160 msgid "to way" msgstr "verso il percorso" @@ -21960,5 +22154,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3151 +#: build/trans_presets.java:3163 msgid "Route" msgstr "Percorso" @@ -21967,5 +22161,5 @@ #. -#: build/trans_presets.java:3154 +#: build/trans_presets.java:3166 msgid "Edit Route" msgstr "Modifica un percorso" @@ -21973,5 +22167,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "Route type" msgstr "Tipo di percorso" @@ -22043,5 +22237,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:233 +#: build/trans_presets.java:3168 build/trans_style.java:233 #: build/trans_style.java:683 build/trans_style.java:906 #: build/trans_style.java:914 build/trans_style.java:922 @@ -22050,17 +22244,17 @@ msgstr "bicicletta" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "bus" msgstr "autobus" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "road" msgstr "strada" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ferry" msgstr "traghetto" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "ski" msgstr "sci" @@ -22113,5 +22307,5 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:247 +#: build/trans_presets.java:3168 build/trans_style.java:247 #: build/trans_style.java:691 build/trans_style.java:699 #: build/trans_style.java:707 build/trans_style.java:708 @@ -22120,13 +22314,13 @@ msgstr "pedone" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "hiking" msgstr "escursionismo" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "tram" msgstr "tram" -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "detour" msgstr "deviazione" @@ -22140,10 +22334,10 @@ #. #. -#: build/trans_presets.java:3156 build/trans_style.java:1206 +#: build/trans_presets.java:3168 build/trans_style.java:1206 msgid "subway" msgstr "metropolitana" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3159 +#: build/trans_presets.java:3171 msgid "Symbol description" msgstr "Descrizione del simbolo" @@ -22151,31 +22345,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3174 msgid "Network" msgstr "Rete" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "proposed" msgstr "proposto" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "alternate" msgstr "alternativo" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "temporary" msgstr "temporaneo" -#: build/trans_presets.java:3164 +#: build/trans_presets.java:3176 msgid "connection" msgstr "collegamento" -#: build/trans_presets.java:3165 +#: build/trans_presets.java:3177 msgid "Color (hex)" msgstr "Colore (esadecimale)" @@ -22184,30 +22378,30 @@ #. #. -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3180 msgid "route segment" msgstr "segmento di percorso" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3181 msgid "forward segment" msgstr "segmento diretto" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3170 +#: build/trans_presets.java:3182 msgid "backward segment" msgstr "segmento opposto" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3171 +#: build/trans_presets.java:3183 msgid "halt point" msgstr "punto di fermata" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3172 +#: build/trans_presets.java:3184 msgid "forward halt point" msgstr "punto di fermata diretto" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3173 +#: build/trans_presets.java:3185 msgid "backward halt point" msgstr "punto di fermata opposto" @@ -26338,10 +26532,37 @@ #: build/trans_wms.java:25 msgid "Czech CUZK:KM" -msgstr "" +msgstr "Czech CUZK:KM" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& #: build/trans_wms.java:26 msgid "Czech UHUL:ORTOFOTO" -msgstr "" +msgstr "Czech UHUL:ORTOFOTO" + +#~ msgid "Combine ways with different memberships?" +#~ msgstr "Unire i percorsi con diverse appartenenze?" + +#~ msgid "Combine Anyway" +#~ msgstr "Unisci comunque" + +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "" +#~ "I percorsi selezionati appartengono a relazioni differenti. Vuoi comunque " +#~ "unirli?" + +#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +#~ msgstr "" +#~ "L'intestazione dell'errore \"{0}\" non corrisponde allo schema atteso " +#~ "\"{1}\"" + +#~ msgid "Purging 1 primitive" +#~ msgstr "Eliminazione di 1 primitiva" + +#~ msgid "removing reference from way {0}" +#~ msgstr "rimozione del riferimento dal percorso {0}" + +#~ msgid "Empty member in relation." +#~ msgstr "Membro vuoto nella relazione." #~ msgid "No data imported." @@ -26941,7 +27162,4 @@ #~ msgstr "Impossibile leggere valori numerici dalla risposta" -#~ msgid "linked" -#~ msgstr "collegato" - #~ msgid "% of lon:" #~ msgstr "% di lon:" Index: /applications/editors/josm/i18n/po/ja.po =================================================================== --- /applications/editors/josm/i18n/po/ja.po (revision 17821) +++ /applications/editors/josm/i18n/po/ja.po (revision 17822) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-22 17:52+0200\n" -"PO-Revision-Date: 2009-09-22 14:29+0000\n" +"POT-Creation-Date: 2009-09-28 16:38+0200\n" +"PO-Revision-Date: 2009-09-27 09:08+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: 2009-09-22 15:45+0000\n" +"X-Launchpad-Export-Date: 2009-09-28 14:33+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -35,5 +35,5 @@ #, java-format msgid "The projection {0} could not be activated. Using Mercator" -msgstr "投影法 {0} は、使用可能できませんでした。メルカトル図法を使います。" +msgstr "投影法 {0} は、有効化できませんでした。メルカトル図法を使います。" #: ../core/src/org/openstreetmap/josm/Main.java:294 @@ -66,8 +66,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250 @@ -90,9 +90,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:513 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:526 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:644 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:835 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -141,7 +141,7 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:140 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:172 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 @@ -154,5 +154,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233 @@ -296,7 +295,6 @@ "page for OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" -"警告: API のベースURLのフォーマットがおかしいです。OSM プリミティブの情報や履" -"歴のページにリダイレクトすると、おそらく失敗します。API ベース URL は \"{0}" -"\" です。" +"警告: 予想外のAPI ベースURLのフォーマット。OSM プリミティブの情報や履歴のペー" +"ジにリダイレクトすると、おそらく失敗します。API ベース URL は \"{0}\" です。" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 @@ -306,6 +304,6 @@ "user will probably fail. API base URL is: ''{0}''" msgstr "" -"警告: API のベースURLのフォーマットがおかしいです。OSM ユーザーのページにリダ" -"イレクトすると、おそらく失敗します。API ベース URL は \"{0}\" です。" +"警告: 予想外のAPI ベースURLのフォーマット。OSM ユーザーのページにリダイレクト" +"すると、おそらく失敗します。API ベース URL は \"{0}\" です。" #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94 @@ -321,4 +319,6 @@ "primitives only" msgstr "" +"警告：ブラウザウインドウを開くのは、選択したプリミティブの{1}のうち、最初の" +"{0}だけです。" #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 @@ -337,6 +337,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -346,6 +345,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 @@ -355,5 +354,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -364,5 +363,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180 @@ -371,5 +370,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:263 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 #: ../plugins/grid/src/grid/GridLayer.java:162 @@ -464,9 +463,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -498,10 +497,9 @@ msgstr "少なくとも４つのノードを選択してください。" -#. FIXME: not sure whether this fits in a dialog #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:85 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:229 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -552,5 +550,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "layer" -msgstr "レイヤ" +msgstr "レイヤー" #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 @@ -611,5 +609,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 #, java-format msgid "File: {0}" @@ -631,58 +629,42 @@ msgstr "開かれた変更セットをダウンロード中 ..." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine Way" -msgstr "ウエイの結合" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46 +msgstr "ウェイの結合" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 msgid "Combine several ways into one." -msgstr "複数のウエイを一つに結合" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:58 -msgid "Combine ways with different memberships?" -msgstr "異なるメンバーであるウェイを結合しますか？" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59 -msgid "Combine Anyway" -msgstr "強制的に連結。" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:61 -msgid "" -"The selected ways have differing relation memberships. Do you still want to " -"combine them?" -msgstr "" -"選択したウェイは、それぞれ異なった関連へ含まれています。それでも、結合します" -"か？" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70 +msgstr "複数のウェイを一つに結合" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 msgid "Change directions?" msgstr "方向を変更しますか?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Reverse and Combine" -msgstr "逆転して接続" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73 +msgstr "逆転して結合" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 msgid "" "The ways can not be combined in their current directions. Do you want to " "reverse some of them?" -msgstr "ウエイは現在の方向で結合できません。一方の方向にそろえますか？" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:80 +msgstr "ウェイは現在の方向で結合できません。一方の方向にそろえますか？" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 msgid "" "Could not combine ways (They could not be merged into a single string of " "nodes)" msgstr "" -"ウエイを結合できません（これらをノードの一列として統合することができません）" - -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:202 +"ウェイを結合できません（これらをノードの一列として統合することができません）" + +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 #, java-format msgid "Combine {0} ways" msgstr "{0}ウェイを結合" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 msgid "Please select at least two ways to combine." -msgstr "結合する少なくとも二つのウエイを選択してください。" +msgstr "結合する少なくとも二つのウェイを選択してください。" #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32 @@ -718,5 +700,5 @@ "three nodes." msgstr "" -"２つないしは３つのノード、または２つないしは３つのノードをもつ一つのウエイだ" +"２つないしは３つのノード、または２つないしは３つのノードをもつ一つのウェイだ" "け、を選択してください。" @@ -727,6 +709,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -791,5 +772,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 @@ -810,8 +791,9 @@ msgid "Download primitives referring to one of the selected primitives" msgstr "" +"選択したプリミティブの一つを参照しているプリミティブをダウンロードします。" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38 msgid "Download referrers..." -msgstr "" +msgstr "参照をダウンロード..." #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:122 @@ -820,5 +802,4 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307 #, java-format msgid "There were {0} conflicts during import." @@ -836,5 +817,4 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283 msgid "Duplicate" @@ -865,10 +845,10 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:209 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "GPXにエクスポート" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:208 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "データをGPXファイルにエクスポートします。" @@ -879,8 +859,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -945,5 +925,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 @@ -968,6 +948,6 @@ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''." msgstr "" -"OSMデータレイヤーかGPXレイヤーのインスタンスであると期待しています。 " -"''{0}''を得ました。" +"OSMデータレイヤーかGPXレイヤーのインスタンスが予期されています。 入力値: " +"''{0}''。" #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 @@ -988,6 +968,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1077,23 +1056,23 @@ msgstr "現在のレイヤーを他のレイヤーに結合" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge Nodes" msgstr "ノードの結合" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 msgid "Merge nodes into the oldest one." msgstr "一番古いものにノードをマージします。" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 msgid "Please select at least two nodes to merge." -msgstr "結合する少なくとも二つのウエイを選択してください。" - -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189 +msgstr "結合する少なくとも二つのウェイを選択してください。" + +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" "ノードを結合できません：使用しているウェイを削除しないとけなくなります。" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 #, java-format msgid "Merge {0} nodes" @@ -1151,5 +1130,5 @@ #, java-format msgid "Move {0}" -msgstr "移動 {0}" +msgstr "{0} を移動" #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56 @@ -1165,5 +1144,4 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350 msgid "New" msgstr "新規" @@ -1307,5 +1285,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23 msgid "Redo the last undone action." -msgstr "最後に戻した処理を再度行います。" +msgstr "最後に取り消した操作を再度行います。" #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36 @@ -1343,10 +1321,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "保存" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "最新データを保存します。" @@ -1403,10 +1381,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "名前をつけて保存…" #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "現在のデータを新規ファイルに保存" @@ -1450,5 +1428,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:961 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888 @@ -1482,15 +1460,15 @@ "way also." msgstr[0] "" -"一つ以上のウエイが、あなたの選択したこのノードを使っています。ウエイも選択し" +"一つ以上のウェイが、あなたの選択したこのノードを使っています。ウェイも選択し" "てください。" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 msgid "The selected nodes do not share the same way." -msgstr "選択したノードは同じウエイで共有されていません。" +msgstr "選択したノードは同じウェイで共有されていません。" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." -msgstr[0] "選択したウエイは選択したノードをつかって構成されていません。" +msgstr[0] "選択したウェイは選択したノードをつかって構成されていません。" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236 @@ -1498,6 +1476,5 @@ msgid "You must select two or more nodes to split a circular way." msgstr "" -"円形につながったのウエイの分割には、二つ以上のノードを選択する必要がありま" -"す。" +"円形につながったウェイの分割には、二つ以上のノードを選択する必要があります。" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257 @@ -1506,5 +1483,5 @@ "middle of the way.)" msgstr "" -"ウエイは選択したノードで分割できません（ヒント：ウエイの真ん中のノードを選択" +"ウェイは選択したノードで分割できません（ヒント：ウェイの真ん中のノードを選択" "する）" @@ -1632,5 +1609,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23 msgid "Undo the last action." -msgstr "最後の操作を戻します" +msgstr "最後の操作を取り消します" #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17 @@ -1661,6 +1638,6 @@ msgid "Updates the current data layer from the server (re-downloads data)" msgstr "" -"サーバーからの新しいデーターで、データーレイヤーのデーターを更新する。(デー" -"ターの再ダウンロード)" +"サーバーからの新しいデータで、データレイヤーのデーターを更新する。(データの再" +"ダウンロード)" #. bounds defined? => use the bbox downloader @@ -1690,5 +1667,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." -msgstr "更新用に選択されたプリミティブはありません。" +msgstr "更新用に" #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 @@ -1696,14 +1673,14 @@ msgstr "選択は空です" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117 msgid "Upload to OSM..." msgstr "OSMにアップロード" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116 msgid "Upload all changes to the OSM server." msgstr "OSMサーバにすべての変更をアップロードします。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:138 #, java-format msgid "" @@ -1714,23 +1691,23 @@ "さい。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 msgid "Nothing to upload. Get some data first." msgstr "アップロードするものがありません。最初にデータを取得してください。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:171 msgid "No changes to upload." msgstr "アップロードする変更はありません。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223 #, java-format msgid "Synchronize {0} {1} only" msgstr "{0} {1} だけを同期" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 msgid "Synchronize entire dataset" msgstr "データセット全体を同期" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:228 #, java-format msgid "" @@ -1752,17 +1729,17 @@ "リックしてください。
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:239 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:279 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:283 msgid "Conflict detected" msgstr "競合が検出されました" #. should not happen -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:257 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 #, java-format msgid "Unexpected return value. Got {0}." msgstr "予期せぬ値が返って来ました。 {0} を受けとりました。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:272 #, java-format msgid "" @@ -1778,5 +1755,5 @@ "てください。
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:306 #, java-format msgid "" @@ -1785,36 +1762,45 @@ "again with a new or an existing open changeset." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310 +"アップロードが 失敗しました。 なぜならば、あなたが
" +"チェンジセット {0} を使用しています。それはすでに {1} に閉じられましたので、" +"
もう一度新規か既に開いているチェンジセットをアップロードしてください。" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314 msgid "Changeset closed" msgstr "変更セットは閉じられました" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 #, java-format msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "警告: エラーヘッダ \"{0}\" は期待されたパターン {1} に一致しません" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:372 -#, java-format -msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -msgstr "エラー　ヘッダ \"{0}\" は期待パターン \"{1}\" に一致しません" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:421 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:425 #, java-format msgid "Uploading failed.
{0}" msgstr "アップロード 失敗。
{0}" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:434 msgid "Upload to OSM API failed" msgstr "OSM API へのアップロード失敗" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:453 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457 msgid "Updating primitive" msgstr "プリミティブ更新中" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:509 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:514 #, java-format msgid "Uploading data for layer ''{0}''" msgstr "レイヤー ''{0}'' へデータをアップロード中" + +#. we tried to delete an already deleted primitive. +#. +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92 +#, java-format +msgid "" +"Warning: primitive ''{0}'' is already deleted on the server. Skipping this " +"primitive and retrying to upload." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1902,13 +1888,13 @@ msgstr "ゆっくり再生" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34 msgid "Downloading GPS data" msgstr "GPSデータをダウンロード中" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57 msgid "Downloaded GPX Data" msgstr "ダウンロードされたGPXデータ" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87 msgid "Raw GPS data" msgstr "生のGPSデータ" @@ -1923,4 +1909,9 @@ "Ignoring exception because download has been cancelled. Exception was: {0}" msgstr "ダウンロードがキャンセルされたので例外を無視します。例外の内容: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 +#, fuzzy +msgid "No data found in this area." +msgstr "デバイスにデータがありません" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2044,13 +2035,13 @@ msgid "Insert new node into way." msgid_plural "Insert new node into {0} ways." -msgstr[0] "新規ノードを {0}このウエイに追加します。" +msgstr[0] "新規ノードを {0}このウェイに追加します。" #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949 msgid "Start new way from last node." -msgstr "新規ウエイを最後に操作したノードから開始" +msgstr "新規ウェイを最後に操作したノードから開始" #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951 msgid "Continue way from last node." -msgstr "最後に操作したノードからウエイを継続" +msgstr "最後に操作したノードからウェイを継続" #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963 @@ -2070,5 +2061,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251 msgid "Extrude Way" -msgstr "ウエイの延長" +msgstr "ウェイの延長" #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264 @@ -2213,5 +2204,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "find in selection" -msgstr "" +msgstr "選択範囲の中から見つける" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 @@ -2281,13 +2272,13 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "modified - all changed objects" -msgstr "変更済み - すべての変更されたオブジェクト" +msgstr "変更済み - 変更されたオブジェクトすべて" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "selected - all selected objects" -msgstr "選択- すべての選択されたオブジェクト" +msgstr "選択- 選択されたオブジェクトすべて" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "incomplete - all incomplete objects" -msgstr "未完了 - すべての未完了のオブジェクト" +msgstr "不完全 - すべての不完全なオブジェクト" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 @@ -2323,5 +2314,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 msgid "Filter" -msgstr "フィルタ" +msgstr "フィルター" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 @@ -2356,5 +2347,5 @@ #, java-format msgid "Nothing find in selection by searching for ''{0}''" -msgstr "" +msgstr "''{0}'' を探した結果何も見つからなかった" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 @@ -2408,5 +2399,5 @@ #, java-format msgid "Unexpected token: {0}" -msgstr "想定外のトークン: {0}" +msgstr "予想外のトークン: {0}" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:532 @@ -2488,4 +2479,6 @@ "{1}" msgstr "" +"警告：削除されたプリミティブ {1} のタグ\"{0}\"の値が、自動的に切り詰められま" +"す。" #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84 @@ -2500,5 +2493,5 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 msgid "Precondition Violation" -msgstr "" +msgstr "前提条件違反" #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99 @@ -2633,11 +2626,11 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54 -#, fuzzy, java-format +#, java-format msgid "" "Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for " "primitive ''{1}''." msgstr "" -"警告: レイヤー ''{0}'' は既に存在しません。プリミティブ ''{1}'' の競合を解消" -"できません" +"警告: レイヤー ''{0}'' は既に存在しません。元の ''{1}'' への競合は取り除けま" +"せん。" #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70 @@ -2646,9 +2639,9 @@ msgstr "''{0}'' に競合を追加" -#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:251 -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 -msgid "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 +#, fuzzy, java-format +msgid "" +"Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" "コマンド ''{0}'' はレイヤー {1} がすでに表示されていないので取り消せません" @@ -2694,5 +2687,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Delete from relation" msgstr "関連から削除" @@ -2748,14 +2741,15 @@ msgstr[0] "{0} のノードを移動" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162 -msgid "Purging 1 primitive" -msgstr "1 つのプリミティブを破棄" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187 -#, java-format -msgid "removing reference from way {0}" -msgstr "ウェイ {0}から、参照を取り除く" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:195 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 +#, fuzzy, java-format +msgid "Purged object ''{0}''" +msgstr "オブジェクト{0}を移動" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 +#, fuzzy, java-format +msgid "Purged {0} objects" +msgstr "{0}このオブジェクトを変更" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 #, java-format msgid "" @@ -2766,7 +2760,7 @@ "{1} です。" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:203 -#, java-format -msgid "removing reference from relation {0}" +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 +#, fuzzy, java-format +msgid "Removing reference from relation {0}" msgstr "リレーション {0}から、参照を除きます。" @@ -2775,4 +2769,10 @@ msgid "Resolve conflicts in member list of relation {0}" msgstr "リレーション {0} のメンバーリスト内の競合を解決" + +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +msgid "" +"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" +msgstr "" +"コマンド ''{0}'' はレイヤー {1} がすでに表示されていないので取り消せません" #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69 @@ -3084,10 +3084,10 @@ msgctxt "filter" msgid "E" -msgstr "" +msgstr "東" #. column header: hide filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 msgid "H" -msgstr "" +msgstr "H" #. column header: filter text @@ -3099,15 +3099,15 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 msgid "C" -msgstr "" +msgstr "C" #. column header: inverted filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 msgid "I" -msgstr "" +msgstr "I" #. column header: filter mode #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148 msgid "M" -msgstr "" +msgstr "M" #. translators notes must be in front @@ -3115,41 +3115,41 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206 msgid "R" -msgstr "" +msgstr "R" #. filter mode: add #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207 msgid "A" -msgstr "" +msgstr "A" #. filter mode: remove #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208 msgid "D" -msgstr "" +msgstr "D" #. filter mode: in selection #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 msgid "F" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +msgstr "F" + +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Error: {0}" msgstr "Error: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:100 #, java-format msgid "Warning: {0}" msgstr "Warning: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "ID >= 0 である必要があります。 {0} を受け取りました" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 msgid "A primitive with ID = 0 can't be invisible." msgstr "id=0 のプリミティブは非表示にできません" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3157,5 +3157,5 @@ msgstr "ID > 0 である必要があります。 {0} を受け取りました" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3183,7 +3183,9 @@ "multiple values." msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230 +"タグコレクションをプリミティブに適用できません。複数の値を持つキーがありま" +"す。" + +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:224 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:244 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3233,5 +3235,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249 msgid "Area style way is not closed." -msgstr "領域を指定するウエイが閉じていません。" +msgstr "領域を指定するウェイが閉じていません。" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482 @@ -3240,120 +3242,113 @@ msgstr "マルチポリゴンのウェイ \"{0}\"は閉じていません。" -#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed -#. TODO Remove useless nullcheck when RelationMember.member is encalupsed -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855 -msgid "Empty member in relation." -msgstr "リレーションに登録すべきものがありません。" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:850 #, java-format msgid "Deleted member ''{0}'' in relation." msgstr "メンバー \"{0}\"を関連から削除" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:596 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:861 #, java-format msgid "Way ''{0}'' with less than two points." -msgstr "ウエイ\"{0}\"は二つ未満のポイントです。" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604 +msgstr "ウェイ\"{0}\"は二つ未満のポイントです。" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601 msgid "More than one \"from\" way found." msgstr "二つ以上の\"from\"ウェイがあります。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:607 msgid "More than one \"to\" way found." msgstr "二つ以上の\"to\"ウェイがあります。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:613 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:627 msgid "More than one \"via\" found." msgstr "経由地が複数有ります。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:632 #, java-format msgid "Unknown role ''{0}''." msgstr "不明なロール\"{0}\"です。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635 #, java-format msgid "Unknown member type for ''{0}''." msgstr "{0}のメンバーのタイプが不明" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:641 msgid "No \"from\" way found." msgstr "\"from\"ウェイが見つかりません" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645 msgid "No \"to\" way found." msgstr "\"to\"ウェイが見つかりません" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:649 msgid "No \"via\" node or way found." -msgstr "経由地かウエイが見つかりません。" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661 +msgstr "経由地かウェイが見つかりません。" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:658 msgid "The \"from\" way doesn't start or end at a \"via\" node." msgstr "\"from\"ウェイは、\"via\"ノードで開始または終了していません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:662 msgid "The \"to\" way doesn't start or end at a \"via\" node." -msgstr "\"to\"のウエイは\"via\"のノードで始まったり終わったりしません。" +msgstr "\"to\"のウェイは\"via\"のノードで始まったり終わったりしません。" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689 +msgid "The \"from\" way doesn't start or end at the \"via\" way." +msgstr "\"from\" のウェイは\"via\"のウェイで始まったり終わったりしません。" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693 -msgid "The \"from\" way doesn't start or end at the \"via\" way." -msgstr "\"from\" のウエイは\"via\"のウエイで始まったり終わったりしません。" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697 msgid "The \"to\" way doesn't start or end at the \"via\" way." -msgstr "\"to\"のウエイは\"via\"のウエイで始まったり終わったりしません。" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820 +msgstr "\"to\"のウェイは\"via\"のウェイで始まったり終わったりしません。" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816 #, java-format msgid "Style for restriction {0} not found." msgstr "制約条件{0}のスタイルがありません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:870 #, java-format msgid "No useful role ''{0}'' for Way ''{1}''." msgstr "ウェイ\"{1}\"に有効なロール\"{0}\"がありません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:882 #, java-format msgid "Non-Way ''{0}'' in multipolygon." msgstr "マルチポリゴンにウェイではない\"{0}\"があります。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:940 #, java-format msgid "No outer way for multipolygon ''{0}''." msgstr "マルチポリゴン用の外側のウェイが ''{0}'' にありません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1029 #, java-format msgid "Intersection between ways ''{0}'' and ''{1}''." -msgstr "ウエイ \"{0}\"と\"{1}\"の交差する点" - -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048 +msgstr "ウェイ \"{0}\"と\"{1}\"の交差する点" + +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1041 #, java-format msgid "Inner way ''{0}'' is outside." msgstr "内部のウェイ ''{0}''が外側にあります。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1094 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "マルチポリゴンと等しい、内側のウェイ ''{0}'' 用のスタイル。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1120 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "外側のウェイ ''{0}''のスタイルが合いません。" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1324 msgid "untagged" msgstr "タグ付いていない" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1325 msgid "text" msgstr "テキスト" @@ -3378,5 +3373,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:249 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 @@ -3386,5 +3381,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:537 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 @@ -3411,5 +3406,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:169 msgid "background" msgstr "背景" @@ -3421,9 +3416,9 @@ #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 msgid "WGS84 Geographic" -msgstr "" +msgstr "WGS84測地系 緯度経度座標" #: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:215 msgid "Gauss-Laborde Réunion 1947" -msgstr "" +msgstr "ガウス-ラボルド会議1947" #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 @@ -3464,13 +3459,13 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 msgid "UTM20N Guadeloupe Fort-Marigot 1949" -msgstr "" +msgstr "UTM20N (仏領)グアドループ海外県 マリゴ市 1949" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 msgid "UTM20N Guadeloupe Ste-Anne 1948" -msgstr "" +msgstr "UTM20N (仏領)グアドループ海外県 Sainte-Anne 市 1948" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 msgid "UTM20N Martinique Fort Desaix 1952" -msgstr "" +msgstr "UTM20N (仏領)マルティニーク海外県 Fort Desaix 市 1952" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46 @@ -3507,5 +3502,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3168 msgid "railway" msgstr "鉄道" @@ -3559,9 +3554,14 @@ msgstr "不正な要求" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 +#, fuzzy +msgid "Not Found" +msgstr "接続していません" + +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 msgid "Unknown host" msgstr "不明なホスト" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:231 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:247 msgid "Primitive already deleted" msgstr "プリミティブは削除済み" @@ -3718,5 +3718,5 @@ "通知: いくつかのタスクで、JOSMに は多くのメモリが必要です。下記の追加が必要で" "す\n" -" 確保されたメモリの最大サイズを増やすJava オプション" +" Javaの使用メモリ最大サイズを増やすオプション" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119 @@ -3871,4 +3871,6 @@ "this list with the mouse.
" msgstr "" +"繰り返すには再び真中をクリックしてください。
CTRL キーを押しつづけるとマ" +"ウスでこの表から直接選べます。" #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 @@ -3888,5 +3890,5 @@ #, java-format msgid "Layer ''{0}'' must be in list of layers" -msgstr "レイヤー ''{0}'' はレーヤーのリスト中になければなりません" +msgstr "レイヤー ''{0}'' はレイヤーのリスト中になければなりません" #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76 @@ -3925,5 +3927,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17 msgid "My with Their" -msgstr "" +msgstr "自分と相手" #. * @@ -3932,5 +3934,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22 msgid "My with Merged" -msgstr "" +msgstr "自分と統合版" #. * @@ -3939,5 +3941,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27 msgid "Their with Merged" -msgstr "" +msgstr "相手と統合版" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82 @@ -3995,6 +3997,6 @@ "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:180 @@ -4015,6 +4017,6 @@ "relation" msgstr "" -"結合されたメンバーリストが固定されました。このリレーションのメンバーリストに" -"は保留中の競合はありません。" +"結合されたメンバーリストを固定しました。このリレーションのメンバーリストには" +"保留中の競合はありません。" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 @@ -4040,5 +4042,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 msgid "Conflict Resolution" -msgstr "衝突の解決" +msgstr "競合の解決" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 @@ -4057,5 +4059,5 @@ #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." -msgstr "パラメータ \"index\" におかしな値。入力値: {0}" +msgstr "パラメータ \"index\" に予期せぬ値。入力値: {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 @@ -4085,5 +4087,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 msgid "Merged version" -msgstr "結合されたバージョン" +msgstr "結合したバージョン" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 @@ -4092,6 +4094,6 @@ "decisions are applied." msgstr "" -"結合された要素のリスト。結合の決定が適用された時、相手は自分の要素を置換する" -"でしょう。" +"結合した要素のリスト。結合が適用されると、あなたの編集した要素は置き換えられ" +"るでしょう。" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 @@ -4110,5 +4112,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 msgid "Copy my selected nodes to the start of the merged node list" -msgstr "自分の選択したノードを結合されたノードリストの先頭にコピー" +msgstr "選択したノードを結合されたノードリストの先頭にコピー" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 @@ -4118,5 +4120,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 msgid "Copy my selected elements to the end of the list of merged elements." -msgstr "自分の選択した要素を結合された要素リストの最後にコピー" +msgstr "選択した要素を結合された要素リストの最後にコピー" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 @@ -4125,5 +4127,5 @@ "merged elements." msgstr "" -"自分の選択した要素を、結合された要素リストの最初に選択された要素の前にコピー" +"選択した要素を、結合された要素リストから選択している最初の要素の前にコピー" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 @@ -4132,5 +4134,5 @@ "merged elements." msgstr "" -"自分の選択した要素を、結合された要素リストの最初に選択された要素の後にコピー" +"選択した要素を、結合された要素リストから選択している最初の要素の後にコピー" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 @@ -4234,5 +4236,5 @@ msgid "Merged version ({0} entry)" msgid_plural "Merged version ({0} entries)" -msgstr[0] "結合されたバージョン ({0} エントリ)" +msgstr[0] "結合したバージョン ({0} エントリ)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 @@ -4249,4 +4251,5 @@ "adjustment." msgstr "" +"調整可能な {0} がまだ登録されていません。同期された調整に参加設定できません。" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 @@ -4254,5 +4257,5 @@ #, java-format msgid "Adjustable {0} not registered yet." -msgstr "" +msgstr "調整可能な {0} はまだ登録されていませんでした。" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27 @@ -4262,6 +4265,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 msgid "Merged nodes not frozen yet. Can't build resolution command." -msgstr "" -"結合されたノードがまだ固定されていません。解決コマンドをビルドできません" +msgstr "結合したノードがまだ固定されていません。解決コマンドをビルドできません" #. should not happen @@ -4269,5 +4271,5 @@ #, java-format msgid "Unexpected column index. Got {0}." -msgstr "おかしなカラムインデックス。入力値: {0}" +msgstr "予期せぬカラムインデックス。入力値: {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 @@ -4358,5 +4360,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63 msgid "deleted" -msgstr "削除された" +msgstr "削除しました" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 @@ -4473,6 +4475,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:120 msgid "Merged nodes not frozen yet. Can't build resolution command" -msgstr "" -"結合されたノードはまだ固定されていません。解決コマンドをビルドできません" +msgstr "結合したノードはまだ固定されていません。解決コマンドをビルドできません" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 @@ -4741,10 +4742,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58 msgid "Replace the way this member refers to with the combined way" -msgstr "このメンバーが参照しているウェイを統合するウェイと置き換えてください。" +msgstr "このメンバーが参照しているウェイを結合するウェイと置き換えてください。" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62 msgid "Undecided" -msgstr "未確定" +msgstr "未決定" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42 @@ -4891,8 +4892,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 msgid "Filter objects and hide/disable them." -msgstr "オブジェクトにフィルタをかけ、非表示/無効にします。" +msgstr "オブジェクトにフィルターをかけ、非表示/無効にします。" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -4943,5 +4944,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 msgid "Inverse filter" -msgstr "" +msgstr "反転フィルター" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 @@ -5012,5 +5013,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145 msgid "Open a list of all loaded layers." -msgstr "全ての読み込んだレイヤのリストを開きます" +msgstr "全ての読み込んだレイヤーのリストを開きます" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 @@ -5106,43 +5107,43 @@ msgstr "メンバー" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 msgid "Add Properties" msgstr "プロパティの追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 msgid "Add a new key/value pair to all objects" msgstr "すべてのオブジェクトに新しいキー/値をペアで追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 msgid "Edit Properties" msgstr "プロパティの編集" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 msgid "Edit the value of the selected key for all objects" msgstr "すべてのオブジェクトの選択したキーの値の編集" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "プロパティ: {0} / メンバー: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 msgid "Properties / Memberships" msgstr "プロパティ/メンバー" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 msgid "Change relation" msgstr "関連の変更" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 #, java-format msgid "Really delete selection from relation {0}?" msgstr "本当に関連{0}から選択分を削除しますか？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:855 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 msgid "Delete the selected key in all objects" msgstr "すべてのオブジェクトの選択したキーの削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 msgid "Delete Properties" msgstr "プロパティの削除" @@ -5152,6 +5153,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168 -#: build/trans_presets.java:3121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176 +#: build/trans_presets.java:3133 msgid "Relations" msgstr "リレーション" @@ -5161,25 +5162,30 @@ msgstr "全てのリレーションのリストを開く" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:174 #, java-format msgid "Relations: {0}" msgstr "リレーション: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284 msgid "Open an editor for the selected relation" msgstr "選択したリレーションの編集画面を開く" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:325 msgid "Delete the selected relation" msgstr "選択したリレーションを削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:363 msgid "Create a new relation" msgstr "新規リレーション作成" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:400 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280 msgid "Create a copy of this relation and open it in another editor window" msgstr "このリレーションのコピーを作成し、他のエディタウィンドウで開く" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 +#, fuzzy +msgid "Set the current selection to the list of selected relations" +msgstr "現在選択されているリレーションを編集" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5194,5 +5200,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 msgid "Zoom to selected element(s)" -msgstr "選択したエレメントのズーム" +msgstr "選択した要素にズーム" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 @@ -5220,9 +5226,9 @@ msgstr "選択: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:442 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 msgid "Undock the panel" msgstr "パネルの取り外し" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5231,5 +5237,5 @@ "ます。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 msgid "Click to minimize/maximize the panel content" msgstr "クリックすることでパネルの内容を最小化/最大化" @@ -5547,5 +5553,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 msgid "Download all incomplete ways and nodes in relation" -msgstr "この関連の全ての未完成のウェイとノードをダウンロード" +msgstr "リレーション中の全ての不完全なウェイとノードをダウンロード" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 @@ -5610,5 +5616,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 msgid "Refers to" -msgstr "" +msgstr "参照先" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 @@ -5623,5 +5629,5 @@ #, java-format msgid "Value of child.getId() > 0 expected. Got {1}." -msgstr "" +msgstr "child.getId() の値 > 0 であるべきです。入力値: {1}。" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 @@ -5632,5 +5638,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63 msgid "including immediate children of parent relations" -msgstr "" +msgstr "直接の親子関係を含む" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93 @@ -5763,5 +5769,5 @@ #. group "Geography" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226 -#: build/trans_presets.java:2759 +#: build/trans_presets.java:2771 msgid "Places" msgstr "地名" @@ -5906,5 +5912,5 @@ msgid "" "Failed to set reference. Reference ID {0} does not match history ID {1}." -msgstr "" +msgstr "参照の設定に失敗。参照ID {0} は履歴ID {1} と一致しません。" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185 @@ -5924,4 +5930,5 @@ "history." msgstr "" +"現在のプリミティブの設定に失敗。現在のバージョン {0} は履歴で使用できません。" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34 @@ -6439,6 +6446,4 @@ #. item "Man Made/Windmill" label "Edit Windmill" #. -#. item "Man Made/Pipeline" label "Edit Pipeline" -#. #. item "Man Made/Wastewater Plant" label "Edit Wastewater Plant" #. @@ -6451,4 +6456,6 @@ #. item "Man Made/Surveillance" label "Edit Surveillance Camera" #. +#. item "Man Made/Power Station" label "Edit Power Station" +#. #. item "Amenities/Fountain" label "Edit Fountain" #. @@ -6773,57 +6780,57 @@ #: build/trans_presets.java:2250 build/trans_presets.java:2258 #: build/trans_presets.java:2290 build/trans_presets.java:2295 -#: build/trans_presets.java:2300 build/trans_presets.java:2305 -#: build/trans_presets.java:2311 build/trans_presets.java:2317 -#: build/trans_presets.java:2323 build/trans_presets.java:2331 -#: build/trans_presets.java:2337 build/trans_presets.java:2343 -#: build/trans_presets.java:2349 build/trans_presets.java:2355 -#: build/trans_presets.java:2365 build/trans_presets.java:2462 -#: build/trans_presets.java:2469 build/trans_presets.java:2483 -#: build/trans_presets.java:2489 build/trans_presets.java:2496 -#: build/trans_presets.java:2503 build/trans_presets.java:2509 -#: build/trans_presets.java:2515 build/trans_presets.java:2537 -#: build/trans_presets.java:2544 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2305 build/trans_presets.java:2310 +#: build/trans_presets.java:2316 build/trans_presets.java:2322 +#: build/trans_presets.java:2339 build/trans_presets.java:2345 +#: build/trans_presets.java:2351 build/trans_presets.java:2357 +#: build/trans_presets.java:2363 build/trans_presets.java:2373 +#: build/trans_presets.java:2380 build/trans_presets.java:2474 +#: build/trans_presets.java:2481 build/trans_presets.java:2495 +#: build/trans_presets.java:2501 build/trans_presets.java:2508 +#: build/trans_presets.java:2515 build/trans_presets.java:2521 +#: build/trans_presets.java:2527 build/trans_presets.java:2549 +#: build/trans_presets.java:2556 build/trans_presets.java:2563 +#: build/trans_presets.java:2569 build/trans_presets.java:2576 #: build/trans_presets.java:2582 build/trans_presets.java:2588 -#: build/trans_presets.java:2594 build/trans_presets.java:2601 -#: build/trans_presets.java:2608 build/trans_presets.java:2615 -#: build/trans_presets.java:2621 build/trans_presets.java:2627 +#: build/trans_presets.java:2594 build/trans_presets.java:2600 +#: build/trans_presets.java:2606 build/trans_presets.java:2613 +#: build/trans_presets.java:2620 build/trans_presets.java:2627 #: build/trans_presets.java:2633 build/trans_presets.java:2639 -#: build/trans_presets.java:2645 build/trans_presets.java:2652 -#: build/trans_presets.java:2659 build/trans_presets.java:2666 -#: build/trans_presets.java:2672 build/trans_presets.java:2678 -#: build/trans_presets.java:2688 build/trans_presets.java:2697 -#: build/trans_presets.java:2712 build/trans_presets.java:2718 -#: build/trans_presets.java:2726 build/trans_presets.java:2733 -#: build/trans_presets.java:2753 build/trans_presets.java:2764 -#: build/trans_presets.java:2770 build/trans_presets.java:2776 +#: build/trans_presets.java:2645 build/trans_presets.java:2651 +#: build/trans_presets.java:2657 build/trans_presets.java:2664 +#: build/trans_presets.java:2671 build/trans_presets.java:2678 +#: build/trans_presets.java:2684 build/trans_presets.java:2690 +#: build/trans_presets.java:2700 build/trans_presets.java:2709 +#: build/trans_presets.java:2724 build/trans_presets.java:2730 +#: build/trans_presets.java:2738 build/trans_presets.java:2745 +#: build/trans_presets.java:2765 build/trans_presets.java:2776 #: build/trans_presets.java:2782 build/trans_presets.java:2788 -#: build/trans_presets.java:2795 build/trans_presets.java:2802 -#: build/trans_presets.java:2809 build/trans_presets.java:2815 -#: build/trans_presets.java:2821 build/trans_presets.java:2829 -#: build/trans_presets.java:2836 build/trans_presets.java:2843 -#: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2879 build/trans_presets.java:2885 +#: build/trans_presets.java:2794 build/trans_presets.java:2800 +#: build/trans_presets.java:2807 build/trans_presets.java:2814 +#: build/trans_presets.java:2821 build/trans_presets.java:2827 +#: build/trans_presets.java:2833 build/trans_presets.java:2841 +#: build/trans_presets.java:2848 build/trans_presets.java:2855 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2875 build/trans_presets.java:2882 #: build/trans_presets.java:2891 build/trans_presets.java:2897 -#: build/trans_presets.java:2903 build/trans_presets.java:2912 -#: build/trans_presets.java:2922 build/trans_presets.java:2931 -#: build/trans_presets.java:2937 build/trans_presets.java:2943 -#: build/trans_presets.java:2948 build/trans_presets.java:2954 -#: build/trans_presets.java:2960 build/trans_presets.java:2969 -#: build/trans_presets.java:2975 build/trans_presets.java:2981 +#: build/trans_presets.java:2903 build/trans_presets.java:2909 +#: build/trans_presets.java:2915 build/trans_presets.java:2924 +#: build/trans_presets.java:2934 build/trans_presets.java:2943 +#: build/trans_presets.java:2949 build/trans_presets.java:2955 +#: build/trans_presets.java:2960 build/trans_presets.java:2966 +#: build/trans_presets.java:2972 build/trans_presets.java:2981 #: build/trans_presets.java:2987 build/trans_presets.java:2993 #: build/trans_presets.java:2999 build/trans_presets.java:3005 -#: build/trans_presets.java:3012 build/trans_presets.java:3018 -#: build/trans_presets.java:3023 build/trans_presets.java:3030 -#: build/trans_presets.java:3037 build/trans_presets.java:3043 -#: build/trans_presets.java:3052 build/trans_presets.java:3060 -#: build/trans_presets.java:3066 build/trans_presets.java:3072 -#: build/trans_presets.java:3079 build/trans_presets.java:3085 -#: build/trans_presets.java:3092 build/trans_presets.java:3098 +#: build/trans_presets.java:3011 build/trans_presets.java:3017 +#: build/trans_presets.java:3024 build/trans_presets.java:3030 +#: build/trans_presets.java:3035 build/trans_presets.java:3042 +#: build/trans_presets.java:3049 build/trans_presets.java:3055 +#: build/trans_presets.java:3064 build/trans_presets.java:3072 +#: build/trans_presets.java:3078 build/trans_presets.java:3084 +#: build/trans_presets.java:3091 build/trans_presets.java:3097 #: build/trans_presets.java:3104 build/trans_presets.java:3110 -#: build/trans_presets.java:3116 build/trans_presets.java:3129 -#: build/trans_presets.java:3143 build/trans_presets.java:3157 +#: build/trans_presets.java:3116 build/trans_presets.java:3122 +#: build/trans_presets.java:3128 build/trans_presets.java:3141 +#: build/trans_presets.java:3155 build/trans_presets.java:3169 msgid "Name" msgstr "名前" @@ -6835,4 +6842,6 @@ "{2} in changeset {3}" msgstr "" +"バージョン {0} は変更セット {3} の " +"{2} によって {1} 上で作成された" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -6886,5 +6895,4 @@ msgstr "変更セットを閉じる" -#. putValue(SMALL_ICON, ImageProvider.get("cancel")); #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103 msgid "Close the selected open changesets" @@ -6906,5 +6914,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Launch a file chooser to select a file" -msgstr "" +msgstr "ファイルを選ぶためにファイル選択を起動してください" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 @@ -6912,15 +6920,15 @@ msgstr "ファイル名を選択" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "Yes" msgstr "はい" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "No" msgstr "いいえ" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:48 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47 #, java-format msgid "Layer ''{0}'' has modifications which should be uploaded to the server." @@ -6928,10 +6936,10 @@ "レイヤー ''{0}'' は修正されていますのでサーバにアップロードしてください。" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49 #, java-format msgid "Layer ''{0}'' has no modifications to be uploaded." -msgstr "レイヤー ''{0}'' にはアップロードする変更がありません。" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61 +msgstr "レイヤー ''{0}'' にはアップロードする修正がありません。" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60 #, java-format msgid "" @@ -6939,25 +6947,25 @@ "''{1}''." msgstr "" -"レイヤー ''{0}'' にはその関連ファイル ''{1}'' に保存すべき変更があります。" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63 +"レイヤー ''{0}'' にはその関連ファイル ''{1}'' に保存すべき修正があります。" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62 #, java-format msgid "Layer ''{0}'' has no modifications to be saved." -msgstr "レイヤー ''{0}'' には保存すべき変更はありません。" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81 +msgstr "レイヤー ''{0}'' には保存すべき修正はありません。" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80 msgid "No file associated with this layer" msgstr "このレイヤーには関連するファイルがありません" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:83 msgid "Please select a file" msgstr "ファイルを選択してください" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:86 #, java-format msgid "Layer ''{0}'' is not backed by a file" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102 +msgstr "レイヤー ''{0}'' はファイルによって戻されていない" + +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:101 #, java-format msgid "File ''{0}'' is not writable. Please enter another file name." @@ -6965,9 +6973,9 @@ "ファイル ''{0}'' には書き込めません。他のファイル名を入力してください。" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:116 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:115 #, java-format msgid "Select to upload layer ''{0}'' to the server ''{1}''" -msgstr "" +msgstr "''{1}'' サーバにアップロードするレイヤー ''{0}'' を選択してください。" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:49 @@ -6997,5 +7005,5 @@ "discard the modifications.
Layers with conflicts:" msgstr[0] "" -"{0} レイヤーに未解決の競合があります。
最初に解決するか改変を無視し" +"{0} レイヤーに未解決の競合があります。
最初に解決するか修正を破棄し" "てください。
競合のあるレイヤー:" @@ -7015,5 +7023,5 @@ msgstr[0] "" "{0} レイヤーは保存が必要ですが関連するファイルがありません。
このレ" -"イヤー用のファイルを選択するか変更を無視してください。
ファイルの無いレイ" +"イヤー用のファイルを選択するか変更を破棄してください。
ファイルの無いレイ" "ヤー:" @@ -7034,10 +7042,10 @@ msgstr[0] "" "{0} レイヤーは保存が必要ですが
書き込み不可の
関連するファイルが" -"あります。
このレイヤー用の他のファイルを選択するか変更を無視してくださ" +"あります。
このレイヤー用の他のファイルを選択するか変更を破棄してくださ" "い。
書き込み不可のファイルのあるレイヤー:" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243 msgid "Unsaved data non-writable files" -msgstr "" +msgstr "書き込み不可なファイルのためデータはセーブされませんでした" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285 @@ -7062,5 +7070,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -msgid "Save and Exit" +#, fuzzy +msgid "Save/Upload and Exit" msgstr "保存して終了" @@ -7070,10 +7079,11 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -msgid "Save and Delete" +#, fuzzy +msgid "Save/Upload and Delete" msgstr "保存と削除" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 msgid "Save/Upload layers before deleting. Unsaved changes are not lost." -msgstr "削除前に保存/アップロード。未保存の変更は失われます。" +msgstr "削除前にレイヤーを保存/アップロード。未保存の変更は失われます。" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402 @@ -7083,7 +7093,8 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481 +#, fuzzy msgid "" "An upload and/or save operation of one layer with modifications
was " -"cancelled or has been failed." +"cancelled or has failed." msgstr "" "修正されたひとつのレイヤーのアップロード、保存操作は
キャンセルされ" @@ -7092,5 +7103,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491 msgid "Incomplete upload and/or save" -msgstr "アップロード、保存未完了" +msgstr "不完全なアップロードと保存" #. item "Streets/Motorway" text "Name" @@ -7171,6 +7182,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:891 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:921 msgid "Tags of new changeset" msgstr "新しい変更セットのタグ" @@ -7264,9 +7275,8 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722 msgid "Select to close the changeset after the next upload" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922 +msgstr "次回アップロード後に閉じる「変更セット」を選択" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:909 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:933 #, java-format msgid "Tags of changeset {0}" @@ -7274,48 +7284,48 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:949 msgid "Load the list of your open changesets from the server" msgstr "自分の開いた変更セットのリストをサーバからロード" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:963 msgid "Close the currently selected open changeset" msgstr "現在選択済みの開かれた変更セットを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1011 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 #, java-format msgid "Changeset ID > 0 expected. Got {0}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63 +msgstr "変更セットID > 0 であるべきです。入力値: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106 msgid "Preparing primitives to upload ..." msgstr "プリミティブアップロード準備中" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "{0} のイメージ" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "GPXの読み込み…" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:303 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "地点 {0} x {1}に時刻がありません" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:308 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "時刻 \"{0}\"を地点 {1}×{2} から読み取ることができませんでした" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:321 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325 msgid "No images with readable timestamps found." msgstr "読み取り可能な時刻のついた画像が見つかりませんでした。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format @@ -7323,29 +7333,29 @@ msgstr "{0}を読み込んでいます ..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:402 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246 msgid "Geotagged Images" msgstr "ジオタグのついた画像" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:587 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 #, java-format msgid "GPS start: {0}" msgstr "GPS開始: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592 #, java-format msgid "GPS end: {0}" msgstr "GPS終了: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594 #, java-format msgid "current delta: {0}s" msgstr "現在の差分: {0} 秒" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595 msgid "timezone difference: " msgstr "タイムゾーンの違い: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284 msgid "image" @@ -7353,14 +7363,14 @@ msgstr[0] "画像" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621 #, java-format msgid "{0} within the track." msgstr "トラック内に {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680 msgid "Sync clock" msgstr "時計の同期" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -7368,32 +7378,32 @@ msgstr "JPEGイメージ(*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:734 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "ファイル \"{0}\"中の日付が取得できません。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "ファイル\"{0}\"にEXIFの時刻情報がありません。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 msgid "Image" msgstr "画像" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:752 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "写真の日付を入力(mm/dd/yyyy HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759 msgid "GPS unit timezone (difference to photo)" msgstr "GPSユニットのタイムゾーン(写真の時間との違い)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:767 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771 msgid "Synchronize Time with GPS Unit" msgstr "時刻をGPSユニットと同期する" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:790 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 msgid "Time entered could not be parsed." msgstr "入力した時刻は、解釈できません" @@ -7477,5 +7487,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:159 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 #, java-format msgid "Name: {0}" @@ -7497,5 +7507,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142 -#: build/trans_presets.java:3160 +#: build/trans_presets.java:3172 msgid "Description" msgstr "説明" @@ -7503,9 +7513,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 msgid "Timespan" -msgstr "" +msgstr "時間間隔" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 msgid "Length" -msgstr "" +msgstr "長さ" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -7550,5 +7560,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:587 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207 @@ -7612,45 +7622,66 @@ "time were omitted." msgstr "" -"ウエイポイントの一部にトラックから遠すぎて、時間を推測出来ないものがあり、除" +"ウェイポイントの一部にトラックから遠すぎて、時間を推測出来ないものがあり、除" "外します。" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:105 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:107 #, java-format msgid "Data Layer {0}" -msgstr "データーレイヤー {0}" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:171 +msgstr "データレイヤー {0}" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 msgid "outside downloaded area" msgstr "ダウンロード領域の外" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:252 #, java-format msgid "version {0}" msgstr "バージョン {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:289 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:290 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389 +msgstr "警告 : バージョン 0.5 に 0.5 と 0.6 のデータが混ざっている" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 +#, fuzzy, java-format +msgid "There was {0} conflict detected." +msgid_plural "There were {0} conflicts detected." +msgstr[0] "インポートした内容には {0} の競合があります。" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 +#, java-format +msgid "" +"{0} object has been purged from the local dataset because it is deleted on " +"the server." +msgid_plural "" +"{0} objects have been purged from the local dataset because they are deleted " +"on the server." +msgstr[0] "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 +#, fuzzy +msgid "Conflicts detected" +msgstr "競合が検出されました" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 #, java-format msgid "{0} consists of:" msgstr "{0}は次からなります:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:476 #, java-format msgid " ({0} deleted.)" msgstr " ({0}は削除されました)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 msgid "unset" msgstr "設定解除" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:480 #, java-format msgid "API version: {0}" msgstr "APIバージョン: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:501 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:584 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204 msgid "Convert to GPX layer" @@ -7662,4 +7693,7 @@ "
If you want to upload traces, look here:" msgstr "" +"処理していない GPS データを地図データとしてアップロードすることは有害だ" +"と考えられる。
もし、トレースデータをアップロードしたいなら、コチラを見" +"よ :" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159 @@ -7667,6 +7701,5 @@ msgid "track" msgid_plural "tracks" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "トラック" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 @@ -7742,5 +7775,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343 msgid "No existing audio markers in this layer to offset from." -msgstr "このレイヤには、開始オフセットを指すオーディオマーカーがありません。" +msgstr "このレイヤーには、開始オフセットを指すオーディオマーカーがありません。" #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 @@ -7858,9 +7891,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39 msgid "Explicit waypoints with valid timestamps." -msgstr "有効なタイムスタンプによる明示的なウエイポイント" +msgstr "有効なタイムスタンプによる明示的なウェイポイント" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40 msgid "Explicit waypoints with time estimated from track position." -msgstr "トラック位置から時間推定による明示的なウエイポイント" +msgstr "トラック位置から時間推定による明示的なウェイポイント" #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41 @@ -7901,5 +7934,5 @@ "layer." msgstr "" -"自動的にマーカーレイヤーを、GPXレイヤーを開いたときにウエイポイントから作成す" +"自動的にマーカーレイヤーを、GPXレイヤーを開いたときにウェイポイントから作成す" "る。" @@ -7919,5 +7952,5 @@ "waypoints) with names or descriptions." msgstr "" -"（explicitウエイポイントではなく）自動的にトラックポイントからオーディオマー" +"（explicitウェイポイントではなく）自動的にトラックポイントからオーディオマー" "カーを作成し、名前と説明を付加する。" @@ -7980,5 +8013,5 @@ #, java-format msgid "Layer: {0}" -msgstr "レイヤ{0}" +msgstr "レイヤー: {0}" #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 @@ -8008,5 +8041,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:412 #: ../plugins/terracer/src/terracer/TerracerAction.java:430 @@ -8035,4 +8068,6 @@ msgid "Draw a circle form HDOP value." msgstr "" +"HDOP（Horizontal Dilution of Precision: 垂直精度劣化度） の値の円を描いてくだ" +"さい" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46 @@ -8270,5 +8305,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252 msgid "Draw virtual nodes in select mode for easy way modification." -msgstr "ウェイの変更が容易になるように、選択モードで仮想ノードを描く。" +msgstr "ウェイの修正が容易になるように、選択モードで仮想ノードを描く。" #. background layers in inactive color @@ -8636,5 +8671,15 @@ "doing so may result in conflicts, as there is no way for JOSM to know that " "Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard...

" -msgstr "

" +msgstr "" +"

次ページのキー選択一覧は全種類のJava が知りうるあらゆるキーボードをリスト" +"しており、あなたのキーボード上にあるキーではないことにご注意ください。あなた" +"のキーボード上にある実際のキーに対応する値だけを使用してください。もしあなた" +"のキーボードに 'Copy' キーが無い場合 (PC キーボードにはありません、Sun のキー" +"ボードにはあります)、使用しないでください。 また、あなたのキーボード上の" +"ショーツカットに対応するリストされた'key' もあります。(例： ':'/Colon)。これ" +"も同様に使わないでください。代わりにベースキー(US キーボードの';'/" +"Semicolon 、ドイツキーボードの '.'/Period 、...) を使ってください。そうしない" +"と競合を引き起こす場合があります。JOSM には Ctrl+Shift+; and Ctrl+: がUS キー" +"ボードでは実際には同じことだと知る手立てが無いのです...

" #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:177 @@ -8654,4 +8699,9 @@ "already taken, it will assign a random shortcut instead.

" msgstr "" +"

最終ページはJOSM が自動的にショートカットに割り当てる修飾を一覧表示してい" +"ます。4種のショートカットごとに3つの代替案があります。JOSM は競合を管理する" +"際、リスト順にこれらの代替案を試します。全ての代替案が既に割り当てられた" +"ショートカットになった場合、代わりにランダムなショートカットを割り当てます。" +"

" #: ../core/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java:183 @@ -8746,5 +8796,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:246 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261 msgid "More information about this feature" msgstr "この機能の詳細情報" @@ -8793,5 +8843,5 @@ msgstr "タイプ{0}の要素がサポートされます" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:700 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -8800,18 +8850,18 @@ msgstr[0] "{0}このオブジェクトを変更" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:693 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "何も選択されていません！" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:695 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 msgid "Selection unsuitable!" msgstr "選択が適切ではありません！" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:703 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 msgid "Apply Preset" msgstr "プリセットの適用" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788 msgid "Change Properties" msgstr "プロパティを変更する" @@ -8820,5 +8870,5 @@ #, java-format msgid "Preset group ''{0}'' of group ''{1}''" -msgstr "" +msgstr "プリセットのグループ ''{1}'' のグループ ''{0}''" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -8879,5 +8929,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77 msgid "Add author information" -msgstr "著者情報の追加" +msgstr "作者情報の追加" #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80 @@ -9073,5 +9123,5 @@ #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." -msgstr "おかしな形式のID がサーバから返されました。入力値: ''{0}''" +msgstr "予想外の形式のID がサーバから返されました。入力値: ''{0}''" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279 @@ -9080,5 +9130,5 @@ "Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''." msgstr "" -"変更されたプリミティブ ''{0}'' の新しいバージョンにおかしな形式。入力値: " +"変更されたプリミティブ ''{0}'' の新しいバージョンに予期せぬ形式。入力値: " "''{1}''" @@ -9105,47 +9155,49 @@ msgstr "変更した設定を閉じています..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 msgid "No changeset present for diff upload." msgstr "diffアップロードのための変更セットを用意できませんでした。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 msgid "Preparing..." msgstr "準備中..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 msgid "Uploading..." msgstr "アップロード中..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 msgid "Waiting 10 seconds ... " msgstr "10秒待機中 ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "{2} 秒で {1} 分の {0} 回の再試行を開始 ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 msgid "OK - trying again." msgstr "OK - やり直しています。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 #, java-format msgid "Starting retry {0} of {1}." msgstr "{1} 分の {0} 回の再試行を開始。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 msgid "Current changeset is null. Can't upload data." msgstr "現在の変更セットはヌルです。データをアップロードできません。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626 +msgstr "現在の変更セットのID > 0 でなければなりません。現在のID: {0}." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." msgstr "" +"開かれた変更セットであるべきです。ID {0} の閉じられた変更セットを受け取りまし" +"た。" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 @@ -9189,15 +9241,15 @@ #, java-format msgid "Illegal value for attribute ''{0}''. Got ''{1}''." -msgstr "" +msgstr "属性 ''{0}'' に不正な値。入力値: ''{1}''。" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81 #, java-format msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''." -msgstr "" +msgstr "属性 ''{0}'' に不正な数値。入力値: ''{1}''。" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115 #, java-format msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''." -msgstr "" +msgstr "属性 ''{0}'' に不正なブール値。入力値: ''{1}''。" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 @@ -9205,5 +9257,5 @@ #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." -msgstr "" +msgstr "XML 要素 {1} の必須属性 ''{0}'' が見つかりません。" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 @@ -9375,27 +9427,30 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 -#, java-format +#, fuzzy, java-format msgid "" "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}''," -"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." -msgstr "" +"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." +msgstr "" +"要素 ''bounds'' に必要な属性が見つかりません。入力値: minlon=''{0}''," +"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''。" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 msgid "Found XML element not as direct child of element ." -msgstr "" +msgstr " 要素を直接引き継いでない XML 要素の が見つかった。" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." -msgstr "" +msgstr "ウェイ {1} の上に必要な属性 ''{0}'' がありません。" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." -msgstr "" +msgstr "要素 の属性 ''ref'' に不正な値。入力値: {0}。" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 msgid "Found XML element not as direct child of element ." msgstr "" +"要素 の直接の子要素でないXML 要素 が見つかりました。" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 @@ -9450,4 +9505,6 @@ "API version is ''{3}''. Got {1}." msgstr "" +"要素 {0} の ''version'' 属性の値を {2} に正常化します、API バージョンは " +"''{3}''。入力値: {1}。" #. should not happen. API version has been checked before @@ -9477,4 +9534,5 @@ "Way with external ID ''{0}'' includes missing node with external ID ''{1}''." msgstr "" +"外部ID ''{0}'' のウェイは外部ID ''{1}'' の存在しないノードを含んでいます。" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431 @@ -9484,4 +9542,6 @@ "missing in the loaded data and is therefore incomplete too." msgstr "" +"{1} ノードのウェイ {0} は不完全です。ロードされたデータに少なくとひとつのノー" +"ドが見つからないため、不完全です。" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479 @@ -9493,9 +9553,11 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490 -#, java-format -msgid "" -"Relation with external id ''{0}'' refers to missing primitive with external " -"id ''{1}''." -msgstr "" +#, fuzzy, java-format +msgid "" +"Relation with external id ''{0}'' refers to a missing primitive with " +"external id ''{1}''." +msgstr "" +"外部ID ''{0}'' のリレーションは外部ID ''{1}'' の存在しないプリミティブを参照" +"しています。" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531 @@ -9571,5 +9633,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48 msgid "XML tag is missing." -msgstr "" +msgstr "XML タグ がありません。" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53 @@ -9579,5 +9641,5 @@ #, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''." -msgstr "" +msgstr "XML タグ ''{1}'' の属性 ''{0}'' がありません。" #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -9587,21 +9649,21 @@ #, java-format msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72 +msgstr "XML タグ ''{1}'' の属性 ''{0}'' に不正な値。入力値: {2}。" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:73 msgid "Starting to upload with one request per primitive ..." msgstr "プリミティブ単位にひとつのリクエストでアップロードを開始 ..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})" msgstr "{0}% ({1}/{2}), 残り {3} 。ノード ''{4}'' をアップロード中(ID: {5})" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})" msgstr "{0}% ({1}/{2}), 残り {3} 。ウェイ ''{4}'' をアップロード中(ID: {5})" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83 #, java-format msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})" @@ -9609,13 +9671,18 @@ "{0}% ({1}/{2}), 残り {3} 。リレーション ''{4}'' をアップロード中(ID: {5})" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115 msgid "Starting to upload in one request ..." msgstr "ひとつのリクエストでアップロード開始..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 +#, fuzzy, java-format +msgid "Parameter ''{0}'' must not be null" +msgstr "パラメータ ''{0}'' はヌルでなければなりません" + +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 msgid "Uploading data ..." msgstr "データアップロード中 ..." -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148 msgid "" "WARNING: no API version defined for data to upload. Falling back to version " @@ -9625,5 +9692,5 @@ "0.6 にフォールバックします。" -#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147 +#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:153 #, java-format msgid "" @@ -9631,4 +9698,6 @@ "use diff uploads, but API is not able to handle them. Ignoring diff upload." msgstr "" +"警告: 設定 ''{0}'' またはデータセットのAPI バージョン ''{1}'' では差分アップ" +"ロードの使用が必須ですが、API は取扱えません。差分アップロードを無視します。" #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42 @@ -9851,5 +9920,5 @@ #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:202 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:324 build/trans_presets.java:325 @@ -9871,6 +9940,6 @@ #: build/trans_presets.java:789 build/trans_presets.java:1333 #: build/trans_presets.java:1400 build/trans_presets.java:1401 -#: build/trans_presets.java:1402 build/trans_presets.java:2453 -#: build/trans_presets.java:2454 build/trans_presets.java:2455 +#: build/trans_presets.java:1402 build/trans_presets.java:2465 +#: build/trans_presets.java:2466 build/trans_presets.java:2467 msgid "unknown" msgstr "不明な" @@ -9921,5 +9990,5 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57 msgid "Unexpected Exception" -msgstr "予期しない例外" +msgstr "予想外の例外" #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68 @@ -10035,5 +10104,14 @@ msgstr "
エラーメッセージ(未訳): {0}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:192 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:182 +#, java-format +msgid "" +"The OSM server ''{0}'' doesn't know about an object
you tried to read, " +"update, or delete. Either the respective object
doesn''t exist on the " +"server or you''re using an invalid URL to access
it. Please carefully " +"check the servers address ''{1}'' for typos." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:209 #, java-format msgid "" @@ -10046,5 +10124,5 @@ "てください。" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:262 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:279 #, java-format msgid "" @@ -10135,4 +10213,6 @@ "geometry from preferences." msgstr "" +"キー ''{0}'' の設定は ''{1}'' を含んでいません。設定から window geometry を復" +"元できません。" #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110 @@ -10142,4 +10222,6 @@ "{2}. Can''t restore window geometry from preferences." msgstr "" +"キー ''{0}'' の設定は ''{1}'' にint 値を与えていません。入力値: {2}。設定か" +"ら window geometry を復元できません。" #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112 @@ -10149,4 +10231,6 @@ "{2}. Can''t restore window geometry from preferences." msgstr "" +"キー ''{0}'' の設定中のフィールド ''{1}'' の解析に失敗しました。例外コード: " +"{2}。設定から window geometry を復元できません。" #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119 @@ -10156,4 +10240,6 @@ "from preferences." msgstr "" +"キー ''{0}'' の設定が存在しません。設定から window geometry を復元できませ" +"ん。" #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158 @@ -10163,4 +10249,6 @@ "default geometry. Details: {1}" msgstr "" +"キー ''{0}'' からの window geometry の復元に失敗しました。デフォルトの" +"geometry にフォールバックします。詳細: {1}" #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 @@ -10174,5 +10262,5 @@ msgstr "" "既存の複数ノードもつ2つのウェイとその交点に基づき、ノードを碁盤の目として、格" -"子状のウエイ構造をつくります。" +"子状のウェイ構造をつくります。" #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53 @@ -10190,13 +10278,13 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:59 msgid "Private (only shared as anonymous, unordered points)" -msgstr "" +msgstr "プライベート (不特定のポイントを匿名で共有する)" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:60 msgid "Public (shown in trace list and as anonymous, unordered points)" -msgstr "" +msgstr "公開 (トレースリストと不特定のポイントを匿名で公開する)" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:61 msgid "Trackable (only shared as anonymous, ordered points with timestamps)" -msgstr "" +msgstr "トラッカブル (指定のポイントとタイムスタンプを匿名で共有する)" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:62 @@ -10205,4 +10293,6 @@ "timestamps)" msgstr "" +"識別公開 (トレースリストの指定ポイントとタイムスタンプを自身によるものとして" +"公開する)" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106 @@ -10306,5 +10396,5 @@ #: build/trans_presets.java:2278 msgid "Address Interpolation" -msgstr "アドレスの補完" +msgstr "アドレスの補間" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25 @@ -10313,17 +10403,15 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:35 msgid "Define Address Interpolation" msgstr "アドレス補間を定義" -#. Whether to re-trigger data changed for relation #. NOTE: The following 2 arrays must match in number of elements and position #. Tag values for map -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:414 msgid "Odd" msgstr "奇数" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 #: ../plugins/terracer/src/terracer/TerracerAction.java:413 #: ../plugins/terracer/src/terracer/TerracerAction.java:437 @@ -10331,99 +10419,99 @@ msgstr "偶数" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:88 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 msgid "Alphabetic" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160 +msgstr "アルファベット順" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161 #, java-format msgid "Relation: {0}" msgstr "リレーション: {0}" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:172 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173 msgid "Associate with street using:" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183 +msgstr "ストリート利用と関連付ける:" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184 msgid "Numbering Scheme:" msgstr "ナンバリングスキーム:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:186 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 msgid "Starting #:" msgstr "開始番号:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188 msgid "Ending #:" msgstr "終了番号:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:240 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255 #, java-format msgid "Will associate {0} additional house number nodes" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:286 +msgstr "{0} 付加番地に関連付ける" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 msgid "City:" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:287 +msgstr "市区:" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 msgid "State:" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288 +msgstr "都道府県:" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 msgid "Post Code:" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:289 +msgstr "郵便番号:" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 msgid "Country:" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:290 +msgstr "国" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 msgid "Full Address:" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:325 +msgstr "フルアドレス:" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 msgid "Optional Information:" msgstr "オプション情報" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:512 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 msgid "Please select a street to associate with address interpolation way" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:525 +msgstr "アドレス補間ウェイと関連付けるストリートを選択してください" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 msgid "Please select address interpolation way for this street" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:631 +msgstr "このストリートのアドレス補間ウェイを選択してください" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 msgid "Expected odd numbers for addresses" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:636 +msgstr "奇数番号のアドレスが期待されている" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 msgid "Expected even numbers for addresses" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:652 +msgstr "偶数番号のアドレスが期待されている" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 msgid "Country code must be 2 letters" msgstr "国コードは2文字でなければなりません" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:790 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 msgid "Please enter valid number for starting and ending address" msgstr "開始および終了アドレスに正しい値を入力してください" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:796 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 msgid "Alphabetic address must end with a letter" msgstr "アルファベットのアドレスは文字で終了しなければなりません" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:801 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 msgid "Starting address letter must be less than ending address letter" msgstr "開始アドレス文字は終了アドレス文字よりも小さくなければなりません" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:817 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 msgid "Please enter valid number for starting address" msgstr "開始アドレスに正しい数字を入力してください" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:820 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 msgid "Please enter valid number for ending address" msgstr "終了アドレスに正しい数字を入力してください" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:827 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 msgid "Starting address number must be less than ending address number" msgstr "開始アドレスの数字は終了アドレスの数字よりも小さくなければなりません" @@ -10530,5 +10618,5 @@ #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47 msgid "Load set of images as a new layer." -msgstr "新規レイヤとして画像セットを読み込む." +msgstr "新規レイヤーとして画像セットを読み込む." #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:130 @@ -10799,5 +10887,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386 msgid "Select Feuille" -msgstr "" +msgstr "用紙選択" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:128 @@ -10834,4 +10922,6 @@ "or action canceled" msgstr "" +"町/市 {0} が見つからないか利用できません。\n" +"又はキャンセルされました。" #. this below is a temporary workaround to fix the "always on top" issue @@ -10861,8 +10951,11 @@ "Would you like to restore F11 for grab action ?" msgstr "" +"プラグイン cadastre-fr は取得キーのショートカット F11をこれまで使用しており\n" +"これは現在デフォルトでフルスクリーンスイッチに割り当てられています。\n" +"F11 を取得アクションに戻しますか？" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199 msgid "Restore grab shortcut F11" -msgstr "" +msgstr "F11 を取得ショートカットに戻す" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:204 @@ -10875,4 +10968,6 @@ "Warning: failed to put option pane dialog always on top. Exception was: {0}" msgstr "" +"警告: オプションペインダイアログを常時トップに表示するのに失敗しました。例外" +"コード: {0}" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29 @@ -10895,5 +10990,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:174 msgid "Disable image cropping during georeferencing." -msgstr "" +msgstr "地理参照中にイメージ切り抜きを無効化" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50 @@ -10914,4 +11009,9 @@ "by this plugin." msgstr "" +"フランス cadastre wms (www.cadastre.gouv.fr) の特別なハンドラ

このプラ" +"グインで作成されたデータをアップロードする前に、こちらの利用許諾条件を読んで" +"ください (フランス語):
http://www.cadastre.gouv.fr/scpc/html/" +"CU_01_ConditionsGenerales_fr.html" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66 @@ -10921,5 +11021,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 msgid "Value of key \"source\" when autosourcing is enabled" -msgstr "" +msgstr "可能な場合、キー \"source\" の値を自動化" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 @@ -10943,5 +11043,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92 msgid "Allows multiple layers stacking" -msgstr "複数レイヤの重ね合わせを許可します。" +msgstr "複数レイヤーの重ね合わせを許可します。" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97 @@ -10956,10 +11056,10 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:115 msgid "Vector images grab multiplier:" -msgstr "" +msgstr "ベクタイメージ取得倍率:" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:130 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Grab smaller images (higher quality but use more memory)" -msgstr "より小さい画像を指定してください。(より高品質だがメモリ)" +msgstr "より小さい画像を取得してください。(より高品質だがよりメモリを使う)" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:138 @@ -10973,5 +11073,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167 msgid "Raster images grab multiplier:" -msgstr "" +msgstr "ラスタイメージ取得倍率:" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:194 @@ -11003,5 +11103,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159 msgid "Create buildings" -msgstr "ビルの作成" +msgstr "建物の作成" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264 @@ -11017,4 +11117,5 @@ msgid "Please, enable auto-sourcing and check cadastre millesime." msgstr "" +"自動ソース作成を有効にし、土地台帳-レジストリビンテージをチェックしてください" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63 @@ -11043,4 +11144,6 @@ "Use the normal Cadastre Grab menu." msgstr "" +"市区町村がベクトル化されました！\n" +"通常のCadastre 取得メニューを使用。" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:20 @@ -11074,12 +11177,15 @@ "projections and retry" msgstr "" +"現在の投影法を cadastre 投影法のひとつに\n" +"変更して cadastre WMS plugin を有効化し、\n" +"やり直してください" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:47 msgid "Grab non-georeferenced image" -msgstr "" +msgstr "非地理参照画像を取得" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:68 msgid "Georeferencing interrupted" -msgstr "" +msgstr "地理参照は割り込みされた" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:157 @@ -11088,13 +11194,15 @@ "(two points required)" msgstr "" +"イメージを切り抜く最初の角をクリック \n" +"(二箇所必要)" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:158 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:177 msgid "Image cropping" -msgstr "" +msgstr "イメージ切り抜き" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:176 msgid "Click second corner for image cropping" -msgstr "" +msgstr "切り抜くイメージの二番目の角をクリック" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:196 @@ -11103,13 +11211,15 @@ "(two points required)" msgstr "" +"最初の地理参照用ランベルトcrosspiece をクリック\n" +"（２つのポイントが必要）" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:197 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:216 msgid "Image georeferencing" -msgstr "" +msgstr "地理参照画像" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:215 msgid "Click second Lambert crosspiece for georeferencing" -msgstr "" +msgstr "２番目の地理参照用ランベルトcrosspiece をクリック" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:233 @@ -11123,26 +11233,26 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:249 msgid "Enter cadastre east,north position" -msgstr "" +msgstr "cadastre の東、北の位置を入力" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:250 msgid "(Warning: verify north with arrow !!)" -msgstr "" +msgstr "(警告: 矢印のある北を確認！)" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:252 msgid "East" -msgstr "" +msgstr "東経" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:253 msgid "North" -msgstr "" +msgstr "北緯" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266 #, java-format msgid "Set {0} Lambert coordinates" -msgstr "" +msgstr "{0} ランベルト座標にセット" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25 msgid "Set manually the Lambert zone (e.g. for locations between two zones)" -msgstr "" +msgstr "ランベルトzone を手動設定 (例：２つのゾーン間の位置用)" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 @@ -11175,4 +11285,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:52 +#: build/trans_presets.java:2331 msgid "Location" msgstr "ロケーション" @@ -11183,4 +11294,6 @@ "known by www.cadastre.gouv.fr ." msgstr "" +"町、村または市区の名前を入力してください。
文法や句読点はwww." +"cadastre.gouv.fr に従ってください。(フランス語の場合)" #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:70 @@ -11218,6 +11331,6 @@ "Select one of them first, then retry" msgstr "" -"More than one WMS layer present\n" -"Select one of them first, then retry" +"ひとつ以上のWMS レイヤーがあります\n" +"最初にそのひとつを選んで、やり直してください" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72 @@ -11256,4 +11369,6 @@ "Create a new one." msgstr "" +"サポートされないキャッシュファイルのバージョン; {0} が見つかりましたが、 {1} " +"であるべきです" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:369 @@ -11265,4 +11380,5 @@ msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" +"キャッシュのランベルトzone {0} は現在のランベルトzone {1} と互換がありません" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385 @@ -11344,5 +11460,5 @@ #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:21 msgid "Duplicate Way" -msgstr "ウエイの複製" +msgstr "ウェイの複製" #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:76 @@ -11373,5 +11489,5 @@ #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 msgid "Convert to GPX layer with anonymised time" -msgstr "匿名時間も含めたGPXレイヤへのコンバート" +msgstr "匿名時間も含めたGPXレイヤーへのコンバート" #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 @@ -11719,4 +11835,5 @@ msgstr "南東" +#. item "Man Made/Pipeline" combo "Type" #. color highway_track #. @@ -11762,7 +11879,7 @@ #. #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 -#: build/trans_style.java:990 build/trans_style.java:1007 -#: build/trans_style.java:1023 build/trans_style.java:3400 -#: build/trans_style.java:3408 +#: build/trans_presets.java:2330 build/trans_style.java:990 +#: build/trans_style.java:1007 build/trans_style.java:1023 +#: build/trans_style.java:3400 build/trans_style.java:3408 msgid "water" msgstr "水域(湖沼)" @@ -11857,4 +11974,6 @@ "
Lower values give more nodes, and more accurate lines. Default 0.0003." msgstr "" +"Douglas-Peucker ライン簡素化の精度、度数で計測されます。
低い値でノードや" +"正確なラインが増えます。 既定値 0.0003。" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73 @@ -11881,9 +12000,9 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78 msgid "Tag ways as water, coastline, land or nothing. Default is water." -msgstr "水域、海岸線、土地、あるいは なし としてタグ付け。デフォルトは水域。" +msgstr "水域、海岸線、陸地、あるいは なし としてタグ付け。デフォルトは水域。" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79 msgid "Which WMS layer to use for tracing against. Default is IR1." -msgstr "軌跡をたどるのにどのWMSレイヤを使用しますか。デフォルトは IR1です。" +msgstr "軌跡をたどるのにどのWMSレイヤーを使用しますか。デフォルトは IR1です。" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80 @@ -11980,5 +12099,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55 msgid "Center Once" -msgstr "" +msgstr "一回中央寄せ" #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54 @@ -11992,5 +12111,5 @@ #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68 msgid "Continuously center the LiveGPS layer to current position." -msgstr "" +msgstr "現在の位置にLiveGPSレイヤーを引き続き中央寄せする。" #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100 @@ -12053,51 +12172,51 @@ #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32 msgid "Michigan Left" -msgstr "" +msgstr "ミシガン左折" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32 msgid "Adds no left turn for sets of 4 or 5 ways." -msgstr "" +msgstr "4 または5のウェイのセットに左折禁止を追加。" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45 msgid "Please select 4 or 5 ways to assign no left turns." -msgstr "" +msgstr "左折禁止をアサインする4 または5のウェイを選んでください。" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 #, java-format msgid "{0} extrem nodes." -msgstr "" +msgstr "{0} 極値ノード。" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69 #, java-format msgid "Via node {0}, {1}" -msgstr "" +msgstr "経由ノード {0}, {1}" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75 #, java-format msgid "{0} via nodes." -msgstr "" +msgstr "{0} 経由ノード。" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78 msgid "Unable to find via nodes. Please check your selection" -msgstr "" +msgstr "経由ノードが見つかりません。選択をチェックしてください" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98 #, java-format msgid "MIddle way: {0}" -msgstr "" +msgstr "中間のウェイ: {0}" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121 msgid "Create Michigan left turn restriction" -msgstr "" +msgstr "ミシガン左折制限を作成" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129 #, java-format msgid "Processing {0}" -msgstr "" +msgstr "{0} 実行中" #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142 #, java-format msgid "Relation: from {0} to {1} via {2}" -msgstr "" +msgstr "リレーション: {0} から {1} まで {2} 経由" #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44 @@ -12191,4 +12310,6 @@ "comment:" msgstr "" +"この件を本当に''完了''としてマークしますか？

コメントを追加でき" +"ます:" #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64 @@ -12320,5 +12441,5 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226 msgid "Remote Control has been asked to create a new node." -msgstr "" +msgstr "リモート制御より新しいノードを作成するかどうか問合せがきました。" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238 @@ -12355,13 +12476,13 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73 msgid "Click to add destination." -msgstr "クリックして目標を追加。" +msgstr "クリックして行き先目標を追加。" #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88 msgid "Click and drag to move destination" -msgstr "クリック＆ドラッグして目標を移動" +msgstr "クリック＆ドラッグして行き先を移動" #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77 msgid "Click to remove destination" -msgstr "クリックして目標を削除。" +msgstr "クリックして行き先を削除。" #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68 @@ -12496,5 +12617,5 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 msgid "error requesting update: not zoom-level 12" -msgstr "" +msgstr "更新要求中にエラー: ズームレベル12 ではありません" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 @@ -12611,5 +12732,5 @@ #, java-format msgid "unexpected column number {0}" -msgstr "おかしなカラム番号 {0}" +msgstr "予想外のカラム番号 {0}" #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80 @@ -12617,5 +12738,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 msgid "Tagging Preset Tester" -msgstr "" +msgstr "タグ付けプリセットテスター" #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23 @@ -12623,4 +12744,5 @@ "Open the tagging preset test tool for previewing tagging preset dialogs." msgstr "" +"タグ付けプリセットテストを開いてタグ付けプリセットダイアログをプレビュー。" #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34 @@ -12630,13 +12752,13 @@ #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36 msgid "Reverse a terrace" -msgstr "" +msgstr "テラスを反転" #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38 msgid "Reverses house numbers on a terrace." -msgstr "テラスハウスの番号を逆にします。" +msgstr "テラスの番地を逆にします。" #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40 msgid "Reverse a Terrace" -msgstr "" +msgstr "テラスを反転" #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:113 @@ -12655,5 +12777,5 @@ #: ../plugins/terracer/src/terracer/TerracerAction.java:130 msgid "Select a single, closed way of at least four nodes." -msgstr "" +msgstr "最低4ノード以上の単一のクローズドウェイを選択" #: ../plugins/terracer/src/terracer/TerracerAction.java:199 @@ -12707,4 +12829,7 @@ "Are you really sure to continue?" msgstr "" +"選択されたウェイにはダウンロードされたデータ領域の外側にノードがあります。\n" +"これはノードを誤って削除する可能性があります。\n" +"本当に続けますか？" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:152 @@ -12715,5 +12840,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:166 msgid "Please select at least one closed way the should be joined." -msgstr "" +msgstr "結合させるクローズドノードを最低ひとつ選んでください。" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174 @@ -12735,5 +12860,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230 msgid "Joined self-overlapping area" -msgstr "" +msgstr "結合された自己重複エリア" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231 @@ -12820,9 +12945,9 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Simplify Way" -msgstr "ウエイの単純化" +msgstr "ウェイの単純化" #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34 msgid "Delete unnecessary nodes from a way." -msgstr "ウエイから不要なノードを削除してください。" +msgstr "ウェイから不要なノードを削除してください。" #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83 @@ -12880,5 +13005,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77 msgid "Use the error layer to display problematic elements." -msgstr "疑わしい要素を表示するために、エラーレイヤを使用" +msgstr "疑わしい要素を表示するために、エラーレイヤーを使用" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:80 @@ -12888,5 +13013,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81 msgid "Show the informational tests in the upload check windows." -msgstr "" +msgstr "アップロードチェックウィンドウのお知らせテストを表示" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:86 @@ -13019,5 +13144,5 @@ #, java-format msgid "Fixing ({0}/{1}): ''{2}''" -msgstr "" +msgstr "({0}/{1}) 修正中: ''{2}''" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501 @@ -13051,8 +13176,10 @@ "the same layer, but are not connected by a node." msgstr "" +"このテストではふたつの道路、鉄道、水路あるいは建物が同じレイヤーでクロスはし" +"ているがノードで接続されていないことをチェックします。" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125 msgid "Crossing buildings" -msgstr "" +msgstr "交差する建物" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:125 @@ -13080,5 +13207,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79 msgid "Duplicated ways" -msgstr "重複したウェイ" +msgstr "複製したウェイ" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60 @@ -13090,5 +13217,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144 msgid "Delete duplicate ways" -msgstr "重複したウェイを削除" +msgstr "複製したウェイを削除" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22 @@ -13265,5 +13392,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596 msgid "Validate that property keys are valid checking against list of words." -msgstr "" +msgstr "ワードのリストをチェックしてプロパティキーが正しいか検証。" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603 @@ -13273,5 +13400,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604 msgid "Validate property values and tags using complex rules." -msgstr "" +msgstr "混合ルールを使用しているプロパティの値とタグを検証" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 @@ -13288,4 +13415,6 @@ "org/index.php/User:JLS/speller) or tag checking data files." msgstr "" +"スペルチェックのソース(URL またはファイル名)(http://wiki.openstreetmap.org/" +"index.php/User:JLS/speller 参照) またはタグをチェックするデータファイル。" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 @@ -13307,5 +13436,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 msgid "Validate that property values are valid checking against presets." -msgstr "" +msgstr "プリセットをチェックしてプロパティの値が正しいか検証。" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 @@ -13335,9 +13464,9 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use default tag ignore file." -msgstr "" +msgstr "デフォルトタグを使用、ファイルを無視。" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742 msgid "Use the default tag ignore file (recommended)." -msgstr "" +msgstr "デフォルトタグを使用、ファイルを無視（推奨）。" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 @@ -13513,5 +13642,5 @@ #: build/trans_style.java:4187 msgid "building" -msgstr "ビル" +msgstr "建物" #. color building @@ -13543,5 +13672,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85 msgid "Way end node near other highway" -msgstr "ウエイは他の高速道路の近くでノードで終わっています。" +msgstr "ウェイは他の高速道路の近くでノードで終わっています。" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111 @@ -13555,5 +13684,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150 msgid "Connected way end node near other way" -msgstr "" +msgstr "他のウェイの近くに結合されたウェイ" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37 @@ -13602,5 +13731,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35 msgid "This test checks the direction of water, land and coastline ways." -msgstr "" +msgstr "このテストは水域、陸地および海岸線ウェイの方向をチェックします。" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:67 @@ -13623,5 +13752,5 @@ #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 msgid "Scanned Map..." -msgstr "" +msgstr "スキャンされた地図..." #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24 @@ -13633,15 +13762,15 @@ msgid "" "Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)" -msgstr "" +msgstr "walking-papers.org のURL またはID (URL中の ?id= の後のビット)を入力" #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70 #, java-format msgid "Could not read information from walking-papers.org the id \"{0}\"" -msgstr "" +msgstr "walking-papers.org からの情報を読み取れませんでした。idは \"{0}\"" #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60 #, java-format msgid "Walking Papers: {0}" -msgstr "" +msgstr "Walking Papers: {0}" #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67 @@ -13699,4 +13828,24 @@ "use." msgstr "" +"WMSplugin 設定タブのWMS エントリを追加、編集、削除できます - これはWMS メ" +"ニューに表示されます。\n" +"\n" +"高度な設定によって、次のスキーマを使うことで手動でも行えますできます:\n" +"wmsplugin.url.1.name=Landsat\n" +"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n" +"wmsplugin.url.2.name=NPE Maps... etc\n" +"\n" +"フル WMS URL 入力フォーマット例 (landsat)\n" +"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n" +"layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n" +"\n" +"Metacarta's 地図用Rectifier http://labs.metacarta.com/rectifier/ , 関連する " +"'id' を入力するだけです。\n" +"Metacarta 地図Rectifier メニューアイテムを追加するには、手動で下記例のような" +"URL を生成してください、73 のところはあなたの画像ID に置き換えます:\n" +"http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" +"&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" +"\n" +"お知らせ: 画像はコピーライト表示に従い、疑わしいものは使用しないでください。" #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53 @@ -13728,5 +13877,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111 msgid "Supported Rectifier Services:" -msgstr "" +msgstr "サポートされるRectifier サービス:" #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135 @@ -13769,5 +13918,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 msgid "Select WMS layer" -msgstr "WMSレイヤを選択" +msgstr "WMSレイヤーを選択" #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 @@ -13809,4 +13958,6 @@ "This may lead to wrong coordinates." msgstr "" +"URL中の投影法 ''{0}'' は現在の投影法 ''{1}'' と一致しません。\n" +"間違った座標にたどりつく可能性があります。" #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59 @@ -13826,10 +13977,10 @@ #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" -msgstr "WMS レイヤ ({0}), 自動的に倍率 {1} でダウンロード" +msgstr "WMS レイヤー ({0}), 自動的に倍率 {1} でダウンロード" #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" -msgstr "WMS レイヤ ({0}), 自倍率 {1} でダウンロード" +msgstr "WMS レイヤー ({0}), 自倍率 {1} でダウンロード" #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188 @@ -13841,4 +13992,7 @@ "tiles anyway?" msgstr "" +"このWMS レイヤー用のベースURL
''{0}''
の終わりに ''&'' や ''?'' " +"を付けてはなりません。
そうすると不正なWMSリクエストとなる場合があります。" +"設定を
チェックしてください。
強制的にWMS タイルを取得しますか？" #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:196 @@ -13878,5 +14032,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:361 msgid "Save WMS layer" -msgstr "WMS レイヤを保存" +msgstr "WMS レイヤーを保存" #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:385 @@ -13886,5 +14040,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:389 msgid "Load WMS layer" -msgstr "WMS レイヤをロード" +msgstr "WMS レイヤーをロード" #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 @@ -13903,5 +14057,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184 msgid "Open a blank WMS layer to load data from a file" -msgstr "ファイルからデータをロードするためのブランクWMSレイヤを開く" +msgstr "ファイルからデータをロードするためのブランクWMSレイヤーを開く" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45 @@ -13949,13 +14103,13 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171 msgid "Overlap tiles" -msgstr "" +msgstr "タイルをオーバーラップ" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172 msgid "% of east:" -msgstr "" +msgstr "東の %" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173 msgid "% of north:" -msgstr "" +msgstr "北の %" #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 @@ -14004,9 +14158,10 @@ msgid "You must make your edits public to upload new data" msgstr "" +"新しいデータをアップロードするには編集をパブリックにしなければなりません" #. Plugin AddrInterpolation #: build/trans_plugins.java:3 msgid "Group common Address Interpolation inputs in a single dialog," -msgstr "" +msgstr "グループ共通のアドレス補間をひとつのダイアログに入力します。" #. Plugin AgPifoJ @@ -14022,5 +14177,5 @@ #: build/trans_plugins.java:7 msgid "A special handler for the French land registry WMS server." -msgstr "" +msgstr "フランス土地台帳WMS server 用の特別なハンドラ。" #. Plugin colorscheme @@ -14033,9 +14188,13 @@ "true :-)" msgstr "" +"ユーザは異なる色スキームを作成し、切り替えることができます。色を変えて新しい" +"スキームを作成してください。明るい自然光の中で視認性を上げるには一致する色の" +"白い背景に切り替えるのに使われます。JOSMの設定にあるダイアログと 'Map " +"Settings' を参照してください(奇妙ですが本当です :-)" #. Plugin Create_grid_of_ways #: build/trans_plugins.java:11 msgid "Create a grid of ways." -msgstr "" +msgstr "ウェイのグリッドを作成。" #. Plugin czechaddress @@ -14043,5 +14202,5 @@ msgid "" "Creating and handling address nodes and buildings within Czech Republic." -msgstr "" +msgstr "チェコ共和国内のアドレスノードと建物を作成、取扱中です。" #. Plugin dataimport @@ -14057,11 +14216,11 @@ "openstreetmap.org." msgstr "" -"このプラグインは現在アクティブなJOSMレイヤのGPSトラックをopenstreetmap.orgへ" -"直接アップロードします。" +"このプラグインは現在アクティブなJOSMレイヤーのGPSトラックをopenstreetmap.org" +"へ直接アップロードします。" #. Plugin Duplicate-Way #: build/trans_plugins.java:19 msgid "Duplicate Ways with an offset" -msgstr "" +msgstr "オフセットのあるウェイを複製" #. Plugin editgpx @@ -14096,4 +14255,7 @@ "the filename of an image." msgstr "" +"画像をGPX ファイル内のウェイポイントと照合する別のプラグイン。照合はウェイポ" +"イントタグの 'name', 'cmt' または 'desc' 属性が画像のファイル名と一致したとき" +"に行われます。" #. Plugin lakewalker @@ -14121,5 +14283,5 @@ #: build/trans_plugins.java:37 msgid "Adds no left turn for sets of 4 or 5 ways" -msgstr "" +msgstr "4 または5のウェイのセットに左折禁止を追加" #. Plugin nearclick @@ -14130,4 +14292,7 @@ "mouse moving (general Java - tablet problem)." msgstr "" +"小さく短いドラッッグ時にクリックとみなします。これはタブレットペンを使用して" +"いて、マウス動作なしでタブレットをクリックするのに問題がある時に役に立ちま" +"す。（一般的な Java - タブレット問題）" #. Plugin openlayers @@ -14147,5 +14312,5 @@ msgid "" "Allows opening gpx/osm files that intersect the currently visible screen area" -msgstr "現在の表示スクリーンエリアに重なるgpx/osm ファイルのオープンを許可" +msgstr "現在の表示スクリーンエリアに交差するgpx/osm ファイルのオープンを許可" #. Plugin osmarender @@ -14169,5 +14334,5 @@ #: build/trans_plugins.java:51 msgid "The great JGoodies Plastic Look and Feel." -msgstr "" +msgstr "偉大なJGoodies のプラスティック風のルック＆フィール。" #. Plugin remotecontrol @@ -14182,4 +14347,7 @@ "defined in routes.xml file in plugin directory" msgstr "" +"ルートを描画（公共バス、ハイキングコース、サイクリングコース、..）。ルートの" +"タイプはplugin ディレクトリのroute.xml ファイルに定義されていなければなりませ" +"ん" #. Plugin routing @@ -14194,4 +14362,6 @@ "background and request updates." msgstr "" +"JOSM のスリッピーマップグリッドを表示。スリッピーマップからタイルを背景として" +"ロードし、更新を要求できます。" #. Plugin surveyor @@ -14212,4 +14382,7 @@ "the jar-file as standalone as well." msgstr "" +"ヘルプメニューにタグ付けプリセットテスターを追加します。これはタグ付けプリ" +"セットの手助けになります(ポップアップダイアログによるクイックレビュー)。jar " +"ファイルも同様にスタンドアロンとして起動できます。" #. Plugin terracer @@ -14224,4 +14397,6 @@ "jump to position." msgstr "" +"あなたの人生をより楽なものにする数種のユーティリティ: 例、ウェイ簡素化、エリ" +"ア結合、ポジションへのジャンプ" #. Plugin validator @@ -14240,9 +14415,11 @@ "plugin is still under early development and may be buggy." msgstr "" +"タイルのダウンロード、walking-papers.org からのスキャンされた地図のサポート。" +"このプラグインはまだ初期開発バージョンなのでバグ含みかもしれません。" #. Plugin waydownloader #: build/trans_plugins.java:75 msgid "Easy downloading along a long set of interconnected ways" -msgstr "" +msgstr "長い相互接続されたウェイのセットに沿って簡単にダウンロード" #. Plugin wmsplugin @@ -14250,5 +14427,5 @@ msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." -msgstr "" +msgstr "地理参照画像をJOSM の背景として表示（WMS サーバ、Yahoo,...）。" #.