Index: /applications/editors/josm/i18n/po/ar.po =================================================================== --- /applications/editors/josm/i18n/po/ar.po (revision 16492) +++ /applications/editors/josm/i18n/po/ar.po (revision 16493) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-12 13:56+0200\n" -"PO-Revision-Date: 2009-07-09 11:31+0000\n" +"POT-Creation-Date: 2009-07-14 18:01+0200\n" +"PO-Revision-Date: 2009-07-12 13:15+0000\n" "Last-Translator: AtomCell \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-07-12 11:51+0000\n" +"X-Launchpad-Export-Date: 2009-07-14 15:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -83,5 +83,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 @@ -212,9 +212,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 @@ -223,5 +223,5 @@ msgstr "التحذير" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 #, java-format msgid "" @@ -542,6 +542,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 @@ -711,5 +711,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -741,5 +741,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 @@ -907,5 +907,5 @@ #: ../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:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "New" msgstr "جديد" @@ -2109,31 +2109,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Expected closing parenthesis." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 #, java-format msgid "" @@ -2142,5 +2147,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -3245,5 +3250,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 @@ -3261,5 +3266,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3456,5 +3461,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 @@ -3748,5 +3753,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3793,5 +3798,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 @@ -3805,5 +3810,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -3875,5 +3880,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 @@ -4126,5 +4131,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 @@ -4169,34 +4174,34 @@ msgstr "الخصائص/ العضويات" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -msgid "Open an editor for the selected relation" -msgstr "إفتح محرر نص للعلاقة المحددة" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -msgid "Delete the selected relation" -msgstr "أمحي العلاقة المحددة" - #. item "Land use/Quarry" text "Name" #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 #: build/trans_presets.java:2967 msgid "Relations" msgstr "العلاقات" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 msgid "Open a list of all relations." msgstr "إفتح لائحة بكل العلاقات." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Create a new relation" msgstr "أنشئ علاقة جديدة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 #, java-format msgid "Relations: {0}" msgstr "العلاقات: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 +msgid "Open an editor for the selected relation" +msgstr "إفتح محرر نص للعلاقة المحددة" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 +msgid "Delete the selected relation" +msgstr "أمحي العلاقة المحددة" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 @@ -4290,88 +4295,88 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 msgid "Apply Changes" msgstr "طبّق التغيرات" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 msgid "Basic" msgstr "الأساسي" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "Occupied By" msgstr "المشغول من" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "linked" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move Up" msgstr "حرّك إلى الأعلى" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move the currently selected members up" msgstr "حرّك الأعضاء المختارة حالياً إلى الأعلى" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Add Selected" msgstr "أضف الإختيار" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 msgid "Add all currently selected objects as members" msgstr "أضف كلّ الأغراض المختارة حالياً كأعضاء" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 msgid "Remove Selected" msgstr "أزل المختارة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 msgid "Remove all currently selected objects from relation" msgstr "إنزع كلّ الأغراض المختارة حالياً من العلاقة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 msgid "Sort the selected relation members or the whole list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move Down" msgstr "حرّك إلى الأسفل" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move the currently selected members down" msgstr "حرّك الأعضاء المختارة حالياً إلى الأسفل" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 msgid "Remove the member in the current table row from this relation" msgstr "أزل العضو في سطر الجدول الحالي من هذه العلاقة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 msgid "Download Members" msgstr "نزّل الأعضاء" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 msgid "Download all incomplete ways and nodes in relation" msgstr "نزّل كلّ من العقد و الطرقات الغير مكتملة في العلاقة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 #, java-format msgid "Members: {0} (linked: {1})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 #, java-format msgid "Relation Editor: {0}" msgstr "محرّر العلاقات: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 msgid "Download relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 #, java-format @@ -4379,27 +4384,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Conflicts in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#, java-format +msgid "Create new relation in layer ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 -#, fuzzy, java-format -msgid "Create new relation in layer ''{0}''" -msgstr "أنشا علاقة جديدة" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98 -#, fuzzy, java-format +#, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "حرّر العلاقة الجديدة" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "حرّر العلاقة رقم {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -6550,11 +6555,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 +msgid "Map Paint Styles" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 -msgid "Map Paint Styles" msgstr "" @@ -9596,42 +9601,38 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74 msgid "Slippy Map" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Load Tile" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91 msgid "Show Tile Status" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102 msgid "Request Update" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Load All Tiles" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123 msgid "Increase zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132 msgid "Decrease zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 -msgid "image not loaded" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -msgid "image loading..." +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 +msgid "image " msgstr "" @@ -9673,14 +9674,18 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146 msgid "error loading metadata" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 +msgid "error requesting update: not zoom-level 12" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 #, java-format msgid "requested: {0}" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168 msgid "error requesting update" msgstr "" Index: /applications/editors/josm/i18n/po/bg.po =================================================================== --- /applications/editors/josm/i18n/po/bg.po (revision 16492) +++ /applications/editors/josm/i18n/po/bg.po (revision 16493) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-12 13:56+0200\n" +"POT-Creation-Date: 2009-07-14 18:01+0200\n" "PO-Revision-Date: 2009-06-27 16:00+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-07-12 11:50+0000\n" +"X-Launchpad-Export-Date: 2009-07-14 15:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -82,5 +82,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 @@ -211,9 +211,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 @@ -222,5 +222,5 @@ msgstr "Внимание" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 #, java-format msgid "" @@ -547,6 +547,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 @@ -720,5 +720,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -750,5 +750,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 @@ -924,5 +924,5 @@ #: ../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:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "New" msgstr "Нов" @@ -2177,31 +2177,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 msgid "Missing arguments for or." msgstr "Липсват параметри за \"ИЛИ\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 msgid "Missing argument for not." msgstr "Липсват параметри за \"НЕ\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Expected closing parenthesis." msgstr "Липсва затваряща скоба." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 #, java-format msgid "" @@ -2210,5 +2215,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -3318,5 +3323,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 @@ -3334,5 +3339,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3529,5 +3534,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 @@ -3825,5 +3830,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3870,5 +3875,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 @@ -3882,5 +3887,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -3952,5 +3957,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 @@ -4203,5 +4208,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 @@ -4246,34 +4251,34 @@ msgstr "Параметри / Отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -msgid "Open an editor for the selected relation" -msgstr "Отвори редактор за избраната релация" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -msgid "Delete the selected relation" -msgstr "Изтриване на избраната релация" - #. item "Land use/Quarry" text "Name" #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Релации" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 msgid "Open a list of all relations." msgstr "Отваряне списък с всички релации." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Create a new relation" msgstr "Създай нова релация" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 #, java-format msgid "Relations: {0}" msgstr "Релации: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 +msgid "Open an editor for the selected relation" +msgstr "Отвори редактор за избраната релация" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 +msgid "Delete the selected relation" +msgstr "Изтриване на избраната релация" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 @@ -4365,88 +4370,88 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 msgid "Apply Changes" msgstr "Приложи промените" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 msgid "Basic" msgstr "Основен" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "Occupied By" msgstr "Обект" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "linked" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move Up" msgstr "Преместване нагоре" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move the currently selected members up" msgstr "Преместване на текущо избраните членове нагоре" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Add Selected" msgstr "Добавяне на избраните" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 msgid "Add all currently selected objects as members" msgstr "Добавяне на всички текущо обекти като членове" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 msgid "Remove Selected" msgstr "Изтриване на избраното" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 msgid "Remove all currently selected objects from relation" msgstr "Изтриване на всички текущи избрани обекти от релацията" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 msgid "Sort the selected relation members or the whole list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move Down" msgstr "Преместване надолу" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move the currently selected members down" msgstr "Преместване на текущо избраните членове надолу" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 msgid "Remove the member in the current table row from this relation" msgstr "Изтриване на члена от текущия ред на таблицата от тази релация" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 msgid "Download Members" msgstr "Сваляне членове" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 msgid "Download all incomplete ways and nodes in relation" msgstr "Сваляне всички непълни пътища и възли от релацията" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 #, java-format msgid "Members: {0} (linked: {1})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 #, java-format msgid "Relation Editor: {0}" msgstr "Редактор релации: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 msgid "Download relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 #, java-format @@ -4454,27 +4459,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Conflicts in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#, java-format +msgid "Create new relation in layer ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 -#, fuzzy, java-format -msgid "Create new relation in layer ''{0}''" -msgstr "Създаване нова релация" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98 -#, fuzzy, java-format +#, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "Редактиране на нова релация" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "Редактиране релация #{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -6657,11 +6662,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 +msgid "Map Paint Styles" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 -msgid "Map Paint Styles" msgstr "" @@ -9846,42 +9851,38 @@ msgstr "Въведете стойности за тегло" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74 msgid "Slippy Map" msgstr "Интерактивна карта" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Load Tile" msgstr "Зареждане на квадрант" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91 msgid "Show Tile Status" msgstr "Показване статуса на квадрант" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102 msgid "Request Update" msgstr "Изискване на обновяване" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Load All Tiles" msgstr "Зареждане на всички квадранти" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123 msgid "Increase zoom" msgstr "Увеличаване на мащаба" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132 msgid "Decrease zoom" msgstr "Намаляне на мащаба" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 -msgid "image not loaded" -msgstr "изображението не е заредено" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -msgid "image loading..." +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 +msgid "image " msgstr "" @@ -9923,14 +9924,18 @@ msgstr "Фон при избледняване: " -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146 msgid "error loading metadata" msgstr "грешка при зареждане на метаданните" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 +msgid "error requesting update: not zoom-level 12" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 #, java-format msgid "requested: {0}" msgstr "изискани: {0}" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168 msgid "error requesting update" msgstr "грешка при изискване на обновяване" @@ -23008,4 +23013,7 @@ #~ msgstr "Навигация" +#~ msgid "image not loaded" +#~ msgstr "изображението не е заредено" + #~ msgid "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " Index: /applications/editors/josm/i18n/po/cs.po =================================================================== --- /applications/editors/josm/i18n/po/cs.po (revision 16492) +++ /applications/editors/josm/i18n/po/cs.po (revision 16493) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-12 13:56+0200\n" -"PO-Revision-Date: 2009-07-10 10:41+0000\n" -"Last-Translator: Kubajz \n" +"POT-Creation-Date: 2009-07-14 18:01+0200\n" +"PO-Revision-Date: 2009-07-12 13:11+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2009-07-12 11:52+0000\n" +"X-Launchpad-Export-Date: 2009-07-14 15:27+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -82,5 +82,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 @@ -214,9 +214,9 @@ "\"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Prosím, vyberte alespoň jeden již nahraný uzel, cestu nebo relaci." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 @@ -225,5 +225,5 @@ msgstr "Varování" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 #, java-format msgid "" @@ -555,6 +555,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 @@ -726,5 +726,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -756,5 +756,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 @@ -925,5 +925,5 @@ #: ../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:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "New" msgstr "Nový" @@ -2170,31 +2170,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 msgid "Missing arguments for or." msgstr "Chybějící argument pro \"NEBO\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 msgid "Missing argument for not." msgstr "Chybějící argument pro \"NOT\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Expected closing parenthesis." msgstr "Očekávám uzavírací závorku." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 msgid "Wrong number of parameters for nodes operator." msgstr "Chybný počet parametrů pro operátor nodes." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 #, java-format msgid "" @@ -2205,5 +2210,5 @@ "čísel, například nodes:10-20." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -3316,5 +3321,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 @@ -3332,5 +3337,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3527,5 +3532,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 @@ -3819,5 +3824,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3864,5 +3869,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 @@ -3876,5 +3881,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -3946,5 +3951,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 @@ -4201,5 +4206,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 @@ -4244,34 +4249,34 @@ msgstr "Vlastnosti / Členství" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -msgid "Open an editor for the selected relation" -msgstr "Otevřít editor pro zvolenou relaci" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -msgid "Delete the selected relation" -msgstr "Smazat vybrané relace" - #. item "Land use/Quarry" text "Name" #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 msgid "Open a list of all relations." msgstr "Otevřít seznam všech relací" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Create a new relation" msgstr "Vytvořit novou relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 #, java-format msgid "Relations: {0}" msgstr "Relace: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 +msgid "Open an editor for the selected relation" +msgstr "Otevřít editor pro zvolenou relaci" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 +msgid "Delete the selected relation" +msgstr "Smazat vybrané relace" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 @@ -4365,88 +4370,88 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 msgid "Apply Changes" msgstr "Aplikovat změny" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 msgid "Basic" msgstr "Základní" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "Occupied By" msgstr "Obsazeno" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "linked" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move Up" msgstr "Posunout nahoru" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move the currently selected members up" msgstr "Přesunout zvolené prvky nahoru" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Add Selected" msgstr "Přidat vybrané" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 msgid "Add all currently selected objects as members" msgstr "Přidat všechny zvolené objekty mezi prvky" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 msgid "Remove Selected" msgstr "Odebrat označené" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 msgid "Remove all currently selected objects from relation" msgstr "Odebere všechny označené objekty z relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 msgid "Sort the selected relation members or the whole list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move Down" msgstr "Posunout dolů" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move the currently selected members down" msgstr "Přesunout zvolenou vrstvu o řádek dolů." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 msgid "Remove the member in the current table row from this relation" msgstr "Odstranit prvek v aktuálním řádku tabulky z relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 msgid "Download Members" msgstr "Stáhnout prvky" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 msgid "Download all incomplete ways and nodes in relation" msgstr "Stáhnout všechny nekompletní cesty a uzly v relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 #, java-format msgid "Members: {0} (linked: {1})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 #, java-format msgid "Relation Editor: {0}" msgstr "Editor relací: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 msgid "Download relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 #, java-format @@ -4454,27 +4459,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Conflicts in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#, java-format +msgid "Create new relation in layer ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 -#, fuzzy, java-format -msgid "Create new relation in layer ''{0}''" -msgstr "Vytvořit novou relaci" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98 -#, fuzzy, java-format +#, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "Upravit novou relaci" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "Upravit relaci #{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -6629,11 +6634,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 +msgid "Map Paint Styles" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 -msgid "Map Paint Styles" msgstr "" @@ -9756,42 +9761,38 @@ msgstr "Zadejte jednotky váhy" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74 msgid "Slippy Map" msgstr "Aktuální mapa" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Load Tile" msgstr "Nahrát dlaždici" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91 msgid "Show Tile Status" msgstr "Zobrazit stav dlaždice" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102 msgid "Request Update" msgstr "Vyžádat aktualizaci" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Load All Tiles" msgstr "Nahrát všechny dlaždice" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123 msgid "Increase zoom" msgstr "Zvětšit přiblížení" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132 msgid "Decrease zoom" msgstr "Zmenšit přiblížení" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 -msgid "image not loaded" -msgstr "obrázek nebyl nahrán" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -msgid "image loading..." +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 +msgid "image " msgstr "" @@ -9833,14 +9834,18 @@ msgstr "Ztlumit pozadí: " -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146 msgid "error loading metadata" msgstr "chyba při nahrávání metadat" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 +msgid "error requesting update: not zoom-level 12" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 #, java-format msgid "requested: {0}" msgstr "požadováno: {0}" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168 msgid "error requesting update" msgstr "chyba při poždavku na aktualizaci" @@ -22879,4 +22884,7 @@ #~ msgstr "Nemohu stáhnout plugin: {0} z {1}" +#~ msgid "image not loaded" +#~ msgstr "obrázek nebyl nahrán" + #~ msgid "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " Index: /applications/editors/josm/i18n/po/da.po =================================================================== --- /applications/editors/josm/i18n/po/da.po (revision 16492) +++ /applications/editors/josm/i18n/po/da.po (revision 16493) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-12 13:56+0200\n" -"PO-Revision-Date: 2009-07-09 11:23+0000\n" +"POT-Creation-Date: 2009-07-14 18:01+0200\n" +"PO-Revision-Date: 2009-07-12 13:12+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-07-12 11:50+0000\n" +"X-Launchpad-Export-Date: 2009-07-14 15:27+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -82,5 +82,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 @@ -211,9 +211,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 @@ -222,5 +222,5 @@ msgstr "Advarsel" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 #, java-format msgid "" @@ -547,6 +547,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 @@ -718,5 +718,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -748,5 +748,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 @@ -920,5 +920,5 @@ #: ../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:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "New" msgstr "Ny" @@ -2150,31 +2150,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 msgid "Missing arguments for or." msgstr "Mangler argumenter for \"eller\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 msgid "Missing argument for not." msgstr "Mangler argument fro \"ikke\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Expected closing parenthesis." msgstr "Forventede slutparentes." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 #, java-format msgid "" @@ -2183,5 +2188,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -3286,5 +3291,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 @@ -3302,5 +3307,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3497,5 +3502,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 @@ -3791,5 +3796,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3836,5 +3841,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 @@ -3848,5 +3853,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -3918,5 +3923,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 @@ -4171,5 +4176,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 @@ -4214,34 +4219,34 @@ msgstr "Egenskaber / Medlemskaber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -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:65 -msgid "Delete the selected relation" -msgstr "Slet de nvalgte relation" - #. item "Land use/Quarry" text "Name" #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 msgid "Open a list of all relations." msgstr "Åbn en liste over alle relationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Create a new relation" msgstr "Opret en ny relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 #, java-format msgid "Relations: {0}" msgstr "Relationer: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 +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:274 +msgid "Delete the selected relation" +msgstr "Slet de nvalgte relation" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 @@ -4331,88 +4336,88 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 msgid "Apply Changes" msgstr "Anvend ændringer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 msgid "Basic" msgstr "Grundlæggende" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "Occupied By" msgstr "Optaget af" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "linked" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move Up" msgstr "Flyt op" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move the currently selected members up" msgstr "Flyt det nuværende valgte medlem op" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Add Selected" msgstr "Tilføj valgte" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 msgid "Add all currently selected objects as members" msgstr "Tilføj alle valgte objekter som medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 msgid "Remove Selected" msgstr "Fjern valgt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 msgid "Remove all currently selected objects from relation" msgstr "Fjern alle valgte objekter fra relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 msgid "Sort the selected relation members or the whole list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move Down" msgstr "Flyt ned" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move the currently selected members down" msgstr "Flyt det nuværende valgte medlem ned" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 msgid "Remove the member in the current table row from this relation" msgstr "Fjern medlemmet i den nuværende tabelrække fra denne relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 msgid "Download Members" msgstr "Hent medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 msgid "Download all incomplete ways and nodes in relation" msgstr "Hent alle ufuldstændige veje og punkter der er forbundet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 #, java-format msgid "Members: {0} (linked: {1})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 #, java-format msgid "Relation Editor: {0}" msgstr "Relations-editor: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 msgid "Download relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 #, java-format @@ -4420,27 +4425,27 @@ msgstr "Der var {0} konflikter under import." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Conflicts in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#, java-format +msgid "Create new relation in layer ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 -#, fuzzy, java-format -msgid "Create new relation in layer ''{0}''" -msgstr "Opret ny relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98 -#, fuzzy, java-format +#, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "Ret ny relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "Ret relation #{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -6590,11 +6595,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 +msgid "Map Paint Styles" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 -msgid "Map Paint Styles" msgstr "" @@ -9702,42 +9707,38 @@ msgstr "Indtast vægtede værdier" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74 msgid "Slippy Map" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Load Tile" msgstr "Hent tern" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91 msgid "Show Tile Status" msgstr "Vis status for tern" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102 msgid "Request Update" msgstr "Anmod om opdatering" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Load All Tiles" msgstr "Hent alle tern" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123 msgid "Increase zoom" msgstr "Øg zoom" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132 msgid "Decrease zoom" msgstr "Reducer zoom" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 -msgid "image not loaded" -msgstr "billedet er ikke indlæst" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -msgid "image loading..." +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 +msgid "image " msgstr "" @@ -9779,14 +9780,18 @@ msgstr "Nedton baggrund: " -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146 msgid "error loading metadata" msgstr "fejl ved indlæsning af metaoplysninger" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 +msgid "error requesting update: not zoom-level 12" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 #, java-format msgid "requested: {0}" msgstr "anmodet: {0}" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168 msgid "error requesting update" msgstr "fejl ved anmodning af opdatering" @@ -22804,4 +22809,7 @@ #~ msgstr "Kunne ikke hente udvidelsen {0} fra {1}" +#~ msgid "image not loaded" +#~ msgstr "billedet er ikke indlæst" + #~ msgid "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " Index: /applications/editors/josm/i18n/po/de.po =================================================================== --- /applications/editors/josm/i18n/po/de.po (revision 16492) +++ /applications/editors/josm/i18n/po/de.po (revision 16493) @@ -8,6 +8,6 @@ "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-12 13:56+0200\n" -"PO-Revision-Date: 2009-07-12 11:30+0000\n" +"POT-Creation-Date: 2009-07-14 18:01+0200\n" +"PO-Revision-Date: 2009-07-13 10:55+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-07-12 11:52+0000\n" +"X-Launchpad-Export-Date: 2009-07-14 15:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -85,5 +85,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 @@ -217,5 +217,5 @@ "API-URL ist: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" @@ -223,5 +223,5 @@ "oder Relation) auswählen." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 @@ -230,5 +230,5 @@ msgstr "Warnung" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 #, java-format msgid "" @@ -567,6 +567,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 @@ -738,5 +738,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -768,5 +768,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 @@ -940,5 +940,5 @@ #: ../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:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "New" msgstr "Neu" @@ -1992,7 +1992,7 @@ "Really move them?" msgstr "" -"Sie haben mehr als {0} Elemente verschoben. Jedoch ist das Verschieben einer " -"Vielzahl von Elementen oft ein Fehler.\n" -"Sollen sie wirklich verschoben werden?" +"Sie haben mehr als {0} Elemente verschoben. Das Verschieben mehrerer " +"Elemente geschieht häufig unbeabsichtigt.\n" +"Wollen Sie sie wirklich verschieben?" #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 @@ -2235,5 +2235,10 @@ "Schlüssel kann bei Gleichheitsoperator nicht leer sein. Beispiel: feld=wert" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2242,26 +2247,26 @@ "\"relation\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 #, java-format msgid "Unexpected token: {0}" msgstr "Unerwartete Daten: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 msgid "Missing arguments for or." msgstr "Fehlendes Argument für 'OR'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 msgid "Missing argument for not." msgstr "Fehlendes Argument für 'NICHT'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Expected closing parenthesis." msgstr "Schließende Klammer erwartet." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 msgid "Wrong number of parameters for nodes operator." msgstr "Falsche Anzahl an Parametern für Knoten-Operator." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 #, java-format msgid "" @@ -2272,5 +2277,5 @@ "oder -bereich, z.B. \"nodes:1-20\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2475,7 +2480,7 @@ #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66 -#, fuzzy, java-format +#, java-format msgid "Remove relation member {0} {1}" -msgstr "Enferne Relationselement {0} {1}" +msgstr "Relationselement {0} {1} entfernen" #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 @@ -3397,5 +3402,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 @@ -3413,8 +3418,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" -msgstr "Mitglieder" +msgstr "Elemente" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95 @@ -3627,5 +3632,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 @@ -3939,5 +3944,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3986,5 +3991,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 @@ -3998,5 +4003,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4068,5 +4073,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 @@ -4327,5 +4332,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 @@ -4370,34 +4375,34 @@ msgstr "Eigenschaften / Mitgliedschaften" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -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:65 -msgid "Delete the selected relation" -msgstr "Gewählte Relation löschen" - #. item "Land use/Quarry" text "Name" #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relationen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 msgid "Open a list of all relations." msgstr "Eine Liste aller Relationen öffnen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Create a new relation" msgstr "Eine neue Relation erstellen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 #, java-format msgid "Relations: {0}" msgstr "Relationen: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 +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:274 +msgid "Delete the selected relation" +msgstr "Gewählte Relation löschen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 @@ -4491,88 +4496,88 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 msgid "Apply Changes" msgstr "Änderungen übernehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 msgid "Basic" msgstr "Standard" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "Occupied By" msgstr "Belegt durch" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "linked" msgstr "verbunden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move Up" msgstr "Nach oben" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move the currently selected members up" msgstr "Ausgewählte Elemente nach oben schieben" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Add Selected" msgstr "Ausgewähltes hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 msgid "Add all currently selected objects as members" msgstr "Alle ausgewählten Objekte als Elemente hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 msgid "Remove Selected" msgstr "Ausgewähltes entfernen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 msgid "Remove all currently selected objects from relation" msgstr "Alle ausgewählten Objekte aus der Relation entfernen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 msgid "Sort" msgstr "Sortieren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 msgid "Sort the selected relation members or the whole list" msgstr "Die markierten Relationmitglieder oder die gesamte Liste sortieren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move Down" msgstr "Nach unten" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move the currently selected members down" msgstr "Ausgewählte Elemente nach unten schieben" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 msgid "Remove the member in the current table row from this relation" msgstr "Elemente in der gewählten Tabellenzeile aus dieser Relation entfernen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 msgid "Download Members" msgstr "Elemente herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 msgid "Download all incomplete ways and nodes in relation" msgstr "Alle nicht vollständigen Wege und Knoten der Relation herunterladen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 #, java-format msgid "Members: {0} (linked: {1})" -msgstr "Mitglied: {0} (verbunden: {1})" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 +msgstr "Elemente: {0} (verbunden: {1})" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 #, java-format msgid "Relation Editor: {0}" msgstr "Relationseditor: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 msgid "Download relation members" msgstr "Relationselemente herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 #, java-format @@ -4580,9 +4585,9 @@ msgstr "Es traten {0} Konflikte während des Imports auf." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Conflicts in data" msgstr "Konflikte in den Daten" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" @@ -4590,18 +4595,18 @@ "Warnung: Ignoriere Fehler, weil die Aufgabe abgebrochen wurde: Fehler: {0}" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#, java-format +msgid "Create new relation in layer ''{0}''" +msgstr "Erzeuge neue Relation in Ebene \"{0}\"" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 -#, fuzzy, java-format -msgid "Create new relation in layer ''{0}''" -msgstr "Neue Relation erstellen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98 -#, fuzzy, java-format +#, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "Neue Relation bearbeiten" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#, fuzzy, java-format +msgstr "Ändere neue Relation in Ebene \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "Relation #{0} bearbeiten" +msgstr "Ändere Relation {0} in Ebene \"{1}\"" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -6802,12 +6807,12 @@ msgstr "integrierte Standardsymbole aktivieren" -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 +msgid "Map Paint Styles" +msgstr "MapPaint Stile" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" msgstr "Benutzter Stil" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 -msgid "Map Paint Styles" -msgstr "MapPaint Stile" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 @@ -10033,43 +10038,39 @@ msgstr "Gewichtswerte eingeben" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74 msgid "Slippy Map" msgstr "Karte" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Load Tile" msgstr "Lade Kachel" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91 msgid "Show Tile Status" msgstr "Kachelstatus anzeigen" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102 msgid "Request Update" msgstr "Aktualisieren" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Load All Tiles" msgstr "Alle Kacheln laden" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123 msgid "Increase zoom" msgstr "Zoom erhöhen" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132 msgid "Decrease zoom" msgstr "Zoom reduzieren" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" msgstr "Kachel-Zwischenspeicher leeren" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 -msgid "image not loaded" -msgstr "Bild nicht geladen" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -msgid "image loading..." -msgstr "Lade Bild..." +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 +msgid "image " +msgstr "Bild " #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 @@ -10110,14 +10111,18 @@ msgstr "Hintergrund ausblenden: " -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146 msgid "error loading metadata" msgstr "Fehler beim Laden der Metadaten" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 +msgid "error requesting update: not zoom-level 12" +msgstr "Fehler bei Aktualisierungsanforderung: Nicht Zoomstufe 12" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 #, java-format msgid "requested: {0}" msgstr "Angefordert: {0}" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168 msgid "error requesting update" msgstr "Fehler bei der Aktualisierungsanforderung" @@ -23199,4 +23204,7 @@ #~ msgstr "Quellen für Objektvorlagen" +#~ msgid "image not loaded" +#~ msgstr "Bild nicht geladen" + #~ msgid "EPSG:4326" #~ msgstr "EPSG:4326" @@ -23344,2 +23352,5 @@ #~ msgid "Error when communicating with server." #~ msgstr "Fehler bei der Kommunikation mit dem Server." + +#~ msgid "image loading..." +#~ msgstr "Lade Bild..." Index: /applications/editors/josm/i18n/po/el.po =================================================================== --- /applications/editors/josm/i18n/po/el.po (revision 16492) +++ /applications/editors/josm/i18n/po/el.po (revision 16493) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-12 13:56+0200\n" +"POT-Creation-Date: 2009-07-14 18:01+0200\n" "PO-Revision-Date: 2009-07-09 11:26+0000\n" "Last-Translator: alichani \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-07-12 11:51+0000\n" +"X-Launchpad-Export-Date: 2009-07-14 15:27+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -84,5 +84,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 @@ -213,9 +213,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 @@ -224,5 +224,5 @@ msgstr "Προειδοποίηση" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 #, java-format msgid "" @@ -545,6 +545,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 @@ -717,5 +717,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -747,5 +747,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 @@ -916,5 +916,5 @@ #: ../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:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "New" msgstr "Νέα" @@ -2146,31 +2146,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Expected closing parenthesis." msgstr "Αναμενόταν κλείσιμο παρένθεσης." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 #, java-format msgid "" @@ -2179,5 +2184,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -3283,5 +3288,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 @@ -3299,5 +3304,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3496,5 +3501,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 @@ -3789,5 +3794,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3834,5 +3839,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 @@ -3846,5 +3851,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -3916,5 +3921,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 @@ -4173,5 +4178,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 @@ -4216,34 +4221,34 @@ msgstr "Ιδιότητες / Υπαγωγές" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -msgid "Open an editor for the selected relation" -msgstr "Άνοιγμα επεξεργαστή για την επιλεγμένη σχέση" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -msgid "Delete the selected relation" -msgstr "Διαγραφή της επιλεγμένης σχέσης" - #. item "Land use/Quarry" text "Name" #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Σχέσεις" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 msgid "Open a list of all relations." msgstr "Άνοιγμα λίστας όλων τον σχέσεων." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Create a new relation" msgstr "Σημιουργία νέας σχέσης" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 #, java-format msgid "Relations: {0}" msgstr "Σχέσεις: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 +msgid "Open an editor for the selected relation" +msgstr "Άνοιγμα επεξεργαστή για την επιλεγμένη σχέση" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 +msgid "Delete the selected relation" +msgstr "Διαγραφή της επιλεγμένης σχέσης" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 @@ -4336,88 +4341,88 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 msgid "Apply Changes" msgstr "Εφαρμογή αλλαγών" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 msgid "Basic" msgstr "Βασικό" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "Occupied By" msgstr "Κατεχόμενο από" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "linked" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move Up" msgstr "Μετακίνηση Πάνω" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move the currently selected members up" msgstr "Μετακίνηση των επιλεγμένων μελών πάνω" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Add Selected" msgstr "Προσθήκη επιλεγμένων" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 msgid "Add all currently selected objects as members" msgstr "Προσθήκη επιλεγμένων αντικειμένων ως μέλη" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 msgid "Remove Selected" msgstr "Αφαίρεση Επιλεγμένων" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 msgid "Remove all currently selected objects from relation" msgstr "Αφαίρεση όλων των επιλεγμένων αντικειμένων από την σχέση" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 msgid "Sort the selected relation members or the whole list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move Down" msgstr "Μετακίνηση Κάτω" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move the currently selected members down" msgstr "Μετακίνηση των επιλεγμένων μελών κάτω" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 msgid "Remove the member in the current table row from this relation" msgstr "Αφαίρεση του μέλους στην τρέχουσα σειρά του πίνακα από αυτήν την σχέση" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 msgid "Download Members" msgstr "Λήψη μελών" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 msgid "Download all incomplete ways and nodes in relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 #, java-format msgid "Members: {0} (linked: {1})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 #, java-format msgid "Relation Editor: {0}" msgstr "Επεξεργαστής Σχέσεων: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 msgid "Download relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 #, java-format @@ -4425,27 +4430,27 @@ msgstr "Υπήρξαν {0} συγκρούσεις κατά την εισαγωγή." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Conflicts in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#, java-format +msgid "Create new relation in layer ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 -#, fuzzy, java-format -msgid "Create new relation in layer ''{0}''" -msgstr "Δημιουργία νέας σχέσης" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98 -#, fuzzy, java-format +#, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "Επεξεργασία νέας σχέσης" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "Επεξεργασία σχέσης #{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -6594,11 +6599,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 +msgid "Map Paint Styles" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 -msgid "Map Paint Styles" msgstr "" @@ -9710,43 +9715,39 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74 msgid "Slippy Map" msgstr "Slippy Map" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Load Tile" msgstr "Φόρτωση πλακιδίου" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91 msgid "Show Tile Status" msgstr "Εμφάνιση κατάστασης πλακιδίου" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102 msgid "Request Update" msgstr "Αίτηση Ενημέρωσης" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Load All Tiles" msgstr "Φόρτωση όλων των πλακιδίων" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123 msgid "Increase zoom" msgstr "Άυξηση ζουμ" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132 msgid "Decrease zoom" msgstr "Μείωση ζουμ" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 -msgid "image not loaded" -msgstr "η εικόνα δεν φορτώθηκε" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -msgid "image loading..." -msgstr "φόρτωση εικόνας..." +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 +msgid "image " +msgstr "" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 @@ -9787,14 +9788,18 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146 msgid "error loading metadata" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 +msgid "error requesting update: not zoom-level 12" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 #, java-format msgid "requested: {0}" msgstr "ζητήθηκαν: {0}" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168 msgid "error requesting update" msgstr "Σφάλμα κατά την αίτηση ενημέρωσης" @@ -22789,4 +22794,7 @@ #~ msgstr "Πλοήγηση" +#~ msgid "image not loaded" +#~ msgstr "η εικόνα δεν φορτώθηκε" + #~ msgid "Charge" #~ msgstr "Χρέωση" @@ -22913,2 +22921,5 @@ #~ msgid "Error when communicating with server." #~ msgstr "Σφάλμα κατά την επικοινωνία με τον διακομιστή." + +#~ msgid "image loading..." +#~ msgstr "φόρτωση εικόνας..." Index: /applications/editors/josm/i18n/po/en_GB.po =================================================================== --- /applications/editors/josm/i18n/po/en_GB.po (revision 16492) +++ /applications/editors/josm/i18n/po/en_GB.po (revision 16493) @@ -10,5 +10,5 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-12 13:56+0200\n" +"POT-Creation-Date: 2009-07-14 18:01+0200\n" "PO-Revision-Date: 2009-07-09 11:05+0000\n" "Last-Translator: Brian Burns \n" @@ -18,5 +18,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-07-12 11:50+0000\n" +"X-Launchpad-Export-Date: 2009-07-14 15:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -84,5 +84,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 @@ -215,9 +215,9 @@ "OSM primitive will probably fail. API base URL is: ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Please select at least one already uploaded node, way, or relation." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 @@ -226,5 +226,5 @@ msgstr "Warning" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 #, java-format msgid "" @@ -559,6 +559,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 @@ -730,5 +730,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -760,5 +760,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 @@ -930,5 +930,5 @@ #: ../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:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "New" msgstr "New" @@ -2196,31 +2196,36 @@ msgstr "Key cannot be empty when tag operator is used. Sample use: key=value" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "Unknown primitive type: {0}. Allowed values are node, way or relation" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 #, java-format msgid "Unexpected token: {0}" msgstr "Unexpected token: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 msgid "Missing arguments for or." msgstr "Missing arguments for or." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 msgid "Missing argument for not." msgstr "Missing argument for not." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Expected closing parenthesis." msgstr "Expected closing bracket." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 msgid "Wrong number of parameters for nodes operator." msgstr "Wrong number of parameters for nodes operator." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 #, java-format msgid "" @@ -2231,5 +2236,5 @@ "nodes or range, for example nodes:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -3343,5 +3348,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 @@ -3359,5 +3364,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3568,5 +3573,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 @@ -3879,5 +3884,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3924,5 +3929,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 @@ -3936,5 +3941,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4006,5 +4011,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 @@ -4262,5 +4267,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 @@ -4305,34 +4310,34 @@ msgstr "Properties / Memberships" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -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:65 -msgid "Delete the selected relation" -msgstr "Delete the selected relation" - #. item "Land use/Quarry" text "Name" #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 msgid "Open a list of all relations." msgstr "Open a list of all relations." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Create a new relation" msgstr "Create a new relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 #, java-format msgid "Relations: {0}" msgstr "Relations: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 +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:274 +msgid "Delete the selected relation" +msgstr "Delete the selected relation" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 @@ -4423,88 +4428,88 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 msgid "Apply Changes" msgstr "Apply Changes" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 msgid "Basic" msgstr "Basic" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "Occupied By" msgstr "Occupied By" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "linked" msgstr "linked" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move Up" msgstr "Move Up" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move the currently selected members up" msgstr "Move the currently selected members up" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Add Selected" msgstr "Add Selected" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 msgid "Add all currently selected objects as members" msgstr "Add all currently selected objects as members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 msgid "Remove Selected" msgstr "Remove Selected" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 msgid "Remove all currently selected objects from relation" msgstr "Remove all currently selected objects from relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 msgid "Sort the selected relation members or the whole list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move Down" msgstr "Move Down" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move the currently selected members down" msgstr "Move the currently selected members down" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 msgid "Remove the member in the current table row from this relation" msgstr "Remove the member in the current table row from this relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 msgid "Download Members" msgstr "Download Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 msgid "Download all incomplete ways and nodes in relation" msgstr "Download all incomplete ways and nodes in relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 #, java-format msgid "Members: {0} (linked: {1})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 #, java-format msgid "Relation Editor: {0}" msgstr "Relation Editor: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 msgid "Download relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 #, java-format @@ -4512,27 +4517,27 @@ msgstr "There were {0} conflicts during import." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Conflicts in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#, java-format +msgid "Create new relation in layer ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 -#, fuzzy, java-format -msgid "Create new relation in layer ''{0}''" -msgstr "Create new relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98 -#, fuzzy, java-format +#, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "Edit new relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "Edit relation #{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -6705,11 +6710,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 +msgid "Map Paint Styles" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 -msgid "Map Paint Styles" msgstr "" @@ -9891,43 +9896,39 @@ msgstr "Enter weight values" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74 msgid "Slippy Map" msgstr "Slippy Map" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Load Tile" msgstr "Load Tile" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91 msgid "Show Tile Status" msgstr "Show Tile Status" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102 msgid "Request Update" msgstr "Request Update" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Load All Tiles" msgstr "Load All Tiles" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123 msgid "Increase zoom" msgstr "Increase zoom" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132 msgid "Decrease zoom" msgstr "Decrease zoom" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" msgstr "Flush Tile Cache" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 -msgid "image not loaded" -msgstr "image not loaded" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -msgid "image loading..." -msgstr "image loading..." +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 +msgid "image " +msgstr "" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 @@ -9968,14 +9969,18 @@ msgstr "Fade background: " -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146 msgid "error loading metadata" msgstr "error loading metadata" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 +msgid "error requesting update: not zoom-level 12" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 #, java-format msgid "requested: {0}" msgstr "requested: {0}" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168 msgid "error requesting update" msgstr "error requesting update" @@ -23059,4 +23064,7 @@ #~ msgstr "Navigation" +#~ msgid "image not loaded" +#~ msgstr "image not loaded" + #~ msgid "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -23410,2 +23418,5 @@ #~ msgid "Error when communicating with server." #~ msgstr "Error when communicating with server." + +#~ msgid "image loading..." +#~ msgstr "image loading..." Index: /applications/editors/josm/i18n/po/es.po =================================================================== --- /applications/editors/josm/i18n/po/es.po (revision 16492) +++ /applications/editors/josm/i18n/po/es.po (revision 16493) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-12 13:56+0200\n" -"PO-Revision-Date: 2009-07-10 16:31+0000\n" +"POT-Creation-Date: 2009-07-14 18:01+0200\n" +"PO-Revision-Date: 2009-07-14 10:07+0000\n" "Last-Translator: cdavila \n" "Language-Team: Spanish \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-07-12 11:50+0000\n" +"X-Launchpad-Export-Date: 2009-07-14 15:25+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -82,5 +82,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 @@ -210,10 +210,12 @@ "OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +"WARNING: unexpected format of API base URL. Redirection to history page for " +"OSM primitive will probably fail. API base URL is: ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Por favor, seleccione al menos un nodo, vía o relación ya subida." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 @@ -222,5 +224,5 @@ msgstr "Advertencia" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 #, java-format msgid "" @@ -380,4 +382,6 @@ "length {2}. Values length is {3}." msgstr "" +"La longitud del paralo para la etiqueta \"{0}\" en la primitiva {1} excede " +"la máxima longitud permitida {2}. Los valores de longitud son {3}." #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 @@ -553,6 +557,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 @@ -726,5 +730,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -756,5 +760,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 @@ -930,5 +934,5 @@ #: ../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:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "New" msgstr "Nuevo" @@ -1459,5 +1463,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 msgid "No data" -msgstr "" +msgstr "Sin datos" #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 @@ -1621,7 +1625,7 @@ "html>" msgstr "" -" Subida al servidor fallida debido a que su actual " -"conjunto de datos
viola una condición previa.
El mensaje de error " -"es:
{0} " +" Subida al servidor fallida debido a que su actual " +"conjunto de datos
viola una condición previa.
El mensaje de error es:" +"
{0}" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 @@ -1652,5 +1656,5 @@ #, java-format msgid "Uploading failed.
{0}" -msgstr "" +msgstr "Subida fallida.
{0}" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 @@ -2225,5 +2229,10 @@ "de uso: clave=valor" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2232,26 +2241,26 @@ "relación" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 #, java-format msgid "Unexpected token: {0}" msgstr "Credencial de autentificación inexperada: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 msgid "Missing arguments for or." msgstr "No se encuentran los argumentos de or" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 msgid "Missing argument for not." msgstr "No se encuentran los argumentos de not" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Expected closing parenthesis." msgstr "Se esperaba un cierre de paréntesis." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 msgid "Wrong number of parameters for nodes operator." msgstr "Número de parámetros incorrecto para el operador de nodos." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 #, java-format msgid "" @@ -2262,5 +2271,5 @@ "número de nodos o un intervalo, por ejemplo nodos:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2468,5 +2477,5 @@ #, java-format msgid "Remove relation member {0} {1}" -msgstr "" +msgstr "Eliminando miembro de relación {0} {1}" #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 @@ -2502,5 +2511,5 @@ #, java-format msgid "Main dataset does not include node {0}" -msgstr "" +msgstr "El conjunto de datos principal no incluye el nodo {0}" #: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 @@ -2572,5 +2581,5 @@ #, java-format msgid "Malformed config file at lines {0}" -msgstr "Archivo de configurar malformado en lineas {0}" +msgstr "Archivo de configuración malformado en las lineas {0}" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:324 @@ -2598,10 +2607,10 @@ #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93 msgid "Could not load preferences from server." -msgstr "No se han podido cargar las preferencias desd el servidor." +msgstr "No se han podido cargar las preferencias desde el servidor." #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71 #, java-format msgid "already registered a conflict for primitive ''{0}''" -msgstr "" +msgstr "ya se ha registrado un conflicto para la primitiva \"{0}\"" #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87 @@ -2709,10 +2718,10 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 msgid "changesets" -msgstr "Conjunto de cambios" +msgstr "conjuntos de cambios" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38 #, java-format msgid "parameter ''{0}'' is not a valid type name, got ''{1}''" -msgstr "" +msgstr "el parámetro \"{0}\" no es un nombre de tipo válido, se obtuvo \"{1}\"" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50 @@ -2725,6 +2734,6 @@ msgid "{0} member" msgid_plural "{0} members" -msgstr[0] "(miembro {0})" -msgstr[1] "(miembros {0})" +msgstr[0] "miembro {0}" +msgstr[1] "miembros {0}" #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:131 @@ -2735,5 +2744,5 @@ #: build/trans_presets.java:3002 msgid "railway" -msgstr "Ferrocarril" +msgstr "ferrocarril" #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:133 @@ -2760,10 +2769,10 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:162 msgid "There's no version valid at date ''{0}'' in this history" -msgstr "" +msgstr "No hay ninguna versión válida en la fecha ''{0}'' en este historial" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173 #, java-format msgid "parameter ''{0}'' in range 0..{1} expected, got {2}" -msgstr "" +msgstr "se esperaba el parámetro ''{0}'' en el intervalo 0..{1}, se obtuvo {2}" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179 @@ -2777,9 +2786,11 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30 msgid "Didn't find an primitive with id {0} in this dataset" -msgstr "No se encontró ninguna primitiva con id {0} en este conjunto de datos" +msgstr "No se encontró ninguna primitiva con ID {0} en este conjunto de datos" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36 msgid "Didn't find an primitive with id {0} and version {1} in this dataset" msgstr "" +"No se encontró ninguna primitiva con ID {0} y versión {1} en este conjunto " +"de datos" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31 @@ -2792,4 +2803,6 @@ msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''" msgstr "" +"no se puede comparar la primitiva con ID ''{0}'' con la primitiva con ID " +"''{1}''" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 @@ -2797,9 +2810,9 @@ #, java-format msgid "parameter {0} not in range 0..{1}, got {2}" -msgstr "" +msgstr "el parametro {0} no está en el intervalo 0..{1}, se obtuvo {2}" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230 msgid "Area style way is not closed." -msgstr "Estilo de área sin cerrar" +msgstr "Vía de tipo área sin cerrar" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438 @@ -2817,5 +2830,5 @@ #, java-format msgid "Deleted member ''{0}'' in relation." -msgstr "Borrado miembro ''{0}'' en la relación." +msgstr "Miembro ''{0}'' borrado en la relación." #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:555 @@ -2823,18 +2836,18 @@ #, java-format msgid "Way ''{0}'' with less than two points." -msgstr "La vía ''{0}'' con menos de dos puntos." +msgstr "Vía ''{0}'' con menos de dos puntos." #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:560 msgid "More than one \"from\" way found." -msgstr "Encontrado más de un \"desde\" en la vía." +msgstr "Se ha encontrado más de una vía \"desde\"." #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:566 msgid "More than one \"to\" way found." -msgstr "Encontrado más de un \"hacia\" en la vía." +msgstr "Se ha encontrado más de una vía \"a\"." #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:572 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585 msgid "More than one \"via\" found." -msgstr "Encontrada más de una \"via\"" +msgstr "Se ha encontrado más de un elemento \"vía\"." #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577 @@ -2842,43 +2855,43 @@ #, java-format msgid "Unknown role ''{0}''." -msgstr "Rol desconocido ''{0}''." +msgstr "Rol ''{0}'' desconocido." #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:593 #, java-format msgid "Unknown member type for ''{0}''." -msgstr "Tipo desconocido para el miembro \"{0}\"." +msgstr "Tipo de miembro \"{0}\" desconocido." #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:598 msgid "No \"from\" way found." -msgstr "Ningún \"desde\" encontrado en la vía." +msgstr "No se ha encontrado ninguna vía \"desde\"." #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:602 msgid "No \"to\" way found." -msgstr "Ningún \"hacia\" encontrado en la vía." +msgstr "No se ha encontrado ninguna vía \"a\"." #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606 msgid "No \"via\" node or way found." -msgstr "No se ha especificado una \"via\"" +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:615 msgid "The \"from\" way doesn't start or end at a \"via\" node." -msgstr "El tramo \"from\" no comienza o termina en un nodo \"via\"." +msgstr "La vía \"desde\" no comienza o termina en un nodo \"vía\"." #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:619 msgid "The \"to\" way doesn't start or end at a \"via\" node." -msgstr "El tramo \"to\" no comienza o termina en un nodo \"via\"." +msgstr "La vía \"a\" no comienza o termina en un nodo \"vía\"." #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631 msgid "The \"from\" way doesn't start or end at the \"via\" way." -msgstr "El tramo \"from\" no comienza o termina en un nodo \"via\"." +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:635 msgid "The \"to\" way doesn't start or end at the \"via\" way." -msgstr "El tramo \"to\" no comienza o termina en un nodo \"via\"." +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:753 #, java-format msgid "Style for restriction {0} not found." -msgstr "Stilo para la restricción {0} no encontrado." +msgstr "No se ha encontrado el estilo para la restricción {0}." #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809 @@ -2934,12 +2947,12 @@ "Keeping my primitive. " msgstr "" -"Mi primitiva con el id {0} y versión {1} es visible, aunque su versión " +"Mi primitiva con el ID {0} y versión {1} es visible, aunque su versión " "primitiva con la versión inferior {2} no es visible. No se puede hacer " -"frente a esta incongruencia. Manteneniendo mi primitiva. " +"frente a esta incongruencia. Se mantiene mi primitiva. " #: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 #, java-format msgid " [id: {0}]" -msgstr " [id: {0}]" +msgstr " [ID: {0}]" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 @@ -3014,10 +3027,10 @@ #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77 msgid "Message of the day not available" -msgstr "Mensaje del dia no está disponible" +msgstr "El mensaje del dia no está disponible" #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82 #, java-format msgid "- running version is {0}" -msgstr "- la versión en ejecución es {0}" +msgstr "- la versión en ejecución es la {0}" #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119 @@ -3028,5 +3041,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 msgid "Upload Preferences" -msgstr "Actualizando preferencias" +msgstr "Subir preferencias" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 @@ -3380,5 +3393,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 @@ -3396,5 +3409,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3460,5 +3473,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130 msgid "Pending property conflicts to be resolved" -msgstr "" +msgstr "Conflictos de propiedad a la espera de ser resueltos" #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207 @@ -3470,5 +3483,5 @@ #, java-format msgid "parameter current out of range: got {0}" -msgstr "" +msgstr "pa´rametro actual fuera del rango: obtenido {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:591 @@ -3481,5 +3494,5 @@ #, java-format msgid "unexpected value of parameter \"index\". Got {0}" -msgstr "" +msgstr "inexperado valor del parámetro \"index\". Obtenido {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778 @@ -3590,4 +3603,6 @@ "merged elements" msgstr "" +"Copia su elemento seleccionado después del primer elemento seleccionado en " +"la lista de elementos fusionados" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632 @@ -3597,5 +3612,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634 msgid "Move up the selected elements by one position" -msgstr "" +msgstr "Mover hacia arriba los elementos seleccionados en una posición" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664 @@ -3605,8 +3620,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666 msgid "Move down the selected entries by one position" -msgstr "" +msgstr "Mover ha abajo las entradas seleccionadas en una posición" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 @@ -3618,4 +3633,5 @@ msgid "Remove the selected entries from the list of merged elements" msgstr "" +"Eliminar las entradas seleccionadas de la lista de elementos fusionados" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727 @@ -3643,4 +3659,6 @@ "Click {0} to start merging my and their entries" msgstr "" +"Hacer clic{0} para iniciar la fusión de las entradas " +"mías y de suyas" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793 @@ -3650,4 +3668,6 @@ "html>" msgstr "" +"Hacer clic{0} para terminar la fusión de las entradas " +"mías y suyas" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812 @@ -3703,4 +3723,6 @@ "adjustment" msgstr "" +"ajustable {0} no se ha registrado todavía. No se puede establecer la " +"participación en el ajuste sincronizado" #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:899 @@ -3708,5 +3730,5 @@ #, java-format msgid "adjustable {0} not registered yet" -msgstr "" +msgstr "ajustable {0} no se ha registrado todavía" #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27 @@ -3779,4 +3801,5 @@ msgid "Properties in my dataset, i.e. the local dataset" msgstr "" +"Propiedade de mi conjunto de datos, es decir el conjunto de datos locales" #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88 @@ -3907,10 +3930,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647 msgid "Undecide conflict between visible state" -msgstr "" +msgstr "Conflicto entre estado visibles sin decidir" #. setting up the member table #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3957,5 +3980,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 @@ -3969,5 +3992,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4039,5 +4062,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 @@ -4296,5 +4319,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 @@ -4339,34 +4362,34 @@ msgstr "Propiedades / Miembros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -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:65 -msgid "Delete the selected relation" -msgstr "Borrar la relación seleccionada" - #. item "Land use/Quarry" text "Name" #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relaciones" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 msgid "Open a list of all relations." msgstr "Abrir una lista de todas las relaciones." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Create a new relation" msgstr "Crear un anueva relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 #, java-format msgid "Relations: {0}" msgstr "Relaciones: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 +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:274 +msgid "Delete the selected relation" +msgstr "Borrar la relación seleccionada" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 @@ -4458,88 +4481,88 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 msgid "Apply Changes" msgstr "Aplicar cambios" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 msgid "Basic" msgstr "Básico" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "Occupied By" msgstr "Ocupado por" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "linked" msgstr "enlazado" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move Up" msgstr "Mover hacia arriba" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move the currently selected members up" msgstr "Mover los miembro(s) seleccionos hacia arriba" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Add Selected" msgstr "Añadir seleccionado" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 msgid "Add all currently selected objects as members" msgstr "Añadir todos los objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 msgid "Remove Selected" msgstr "Eliminar seleccionados" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 msgid "Remove all currently selected objects from relation" msgstr "Eliminar todos los objetos seleccionados de la relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 msgid "Sort" msgstr "Ordenar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 msgid "Sort the selected relation members or the whole list" msgstr "Ordenar los miembros de la relación seleccionada o toda la lista" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move Down" msgstr "Mueve hacia abajo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move the currently selected members down" msgstr "Mover los miembros seleccionados hacia abajo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 msgid "Remove the member in the current table row from this relation" msgstr "Eliminar el miembro en la fila de tabla actual de esta relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 msgid "Download Members" msgstr "Descargar miembros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 msgid "Download all incomplete ways and nodes in relation" msgstr "Descargar todas las vías y nodos incompletos de esta relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 #, java-format msgid "Members: {0} (linked: {1})" msgstr "Miembros: {0} (enlazados: {1})" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 #, java-format msgid "Relation Editor: {0}" msgstr "Editor de relación: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +msgstr "Descargar relación de miembros" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 #, java-format @@ -4547,27 +4570,27 @@ msgstr "Existió {0} conflictos durante la importación." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +msgstr "Conflictos en dato" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#, java-format +msgid "Create new relation in layer ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 -#, fuzzy, java-format -msgid "Create new relation in layer ''{0}''" -msgstr "Crear nueva relación" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98 -#, fuzzy, java-format +#, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "Editar nueva relación" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "Editar relación #{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -6761,12 +6784,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 +msgid "Map Paint Styles" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" msgstr "Estilo usado" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 -msgid "Map Paint Styles" -msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 @@ -7432,10 +7455,10 @@ #, java-format msgid "(Code={0})" -msgstr "" +msgstr "(Código={0})" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93 #, java-format msgid "The server replied an error with code {0}" -msgstr "" +msgstr "El servidor responde con un error con código {0}" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -7618,5 +7641,5 @@ #, java-format msgid "parameter ''{0}'' >= 0 expected, got ''{1}''" -msgstr "" +msgstr "parámetro ''{0}'' >= 0 esperado, obtenido ''{1}'" #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72 @@ -9887,13 +9910,13 @@ #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 msgid "Edit relation" -msgstr "" +msgstr "Editar relación" #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 msgid "Edit relations" -msgstr "" +msgstr "Editar relaciones" #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:72 msgid "No relation is selected" -msgstr "" +msgstr "No se seleccionó ninguna relación" #. Add menu @@ -9973,43 +9996,39 @@ msgstr "Introduzca el peso de los valores" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74 msgid "Slippy Map" msgstr "Mapa desplazable" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Load Tile" msgstr "Cargar tesela" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91 msgid "Show Tile Status" msgstr "Mostrar estado de la tesela" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102 msgid "Request Update" msgstr "Solicitar actualización" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Load All Tiles" msgstr "Cargar todas las teselas" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123 msgid "Increase zoom" msgstr "Incrementar zoom" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132 msgid "Decrease zoom" msgstr "Reducir zoom" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 -msgid "image not loaded" -msgstr "la imagen no se carga" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -msgid "image loading..." -msgstr "cargando imagen..." +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 +msgid "image " +msgstr "" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 @@ -10050,14 +10069,18 @@ msgstr "Fondo de pantalla apagado: " -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146 msgid "error loading metadata" msgstr "error al cargar los metadatos" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 +msgid "error requesting update: not zoom-level 12" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 #, java-format msgid "requested: {0}" msgstr "solicitado:{0}" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168 msgid "error requesting update" msgstr "errore al solicitar actualización" @@ -11167,5 +11190,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92 msgid "Unnamed junction" -msgstr "" +msgstr "Cruce sin nombre" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99 @@ -22906,5 +22929,5 @@ #: build/trans_validator.java:47 msgid "Unnamed unclassified highway" -msgstr "" +msgstr "autopista sin clasificar sin nombre" #. way : W : highway == unclassified && name != * @@ -23184,4 +23207,7 @@ #~ msgid "Navigation" #~ msgstr "Navegación" + +#~ msgid "image not loaded" +#~ msgstr "la imagen no se carga" #~ msgid "" @@ -23523,2 +23549,5 @@ #~ msgid "Selection too big" #~ msgstr "Selección demasiado grande" + +#~ msgid "image loading..." +#~ msgstr "cargando imagen..." Index: /applications/editors/josm/i18n/po/et.po =================================================================== --- /applications/editors/josm/i18n/po/et.po (revision 16492) +++ /applications/editors/josm/i18n/po/et.po (revision 16493) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-12 13:56+0200\n" -"PO-Revision-Date: 2009-07-09 11:22+0000\n" +"POT-Creation-Date: 2009-07-14 18:01+0200\n" +"PO-Revision-Date: 2009-07-12 13:33+0000\n" "Last-Translator: Margus Värton \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-07-12 11:51+0000\n" +"X-Launchpad-Export-Date: 2009-07-14 15:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -82,5 +82,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 @@ -211,9 +211,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Palun vali vähemalt üks juba üles laetud sõl, tee või relatsioon." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 @@ -222,5 +222,5 @@ msgstr "Hoiatus" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 #, java-format msgid "" @@ -544,6 +544,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 @@ -713,5 +713,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -743,5 +743,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 @@ -909,5 +909,5 @@ #: ../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:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "New" msgstr "Uus" @@ -2135,31 +2135,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Expected closing parenthesis." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 #, java-format msgid "" @@ -2168,5 +2173,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -3258,5 +3263,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 @@ -3274,5 +3279,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3469,5 +3474,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 @@ -3761,5 +3766,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3806,5 +3811,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 @@ -3818,5 +3823,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -3888,5 +3893,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 @@ -4140,5 +4145,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 @@ -4183,34 +4188,34 @@ msgstr "Seaded / Liikmelisus" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -msgid "Open an editor for the selected relation" -msgstr "Ava toimetajas valitud seos" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -msgid "Delete the selected relation" -msgstr "Kustuta valitud seos" - #. item "Land use/Quarry" text "Name" #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Seosed" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 msgid "Open a list of all relations." msgstr "Ava kõikide seoste nimekiri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Create a new relation" msgstr "Loo uus seos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 #, java-format msgid "Relations: {0}" msgstr "Seosed: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 +msgid "Open an editor for the selected relation" +msgstr "Ava toimetajas valitud seos" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 +msgid "Delete the selected relation" +msgstr "Kustuta valitud seos" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 @@ -4301,88 +4306,88 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 msgid "Apply Changes" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 msgid "Basic" msgstr "Lihtne" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "Occupied By" msgstr "Kasutab" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "linked" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move the currently selected members up" msgstr "Liiguta hetkel valitud liiget ülespoole" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Add Selected" msgstr "Lisa valitud" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 msgid "Add all currently selected objects as members" msgstr "Lisa kõik hetkel valitud objektid liikmetena" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 msgid "Remove Selected" msgstr "Eemalda valitud" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 msgid "Remove all currently selected objects from relation" msgstr "Eemalda kõik hetkel valitud objektid seosest" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 msgid "Sort the selected relation members or the whole list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move the currently selected members down" msgstr "Liiguta hetkel valitud liiget allapoole" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 msgid "Remove the member in the current table row from this relation" msgstr "Eemalda hetkel valitud tabelirea liige sellest seosest" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 msgid "Download Members" msgstr "Lae alla liikmed" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 msgid "Download all incomplete ways and nodes in relation" msgstr "Lae alla kõik sellest seosest puudu olevad teed ja puntid" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 #, java-format msgid "Members: {0} (linked: {1})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 #, java-format msgid "Relation Editor: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 msgid "Download relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 #, java-format @@ -4390,27 +4395,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Conflicts in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#, java-format +msgid "Create new relation in layer ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 -#, fuzzy, java-format -msgid "Create new relation in layer ''{0}''" -msgstr "Loo uus seos" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98 -#, fuzzy, java-format +#, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "Muuda uut seost" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "Muuda seost #{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -6543,11 +6548,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 +msgid "Map Paint Styles" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 -msgid "Map Paint Styles" msgstr "" @@ -9598,42 +9603,38 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74 msgid "Slippy Map" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Load Tile" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91 msgid "Show Tile Status" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102 msgid "Request Update" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Load All Tiles" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123 msgid "Increase zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132 msgid "Decrease zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 -msgid "image not loaded" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -msgid "image loading..." +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 +msgid "image " msgstr "" @@ -9675,14 +9676,18 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146 msgid "error loading metadata" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 +msgid "error requesting update: not zoom-level 12" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 #, java-format msgid "requested: {0}" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168 msgid "error requesting update" msgstr "" Index: /applications/editors/josm/i18n/po/fi.po =================================================================== --- /applications/editors/josm/i18n/po/fi.po (revision 16492) +++ /applications/editors/josm/i18n/po/fi.po (revision 16493) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-12 13:56+0200\n" -"PO-Revision-Date: 2009-07-09 11:30+0000\n" +"POT-Creation-Date: 2009-07-14 18:01+0200\n" +"PO-Revision-Date: 2009-07-12 13:30+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Finnish \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-07-12 11:51+0000\n" +"X-Launchpad-Export-Date: 2009-07-14 15:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -82,5 +82,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 @@ -211,9 +211,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 @@ -222,5 +222,5 @@ msgstr "Varoitus" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 #, java-format msgid "" @@ -545,6 +545,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 @@ -716,5 +716,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -746,5 +746,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 @@ -914,5 +914,5 @@ #: ../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:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "New" msgstr "Uusi" @@ -2150,31 +2150,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 msgid "Missing arguments for or." msgstr "Loogiselta operaattorilta \"tai\" (or) puuttuu parametri." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 msgid "Missing argument for not." msgstr "Loogiselta operaattorilta \"ei\" (not) puuttuu parametri." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Expected closing parenthesis." msgstr "Päättävä sulkumerkki puuttuu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 #, java-format msgid "" @@ -2183,5 +2188,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -3279,5 +3284,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 @@ -3295,5 +3300,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3490,5 +3495,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 @@ -3782,5 +3787,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3827,5 +3832,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 @@ -3839,5 +3844,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -3910,5 +3915,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 @@ -4161,5 +4166,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 @@ -4204,34 +4209,34 @@ msgstr "Ominaisuudet / Jäsenyydet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -msgid "Open an editor for the selected relation" -msgstr "Avaa valittu relaatio muokkaimeen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -msgid "Delete the selected relation" -msgstr "Poista valittu relaatio" - #. item "Land use/Quarry" text "Name" #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relaatiot" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 msgid "Open a list of all relations." msgstr "Avaa lista kaikista relaatioista." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Create a new relation" msgstr "Luo uusi relaatio" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 #, java-format msgid "Relations: {0}" msgstr "Relaatiot: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 +msgid "Open an editor for the selected relation" +msgstr "Avaa valittu relaatio muokkaimeen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 +msgid "Delete the selected relation" +msgstr "Poista valittu relaatio" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 @@ -4323,88 +4328,88 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 msgid "Apply Changes" msgstr "Toteuta muutokset" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 msgid "Basic" msgstr "Perus" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "Occupied By" msgstr "Jäsen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "linked" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move Up" msgstr "Siirrä ylöspäin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move the currently selected members up" msgstr "Siirrä valittuja jäseniä ylöspäin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Add Selected" msgstr "Lisää valitut" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 msgid "Add all currently selected objects as members" msgstr "Lisää valitut objektit jäseniksi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 msgid "Remove Selected" msgstr "Poista valitut" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 msgid "Remove all currently selected objects from relation" msgstr "Poista kaikki valitut objektit relaatiosta" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 msgid "Sort the selected relation members or the whole list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move Down" msgstr "Siirrä alaspäin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move the currently selected members down" msgstr "Siirrä valittuja jäseniä alaspäin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 msgid "Remove the member in the current table row from this relation" msgstr "Poista taulukon aktiivisella rivillä oleva jäsen relaatiosta" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 msgid "Download Members" msgstr "Lataa jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 msgid "Download all incomplete ways and nodes in relation" msgstr "Lataa kaikki keskeneräiset polut ja pisteet relaatiossa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 #, java-format msgid "Members: {0} (linked: {1})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 #, java-format msgid "Relation Editor: {0}" msgstr "Relaatioeditori: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 msgid "Download relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 #, java-format @@ -4412,27 +4417,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Conflicts in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#, java-format +msgid "Create new relation in layer ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 -#, fuzzy, java-format -msgid "Create new relation in layer ''{0}''" -msgstr "Luo uusi relaatio" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98 -#, fuzzy, java-format +#, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "Muokkaa uutta relaatiota" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "Muokkaa relaatiota #{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -6573,11 +6578,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 +msgid "Map Paint Styles" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 -msgid "Map Paint Styles" msgstr "" @@ -9684,42 +9689,38 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74 msgid "Slippy Map" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Load Tile" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91 msgid "Show Tile Status" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102 msgid "Request Update" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Load All Tiles" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123 msgid "Increase zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132 msgid "Decrease zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 -msgid "image not loaded" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -msgid "image loading..." +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 +msgid "image " msgstr "" @@ -9761,14 +9762,18 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146 msgid "error loading metadata" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 +msgid "error requesting update: not zoom-level 12" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 #, java-format msgid "requested: {0}" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168 msgid "error requesting update" msgstr "" Index: /applications/editors/josm/i18n/po/fr.po =================================================================== --- /applications/editors/josm/i18n/po/fr.po (revision 16492) +++ /applications/editors/josm/i18n/po/fr.po (revision 16493) @@ -6,5 +6,5 @@ "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-12 13:56+0200\n" +"POT-Creation-Date: 2009-07-14 18:01+0200\n" "PO-Revision-Date: 2009-07-09 11:33+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -14,5 +14,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2009-07-12 11:50+0000\n" +"X-Launchpad-Export-Date: 2009-07-14 15:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -84,5 +84,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 @@ -216,10 +216,10 @@ "\"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" "Veuillez sélectionner au moins un nœud, chemin ou relation déjà chargé." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 @@ -228,5 +228,5 @@ msgstr "Avertissement" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 #, java-format msgid "" @@ -564,6 +564,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 @@ -735,5 +735,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -765,5 +765,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 @@ -938,5 +938,5 @@ #: ../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:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "New" msgstr "Nouveau" @@ -2237,5 +2237,10 @@ "d'utilisation : clé=valeur" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2244,26 +2249,26 @@ "relation" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 #, java-format msgid "Unexpected token: {0}" msgstr "Jeton inattendu : {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 msgid "Missing arguments for or." msgstr "Arguments manquants pour le OU" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 msgid "Missing argument for not." msgstr "Arguments manquants pour le -" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Expected closing parenthesis." msgstr "Les parenthèses doivent être fermées." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 msgid "Wrong number of parameters for nodes operator." msgstr "Erreur de nombre de paramètre pour une opération sur des nœuds." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 #, java-format msgid "" @@ -2275,5 +2280,5 @@ "10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -3401,5 +3406,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 @@ -3417,5 +3422,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3631,5 +3636,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 @@ -3943,5 +3948,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3991,5 +3996,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 @@ -4003,5 +4008,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4075,5 +4080,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 @@ -4339,5 +4344,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 @@ -4382,34 +4387,34 @@ msgstr "Propriétés / Appartenances" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -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:65 -msgid "Delete the selected relation" -msgstr "Supprimer la relation sélectionnée" - #. item "Land use/Quarry" text "Name" #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 msgid "Open a list of all relations." msgstr "Ouvrir une liste de toutes les relations." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Create a new relation" msgstr "Créer une nouvelle relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 #, java-format msgid "Relations: {0}" msgstr "Relations : {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 +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:274 +msgid "Delete the selected relation" +msgstr "Supprimer la relation sélectionnée" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 @@ -4502,88 +4507,88 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 msgid "Apply Changes" msgstr "Appliquer les modifications" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 msgid "Basic" msgstr "Basique" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "Occupied By" msgstr "Occupé par" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "linked" msgstr "lié" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move Up" msgstr "Déplacer vers le haut" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move the currently selected members up" msgstr "Déplacer les membres sélectionnés vers le haut" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Add Selected" msgstr "Ajouter la sélection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 msgid "Add all currently selected objects as members" msgstr "Ajouter les objets sélectionnés en tant que membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 msgid "Remove Selected" msgstr "Supprimer la sélection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 msgid "Remove all currently selected objects from relation" msgstr "Retirer tous les objets sélectionnés de la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 msgid "Sort the selected relation members or the whole list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move Down" msgstr "Déplacer vers le bas" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move the currently selected members down" msgstr "Déplacer les membres sélectionnés vers le bas" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 msgid "Remove the member in the current table row from this relation" msgstr "Supprimer le membre de cette relation de l'entrée actuelle de la table" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 msgid "Download Members" msgstr "Télécharger les membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 msgid "Download all incomplete ways and nodes in relation" msgstr "Télécharger tous les chemins et les nœuds incomplets dans la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 #, java-format msgid "Members: {0} (linked: {1})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 #, java-format msgid "Relation Editor: {0}" msgstr "Editeur de relation : {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 msgid "Download relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 #, java-format @@ -4591,27 +4596,27 @@ msgstr "Il y a eu {0} conflits durant l'import." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Conflicts in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#, java-format +msgid "Create new relation in layer ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 -#, fuzzy, java-format -msgid "Create new relation in layer ''{0}''" -msgstr "Créer une nouvelle relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98 -#, fuzzy, java-format +#, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "Éditer une nouvelle relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "Editer la relation #{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -6832,11 +6837,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 +msgid "Map Paint Styles" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 -msgid "Map Paint Styles" msgstr "" @@ -10083,43 +10088,39 @@ msgstr "Entrez les valeurs du poids" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74 msgid "Slippy Map" msgstr "Carte glissante" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Load Tile" msgstr "Charger la tuile" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91 msgid "Show Tile Status" msgstr "Montrer le status de la dalle" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102 msgid "Request Update" msgstr "Demander une mise à jour" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Load All Tiles" msgstr "Charger toutes les dalles" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123 msgid "Increase zoom" msgstr "Augmenter le zoom" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132 msgid "Decrease zoom" msgstr "Diminuer le zoom" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" msgstr "Réinitialiser la mémoire tampon des tuiles" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 -msgid "image not loaded" -msgstr "image non chargée" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -msgid "image loading..." -msgstr "chargement de l’image..." +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 +msgid "image " +msgstr "" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 @@ -10160,14 +10161,18 @@ msgstr "Pâlissement graduel de l'arrière plan : " -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146 msgid "error loading metadata" msgstr "Erreur lors du chargement des metadata" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 +msgid "error requesting update: not zoom-level 12" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 #, java-format msgid "requested: {0}" msgstr "demandé : {0}" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168 msgid "error requesting update" msgstr "Error lors de la mise à jour" @@ -23302,4 +23307,7 @@ #~ msgstr "Navigation" +#~ msgid "image not loaded" +#~ msgstr "image non chargée" + #~ msgid "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -23665,2 +23673,5 @@ #~ msgid "Error when communicating with server." #~ msgstr "Erreur de communication avec le serveur" + +#~ msgid "image loading..." +#~ msgstr "chargement de l’image..." Index: /applications/editors/josm/i18n/po/gl.po =================================================================== --- /applications/editors/josm/i18n/po/gl.po (revision 16492) +++ /applications/editors/josm/i18n/po/gl.po (revision 16493) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-12 13:56+0200\n" +"POT-Creation-Date: 2009-07-14 18:01+0200\n" "PO-Revision-Date: 2009-06-27 15:34+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-07-12 11:51+0000\n" +"X-Launchpad-Export-Date: 2009-07-14 15:27+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -82,5 +82,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 @@ -211,9 +211,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 @@ -222,5 +222,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 #, java-format msgid "" @@ -545,6 +545,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 @@ -717,5 +717,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -747,5 +747,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 @@ -917,5 +917,5 @@ #: ../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:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "New" msgstr "Nova" @@ -2191,5 +2191,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2198,26 +2203,26 @@ "relación" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 msgid "Missing arguments for or." msgstr "Faltan argumentos para OR." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 msgid "Missing argument for not." msgstr "Faltan argumentos para NOT." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Expected closing parenthesis." msgstr "Esperabase parentese de peche." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 msgid "Wrong number of parameters for nodes operator." msgstr "Número de parámetros incorrecto para o operador nodes." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 #, java-format msgid "" @@ -2228,5 +2233,5 @@ "de nodos ou un rango, por exemplo nodes:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -3340,5 +3345,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 @@ -3356,5 +3361,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3551,5 +3556,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 @@ -3845,5 +3850,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3890,5 +3895,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 @@ -3902,5 +3907,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -3972,5 +3977,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 @@ -4227,5 +4232,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 @@ -4270,34 +4275,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -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:65 -msgid "Delete the selected relation" -msgstr "Borrar a relación seleccionada" - #. item "Land use/Quarry" text "Name" #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relacións" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 msgid "Open a list of all relations." msgstr "Abrir unha lista con todas as relacións." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Create a new relation" msgstr "Crear unha nova relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 #, java-format msgid "Relations: {0}" msgstr "Relacións: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 +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:274 +msgid "Delete the selected relation" +msgstr "Borrar a relación seleccionada" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 @@ -4390,88 +4395,88 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 msgid "Apply Changes" msgstr "Aplicar Cambios" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 msgid "Basic" msgstr "Básico" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "Occupied By" msgstr "Ocupado por" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "linked" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move Up" msgstr "Mover cara arriba" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move the currently selected members up" msgstr "Mover os membros actualmente seleccionados cara arriba" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Add Selected" msgstr "Engadir Seleccionados" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 msgid "Add all currently selected objects as members" msgstr "Engadir todos os obxectos seleccionados actualmente como membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 msgid "Remove Selected" msgstr "Eliminar Seleccionados" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 msgid "Remove all currently selected objects from relation" msgstr "Eliminar da relación todos os obxectos seleccionados actualmente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 msgid "Sort the selected relation members or the whole list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move Down" msgstr "Mover cara abaixo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move the currently selected members down" msgstr "Mover os membros seleccionados actualmente cara abaixo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 msgid "Remove the member in the current table row from this relation" msgstr "Eliminar o membro da fila actual desta relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 msgid "Download Members" msgstr "Descargar Membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 msgid "Download all incomplete ways and nodes in relation" msgstr "Descargar todas as vías e nodos incompletos na relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 #, java-format msgid "Members: {0} (linked: {1})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 #, java-format msgid "Relation Editor: {0}" msgstr "Editor de Relación: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 msgid "Download relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 #, java-format @@ -4479,27 +4484,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Conflicts in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#, java-format +msgid "Create new relation in layer ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 -#, fuzzy, java-format -msgid "Create new relation in layer ''{0}''" -msgstr "Crear nova relación" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98 -#, fuzzy, java-format +#, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "Editar nova relación" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "Editar relación #{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -6676,11 +6681,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 +msgid "Map Paint Styles" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 -msgid "Map Paint Styles" msgstr "" @@ -9780,42 +9785,38 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74 msgid "Slippy Map" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Load Tile" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91 msgid "Show Tile Status" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102 msgid "Request Update" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Load All Tiles" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123 msgid "Increase zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132 msgid "Decrease zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 -msgid "image not loaded" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -msgid "image loading..." +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 +msgid "image " msgstr "" @@ -9857,14 +9858,18 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146 msgid "error loading metadata" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 +msgid "error requesting update: not zoom-level 12" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 #, java-format msgid "requested: {0}" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168 msgid "error requesting update" msgstr "" Index: /applications/editors/josm/i18n/po/he.po =================================================================== --- /applications/editors/josm/i18n/po/he.po (revision 16492) +++ /applications/editors/josm/i18n/po/he.po (revision 16493) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-12 13:56+0200\n" +"POT-Creation-Date: 2009-07-14 18:01+0200\n" "PO-Revision-Date: 2009-06-27 16:03+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-07-12 11:50+0000\n" +"X-Launchpad-Export-Date: 2009-07-14 15:27+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -82,5 +82,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 @@ -211,9 +211,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 @@ -222,5 +222,5 @@ msgstr "אזהרה" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 #, java-format msgid "" @@ -541,6 +541,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 @@ -710,5 +710,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -740,5 +740,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 @@ -907,5 +907,5 @@ #: ../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:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "New" msgstr "חדש" @@ -2119,31 +2119,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 msgid "Missing arguments for or." msgstr "חסרים ארגומנטים ל-or." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 msgid "Missing argument for not." msgstr "חסרים ארגומנטים ל-not." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Expected closing parenthesis." msgstr "ציפיתי לסוגר סוגריים." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 msgid "Wrong number of parameters for nodes operator." msgstr "מספר שגוי של פרמטרים עבור פעולה על נקודה." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 #, java-format msgid "" @@ -2152,5 +2157,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -3244,5 +3249,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 @@ -3260,5 +3265,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3463,5 +3468,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 @@ -3755,5 +3760,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3800,5 +3805,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 @@ -3812,5 +3817,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -3882,5 +3887,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 @@ -4133,5 +4138,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 @@ -4176,34 +4181,34 @@ msgstr "תכונות \\ חברויות" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -msgid "Open an editor for the selected relation" -msgstr "פתח עורך עבור היחס הנבחר" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -msgid "Delete the selected relation" -msgstr "מחק את היחס הנבחר" - #. item "Land use/Quarry" text "Name" #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 #: build/trans_presets.java:2967 msgid "Relations" msgstr "יחסים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 msgid "Open a list of all relations." msgstr "פתח רשימה של כל היחסים." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Create a new relation" msgstr "צור יחס חדש" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 #, java-format msgid "Relations: {0}" msgstr "יחסים: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 +msgid "Open an editor for the selected relation" +msgstr "פתח עורך עבור היחס הנבחר" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 +msgid "Delete the selected relation" +msgstr "מחק את היחס הנבחר" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 @@ -4293,88 +4298,88 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 msgid "Apply Changes" msgstr "החל שינויים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 msgid "Basic" msgstr "בסיסי" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "Occupied By" msgstr "תפוס ע\"י" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "linked" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move Up" msgstr "העלה" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move the currently selected members up" msgstr "הזז את החברים הנבחרים מעלה" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Add Selected" msgstr "הוסף את הנבחרים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 msgid "Add all currently selected objects as members" msgstr "הוסף את כל העצמים הנבחרים כחברים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 msgid "Remove Selected" msgstr "הסרת הנבחרים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 msgid "Remove all currently selected objects from relation" msgstr "הסר את כל העצמים הנבחרים מהיחס" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 msgid "Sort the selected relation members or the whole list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move Down" msgstr "הורד" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move the currently selected members down" msgstr "הזז מטה את החברים שנבחרו" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 msgid "Remove the member in the current table row from this relation" msgstr "הסר את החבר בשורת הטבלה הבחורה מהיחס" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 msgid "Download Members" msgstr "הורד חברים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 msgid "Download all incomplete ways and nodes in relation" msgstr "הורד את כל הדרכים והנקודות הבלתי שלמות ביחס" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 #, java-format msgid "Members: {0} (linked: {1})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 #, java-format msgid "Relation Editor: {0}" msgstr "עורך יחסים: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 msgid "Download relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 #, java-format @@ -4382,27 +4387,27 @@ msgstr "נמצאו {0} התנגשויות במהלך היבוא" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Conflicts in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#, java-format +msgid "Create new relation in layer ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 -#, fuzzy, java-format -msgid "Create new relation in layer ''{0}''" -msgstr "צור יחס חדש" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98 -#, fuzzy, java-format +#, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "ערוך יחס חדש" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "ערוך יחס מספר {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -6537,11 +6542,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 +msgid "Map Paint Styles" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 -msgid "Map Paint Styles" msgstr "" @@ -9612,42 +9617,38 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74 msgid "Slippy Map" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Load Tile" msgstr "טען משטח" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91 msgid "Show Tile Status" msgstr "הראה מצב משטח" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102 msgid "Request Update" msgstr "בקש עדכון" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Load All Tiles" msgstr "טען את כל המשטחים" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123 msgid "Increase zoom" msgstr "הגדל" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132 msgid "Decrease zoom" msgstr "הקטן" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 -msgid "image not loaded" -msgstr "תמונה לא נטענה" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -msgid "image loading..." +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 +msgid "image " msgstr "" @@ -9689,14 +9690,18 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146 msgid "error loading metadata" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 +msgid "error requesting update: not zoom-level 12" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 #, java-format msgid "requested: {0}" msgstr "התבקש: {0}" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168 msgid "error requesting update" msgstr "שגיאה בבקשת עדכון" @@ -22675,4 +22680,7 @@ #~ msgstr "ניווט" +#~ msgid "image not loaded" +#~ msgstr "תמונה לא נטענה" + #~ msgid "Adjust the position of the WMS layer" #~ msgstr "התאם את מיקום שכבת WMS" Index: /applications/editors/josm/i18n/po/is.po =================================================================== --- /applications/editors/josm/i18n/po/is.po (revision 16492) +++ /applications/editors/josm/i18n/po/is.po (revision 16493) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-12 13:56+0200\n" -"PO-Revision-Date: 2009-07-11 18:26+0000\n" +"POT-Creation-Date: 2009-07-14 18:01+0200\n" +"PO-Revision-Date: 2009-07-12 17:42+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-07-12 11:51+0000\n" +"X-Launchpad-Export-Date: 2009-07-14 15:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -82,5 +82,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 @@ -211,16 +211,16 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 msgid "Warning" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +msgstr "Aðvörun" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 #, java-format msgid "" @@ -547,6 +547,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 @@ -714,5 +714,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -744,5 +744,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 @@ -912,5 +912,5 @@ #: ../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:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "New" msgstr "Ný" @@ -1988,5 +1988,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87 msgid "type=route - key 'type' with value exactly 'route'." -msgstr "" +msgstr "type=route - lykilinn „type“ með gildið „route“." #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88 @@ -1995,4 +1995,6 @@ "type=, *=*, *=" msgstr "" +"type=* - lykillinn „type“ með hvaða gildi sem er. Prófaðu einnig " +"*=gildi, type=, *=* og *=" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89 @@ -2046,10 +2048,10 @@ msgid "" "child expr - all children of objects matching the expression" -msgstr "" +msgstr "child segð - allir undirhlutir sem passa við segðina" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "" "parent expr - all parents of objects matching the expression" -msgstr "" +msgstr "parent segð - allir yfirhlutir sem passa við segðina" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 @@ -2120,31 +2122,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Expected closing parenthesis." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 #, java-format msgid "" @@ -2153,5 +2160,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2538,5 +2545,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123 msgid "incomplete" -msgstr "" +msgstr "óklárað" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48 @@ -2829,5 +2836,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 msgid "incomplete way" -msgstr "" +msgstr "ókláraður vegur" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102 @@ -3242,5 +3249,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 @@ -3258,5 +3265,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3453,5 +3460,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 @@ -3745,5 +3752,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3770,5 +3777,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51 msgid "" -msgstr "" +msgstr "<óskilgreint>" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38 @@ -3790,5 +3797,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 @@ -3802,5 +3809,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -3872,5 +3879,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 @@ -4123,5 +4130,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 @@ -4166,34 +4173,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -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:65 -msgid "Delete the selected relation" -msgstr "Eyða völdum venslum" - #. item "Land use/Quarry" text "Name" #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Vensl" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 msgid "Open a list of all relations." msgstr "Sýna lista yfir vensl" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Create a new relation" msgstr "Skapa ný vensl" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 #, java-format msgid "Relations: {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 +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:274 +msgid "Delete the selected relation" +msgstr "Eyða völdum venslum" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 @@ -4285,88 +4292,88 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 msgid "Apply Changes" msgstr "Vista breytingar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 msgid "Basic" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +msgstr "Grunnupplýsingar" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "Occupied By" msgstr "Gengt af" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "linked" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +msgstr "tengd" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move Up" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +msgstr "Færa upp" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move the currently selected members up" msgstr "Færa valda meðlimi upp" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Add Selected" msgstr "Bæta við vali" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 msgid "Add all currently selected objects as members" msgstr "Bæta völdum hlutum við venslin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 msgid "Remove Selected" msgstr "Fjarlægja val" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 msgid "Remove all currently selected objects from relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329 +msgstr "Fjarlægja valda meðlimi úr venslunum" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 msgid "Sort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 +msgstr "Raða" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 msgid "Sort the selected relation members or the whole list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +msgstr "Raða völdum meðlimum eða öllum listanum" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move Down" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +msgstr "Færa niður" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move the currently selected members down" msgstr "Færa valda meðlimi niður" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 msgid "Remove the member in the current table row from this relation" msgstr "Fjarlægja val úr venslunum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 msgid "Download Members" msgstr "Niðurhala meðlimum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 msgid "Download all incomplete ways and nodes in relation" msgstr "Hala niður öllum nóðum og vegum í þessum venslum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 #, java-format msgid "Members: {0} (linked: {1})" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 +msgstr "Stök: {0} (tengd: {1})" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 #, java-format msgid "Relation Editor: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 msgid "Download relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 #, java-format @@ -4374,27 +4381,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Conflicts in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#, java-format +msgid "Create new relation in layer ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 -#, fuzzy, java-format -msgid "Create new relation in layer ''{0}''" -msgstr "Skapa ný vensl" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98 -#, fuzzy, java-format +#, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "Breyta venslum" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "Breyta venslum #{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -4620,5 +4627,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117 msgid "Close the dialog" -msgstr "" +msgstr "Loka þessum glugga" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179 @@ -5513,4 +5520,6 @@ "{2}" msgstr "" +"Útgáfa {0} búin til {1} af " +"{2}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6003,9 +6012,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 msgid "Advanced Preferences" -msgstr "" +msgstr "Stillingarritill" #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50 msgid "Setting Preference entries directly. Use with caution!" -msgstr "" +msgstr "Hér er hægt að breyta öllum JOSM stillingum beint án annara milliliða." #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53 @@ -6013,5 +6022,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46 msgid "Search: " -msgstr "" +msgstr "Leita: " #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99 @@ -6040,5 +6049,5 @@ #, java-format msgid "New value for {0}" -msgstr "" +msgstr "Nýtt gildi fyrir {0}" #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 @@ -6220,5 +6229,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37 msgid "Local files" -msgstr "" +msgstr "Fyrir staðværar skrár" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38 @@ -6364,8 +6373,10 @@ "draw all lines." msgstr "" +"Hámarkslengd (í metrum) á milli punkta áður en hætt er að tekna línur á " +"milli þeirra. Stilltu þetta á „-1“ til að teikna allar línur." #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105 msgid "Maximum length for local files (meters)" -msgstr "" +msgstr "Hámarkslengd lína fyrir staðværar skrár (í metrum)" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110 @@ -6526,11 +6537,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 +msgid "Map Paint Styles" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 -msgid "Map Paint Styles" msgstr "" @@ -9589,42 +9600,38 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74 msgid "Slippy Map" msgstr "Gagnvirkt kort" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Load Tile" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91 msgid "Show Tile Status" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102 msgid "Request Update" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Load All Tiles" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123 msgid "Increase zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132 msgid "Decrease zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 -msgid "image not loaded" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -msgid "image loading..." +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 +msgid "image " msgstr "" @@ -9666,14 +9673,18 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146 msgid "error loading metadata" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 +msgid "error requesting update: not zoom-level 12" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 #, java-format msgid "requested: {0}" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168 msgid "error requesting update" msgstr "" @@ -10963,5 +10974,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 msgid "WMS Plugin Preferences" -msgstr "" +msgstr "Stillingar fyrir WMS viðbótina" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39 Index: /applications/editors/josm/i18n/po/it.po =================================================================== --- /applications/editors/josm/i18n/po/it.po (revision 16492) +++ /applications/editors/josm/i18n/po/it.po (revision 16493) @@ -5,7 +5,7 @@ "Project-Id-Version: josm 20081003\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-12 13:56+0200\n" -"PO-Revision-Date: 2009-07-09 12:16+0000\n" -"Last-Translator: Davide Prade \n" +"POT-Creation-Date: 2009-07-14 18:01+0200\n" +"PO-Revision-Date: 2009-07-12 17:15+0000\n" +"Last-Translator: FabC \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-07-12 11:51+0000\n" +"X-Launchpad-Export-Date: 2009-07-14 15:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -83,5 +83,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 @@ -211,10 +211,13 @@ "OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +"ATTENZIONE: formato inatteso per l' URL di base delle API. Il " +"reindirizzamento della pagina della storia delle primitive di OSM " +"probabilmente non funzionerà. L' URL di base per le api è: {0}" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Selezionare almeno un nodo, percorso o relazione già caricato." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 @@ -223,5 +226,5 @@ msgstr "Attenzione" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 #, java-format msgid "" @@ -229,4 +232,6 @@ "primitives only" msgstr "" +"ATTENZIONE: sto aprendo la finestra di visualizzazione solo per le prime {0} " +"delle {1} primitive selezionate" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29 @@ -371,4 +376,6 @@ "{1}" msgstr "" +"Attenzione: troncamento automatico del valore del tag {0} sulla primitiva " +"cancellata {1}" #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 @@ -378,4 +385,6 @@ "length {2}. Values length is {3}." msgstr "" +"La lunghezza del valore del tag \"{0}\" sulla primitiva {1} eccede la " +"massima lunghezza ammessa {2}. La lunghezza del valore è {3}" #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 @@ -554,6 +563,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 @@ -725,5 +734,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -755,5 +764,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 @@ -927,5 +936,5 @@ #: ../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:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "New" msgstr "Nuovo" @@ -1463,5 +1472,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 msgid "No data" -msgstr "" +msgstr "Nessun dato" #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 @@ -1615,4 +1624,6 @@ msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "" +"Attenzione: l'intestazione dell' errore {0} non coincideva con il pattern " +"atteso \"{1}\"" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 @@ -1984,9 +1995,9 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 msgid "Move them" -msgstr "" +msgstr "Muoverli" #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 msgid "Undo move" -msgstr "" +msgstr "Annullare lo spostamento" #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522 @@ -2227,5 +2238,10 @@ "etichetta. Esempio di utilizzo: key=value" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2234,26 +2250,26 @@ "relazione" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 #, java-format msgid "Unexpected token: {0}" msgstr "Token inaspettato: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 msgid "Missing arguments for or." msgstr "Argomenti mancanti per l'operatore booleano OR." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 msgid "Missing argument for not." msgstr "Argomento mancante per l'operatore booleano NOT." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Expected closing parenthesis." msgstr "Era attesa una parentesi chiusa." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 msgid "Wrong number of parameters for nodes operator." msgstr "Numero errato di parametri per operatore sui nodi." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 #, java-format msgid "" @@ -2264,5 +2280,5 @@ "richiede un numero o un intervallo di nodi, per esempio nodes:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2301,10 +2317,10 @@ #, java-format msgid "Add {0} {1}" -msgstr "" +msgstr "Aggiungere {0} {1}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46 #, java-format msgid "Change {0} {1}" -msgstr "" +msgstr "Cambiare {0} {1}" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99 @@ -2341,5 +2357,5 @@ #, java-format msgid "Change relation member role for {0} {1}" -msgstr "" +msgstr "Cambiare il membro della relazione per {0} {1}" #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 @@ -2348,4 +2364,6 @@ msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" msgstr "" +"Impossibile annullare il comando \"{0}\" perchè il layer {1} non è più " +"disponibile" #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 @@ -2465,5 +2483,5 @@ #, java-format msgid "Remove relation member {0} {1}" -msgstr "" +msgstr "Rimuovere il membro della relazione {0} {1}" #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 @@ -2499,5 +2517,5 @@ #, java-format msgid "Main dataset does not include node {0}" -msgstr "" +msgstr "Il set di dati principale non include il node {0}" #: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 @@ -2600,5 +2618,5 @@ #, java-format msgid "already registered a conflict for primitive ''{0}''" -msgstr "" +msgstr "Un conflitto per la primitca \"{0}\" è già stato registrato" #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87 @@ -3379,5 +3397,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 @@ -3395,5 +3413,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3612,5 +3630,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 @@ -3922,5 +3940,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3971,5 +3989,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 @@ -3983,5 +4001,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4056,5 +4074,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 @@ -4315,5 +4333,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 @@ -4358,34 +4376,34 @@ msgstr "Proprietà / Appartenenze" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -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:65 -msgid "Delete the selected relation" -msgstr "Cancella le relazioni selezionate" - #. item "Land use/Quarry" text "Name" #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relazioni" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 msgid "Open a list of all relations." msgstr "Apri tutte le relazioni in una lista" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Create a new relation" msgstr "Crea una nuova relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 #, java-format msgid "Relations: {0}" msgstr "Relazioni: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 +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:274 +msgid "Delete the selected relation" +msgstr "Cancella le relazioni selezionate" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 @@ -4479,89 +4497,89 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 msgid "Apply Changes" msgstr "Applica cambiamenti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 msgid "Basic" msgstr "Di base" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "Occupied By" msgstr "Occupato da" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "linked" msgstr "collegato" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move Up" msgstr "Sposta in alto" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move the currently selected members up" msgstr "Sposta in alto i membri attualmente selezionati" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Add Selected" msgstr "Aggiungi la selezione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 msgid "Add all currently selected objects as members" msgstr "Aggiungi tutti gli oggetti selezionati come membri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 msgid "Remove Selected" msgstr "Elimina gli elementi selezionati" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 msgid "Remove all currently selected objects from relation" msgstr "Rimuovi dalla relazione gli elementi selezionati" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 msgid "Sort" msgstr "Ordina" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 msgid "Sort the selected relation members or the whole list" msgstr "Ordina i membri della relazione selezionata o l'intera lista" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move Down" msgstr "Sposta in basso" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move the currently selected members down" msgstr "Sposta in basso i membri attualmente selezionati" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 msgid "Remove the member in the current table row from this relation" msgstr "" "Cancella il membro dalla riga della tabella utilizzata da questa relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 msgid "Download Members" msgstr "Scarica i membri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 msgid "Download all incomplete ways and nodes in relation" msgstr "Scarica tutti i percorsi ed i nodi incompleti di questa relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 #, java-format msgid "Members: {0} (linked: {1})" msgstr "Membri: {0} (collegato: {1})" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 #, java-format msgid "Relation Editor: {0}" msgstr "Editor relazione: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 msgid "Download relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 #, java-format @@ -4569,27 +4587,27 @@ msgstr "Ci sono stati {0} conflitti durante l'importazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Conflicts in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#, java-format +msgid "Create new relation in layer ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 -#, fuzzy, java-format -msgid "Create new relation in layer ''{0}''" -msgstr "Crea nuova relazione" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98 -#, fuzzy, java-format +#, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "Modifica nuova relazione" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "Modifica la relazione #{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -6789,12 +6807,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 +msgid "Map Paint Styles" +msgstr "Stili di disegno della mappa" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" msgstr "Stile usato" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 -msgid "Map Paint Styles" -msgstr "Stili di disegno della mappa" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 @@ -10027,43 +10045,39 @@ msgstr "Inserire i valori di peso" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74 msgid "Slippy Map" msgstr "Slippy Map" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Load Tile" msgstr "Carica il tassello" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91 msgid "Show Tile Status" msgstr "Mostra lo stato dei tasselli" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102 msgid "Request Update" msgstr "Richiesta di aggiornamento" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Load All Tiles" msgstr "Carica tutti i tasselli" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123 msgid "Increase zoom" msgstr "Aumenta l'ingrandimento" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132 msgid "Decrease zoom" msgstr "Diminuisci l'ingrandimento" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" msgstr "Svuota la Tile Cache" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 -msgid "image not loaded" -msgstr "immagine non caricata" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -msgid "image loading..." -msgstr "caricamento immagine..." +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 +msgid "image " +msgstr "" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 @@ -10104,14 +10118,18 @@ msgstr "Smorza lo sfondo: " -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146 msgid "error loading metadata" msgstr "errore nel caricamento dei metadati" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 +msgid "error requesting update: not zoom-level 12" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 #, java-format msgid "requested: {0}" msgstr "richiesta: {0}" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168 msgid "error requesting update" msgstr "errore nella richiesta di aggiornamento" @@ -23258,4 +23276,7 @@ #~ msgstr "Navigazione" +#~ msgid "image not loaded" +#~ msgstr "immagine non caricata" + #~ msgid "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -23581,2 +23602,5 @@ #~ msgid "Error when communicating with server." #~ msgstr "Errore durante la comunicazione con il server." + +#~ msgid "image loading..." +#~ msgstr "caricamento immagine..." Index: /applications/editors/josm/i18n/po/ja.po =================================================================== --- /applications/editors/josm/i18n/po/ja.po (revision 16492) +++ /applications/editors/josm/i18n/po/ja.po (revision 16493) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-12 13:56+0200\n" -"PO-Revision-Date: 2009-07-09 10:34+0000\n" +"POT-Creation-Date: 2009-07-14 18:01+0200\n" +"PO-Revision-Date: 2009-07-12 13:28+0000\n" "Last-Translator: Dirk Stöcker \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-07-12 11:49+0000\n" +"X-Launchpad-Export-Date: 2009-07-14 15:27+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -83,5 +83,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 @@ -212,9 +212,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 @@ -223,5 +223,5 @@ msgstr "警告" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 #, java-format msgid "" @@ -545,6 +545,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 @@ -716,5 +716,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -746,5 +746,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 @@ -913,5 +913,5 @@ #: ../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:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "New" msgstr "新規" @@ -2158,5 +2158,10 @@ "ださい: key=value" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2165,26 +2170,26 @@ "\"relation\"です。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 #, java-format msgid "Unexpected token: {0}" msgstr "想定外のトークン: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 msgid "Missing arguments for or." msgstr "orに引数がありません。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 msgid "Missing argument for not." msgstr "not に引数がありません。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Expected closing parenthesis." msgstr "閉じ括弧があるはずです。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 msgid "Wrong number of parameters for nodes operator." msgstr "間違った数のパラメータが、ノード演算子に渡されました。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 #, java-format msgid "" @@ -2193,5 +2198,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -3294,5 +3299,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 @@ -3310,5 +3315,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3505,5 +3510,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 @@ -3797,5 +3802,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3842,5 +3847,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 @@ -3854,5 +3859,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -3924,5 +3929,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 @@ -4173,5 +4178,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 @@ -4216,34 +4221,34 @@ msgstr "プロパティ/メンバー" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -msgid "Open an editor for the selected relation" -msgstr "選択したリレーションの編集画面を開く" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -msgid "Delete the selected relation" -msgstr "選択したリレーションを削除" - #. item "Land use/Quarry" text "Name" #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 #: build/trans_presets.java:2967 msgid "Relations" msgstr "リレーション" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 msgid "Open a list of all relations." msgstr "全てのリレーションのリストを開く" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Create a new relation" msgstr "新規リレーション作成" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 #, java-format msgid "Relations: {0}" msgstr "リレーション: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 +msgid "Open an editor for the selected relation" +msgstr "選択したリレーションの編集画面を開く" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 +msgid "Delete the selected relation" +msgstr "選択したリレーションを削除" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 @@ -4333,88 +4338,88 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 msgid "Apply Changes" msgstr "変更の適用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 msgid "Basic" msgstr "基本" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "Occupied By" msgstr "次によって占められる;" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "linked" msgstr "継げられた" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move Up" msgstr "上に移動" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move the currently selected members up" msgstr "現在選択したメンバーを一つ上に移動します" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Add Selected" msgstr "選択したものを追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 msgid "Add all currently selected objects as members" msgstr "現在選択されている全てのオブジェクトをメンバーとして追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 msgid "Remove Selected" msgstr "選択の削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 msgid "Remove all currently selected objects from relation" msgstr "現在選択されている全てのオブジェクトを関連から削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 msgid "Sort the selected relation members or the whole list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move Down" msgstr "下に移動" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move the currently selected members down" msgstr "選択したメンバーを一つ下に移動します" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 msgid "Remove the member in the current table row from this relation" msgstr "この関連から現在の行のメンバーを削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 msgid "Download Members" msgstr "メンバーのダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 msgid "Download all incomplete ways and nodes in relation" msgstr "この関連の全ての未完成のウェイとノードをダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 #, java-format msgid "Members: {0} (linked: {1})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 #, java-format msgid "Relation Editor: {0}" msgstr "関連の編集者:{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 msgid "Download relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 #, java-format @@ -4422,27 +4427,27 @@ msgstr "インポートした内容には {0} の競合があります。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Conflicts in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#, java-format +msgid "Create new relation in layer ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 -#, fuzzy, java-format -msgid "Create new relation in layer ''{0}''" -msgstr "新規関連作成" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98 -#, fuzzy, java-format +#, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "新規関連編集" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "関連 #{0}の編集" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -6593,11 +6598,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 +msgid "Map Paint Styles" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 -msgid "Map Paint Styles" msgstr "" @@ -9721,42 +9726,38 @@ msgstr "重みの値の入力" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74 msgid "Slippy Map" msgstr "スリッピーマップ" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Load Tile" msgstr "タイルの読み込み" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91 msgid "Show Tile Status" msgstr "タイルの状態を表示" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102 msgid "Request Update" msgstr "要求の更新" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Load All Tiles" msgstr "全てのタイルをロード" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123 msgid "Increase zoom" msgstr "ズームアップ" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132 msgid "Decrease zoom" msgstr "ズームダウン" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 -msgid "image not loaded" -msgstr "画像が読み込まれていません。" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -msgid "image loading..." +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 +msgid "image " msgstr "" @@ -9798,14 +9799,18 @@ msgstr "Fade background: " -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146 msgid "error loading metadata" msgstr "メタデータの読み込みエラー" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 +msgid "error requesting update: not zoom-level 12" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 #, java-format msgid "requested: {0}" msgstr "要求: {0}" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168 msgid "error requesting update" msgstr "アップデート要求時にエラー" @@ -22822,4 +22827,7 @@ #~ msgstr "ナビゲーション" +#~ msgid "image not loaded" +#~ msgstr "画像が読み込まれていません。" + #~ msgid "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " Index: /applications/editors/josm/i18n/po/nb.po =================================================================== --- /applications/editors/josm/i18n/po/nb.po (revision 16492) +++ /applications/editors/josm/i18n/po/nb.po (revision 16493) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-12 13:56+0200\n" -"PO-Revision-Date: 2009-07-09 23:11+0000\n" +"POT-Creation-Date: 2009-07-14 18:01+0200\n" +"PO-Revision-Date: 2009-07-12 13:33+0000\n" "Last-Translator: Stian Ellingsen \n" "Language-Team: Norwegian Bokmal \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-07-12 11:51+0000\n" +"X-Launchpad-Export-Date: 2009-07-14 15:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -82,5 +82,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 @@ -213,9 +213,9 @@ "riktig til historikkside for OSM-element. API-URL er «{0}»." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Velg minst én allerede opplastet node, linje eller relasjon." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 @@ -224,5 +224,5 @@ msgstr "Advarsel" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 #, java-format msgid "" @@ -551,6 +551,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 @@ -722,5 +722,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -752,5 +752,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 @@ -922,5 +922,5 @@ #: ../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:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "New" msgstr "Ny" @@ -2181,31 +2181,36 @@ "Nøkkel kan ikke være tom når egenskap-operatoren brukes. Bruk: nøkkel=verdi" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "Ukjent objekttype: {0}. Tillatte verdier er node, way og relation" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 #, java-format msgid "Unexpected token: {0}" msgstr "Uventet symbol: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 msgid "Missing arguments for or." msgstr "OR mangler argument." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 msgid "Missing argument for not." msgstr "NOT mangler argument." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Expected closing parenthesis." msgstr "Forventer parentes slutt." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 msgid "Wrong number of parameters for nodes operator." msgstr "Feil antall parametere for nodes-operator." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 #, java-format msgid "" @@ -2216,5 +2221,5 @@ "intervall, for eksempel nodes:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -3328,5 +3333,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 @@ -3344,5 +3349,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3561,5 +3566,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 @@ -3872,5 +3877,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3917,5 +3922,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 @@ -3929,5 +3934,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -3999,5 +4004,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 @@ -4255,5 +4260,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 @@ -4298,34 +4303,34 @@ msgstr "Egenskaper / Medlemskap" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -msgid "Open an editor for the selected relation" -msgstr "Åpne en editor for den valgte relasjon" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -msgid "Delete the selected relation" -msgstr "Slet valgt relasjon" - #. item "Land use/Quarry" text "Name" #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relasjoner" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 msgid "Open a list of all relations." msgstr "Åpne en liste over alle relasjoner" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Create a new relation" msgstr "Oprett ny relasjon" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 #, java-format msgid "Relations: {0}" msgstr "Relasjoner: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 +msgid "Open an editor for the selected relation" +msgstr "Åpne en editor for den valgte relasjon" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 +msgid "Delete the selected relation" +msgstr "Slet valgt relasjon" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 @@ -4415,88 +4420,88 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 msgid "Apply Changes" msgstr "Utfør endringer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 msgid "Basic" msgstr "Enkel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "Occupied By" msgstr "Brukt av" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "linked" msgstr "koblet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move Up" msgstr "Flytt opp" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move the currently selected members up" msgstr "Flytt valgte medlem opp" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Add Selected" msgstr "Legg til utvalgte" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 msgid "Add all currently selected objects as members" msgstr "Tilføy alle valgte objekt som medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 msgid "Remove Selected" msgstr "Fjern Utvalg" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 msgid "Remove all currently selected objects from relation" msgstr "Fjern alle valgte objekt fra relasjon" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 msgid "Sort" msgstr "Sorter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 msgid "Sort the selected relation members or the whole list" msgstr "Sorter valgte relasjonsmedlemmer eller hele listen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move Down" msgstr "Flytt ned" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move the currently selected members down" msgstr "Flytt valgt medlem ned" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 msgid "Remove the member in the current table row from this relation" msgstr "Fjern medlemmet i aktiv tabelrekke fra denne relasjonen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 msgid "Download Members" msgstr "Last ned medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 msgid "Download all incomplete ways and nodes in relation" msgstr "Last ned alle ufullstendige linjer og noder i relasjonen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 #, java-format msgid "Members: {0} (linked: {1})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 #, java-format msgid "Relation Editor: {0}" msgstr "Relasjons-editor: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 msgid "Download relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 #, java-format @@ -4504,27 +4509,27 @@ msgstr "Det oppstod {0} konflikter under import." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Conflicts in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#, java-format +msgid "Create new relation in layer ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 -#, fuzzy, java-format -msgid "Create new relation in layer ''{0}''" -msgstr "Oprett ny relasjon" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98 -#, fuzzy, java-format +#, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "Endre ny relasjon" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "Endre relasjon {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -6696,11 +6701,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 +msgid "Map Paint Styles" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 -msgid "Map Paint Styles" msgstr "" @@ -9885,43 +9890,39 @@ msgstr "Gi verdier for vekting" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74 msgid "Slippy Map" msgstr "Slippy Map" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Load Tile" msgstr "Last Kartbilde" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91 msgid "Show Tile Status" msgstr "Status på kartbilde" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102 msgid "Request Update" msgstr "Be op Oppdatering" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Load All Tiles" msgstr "Hent alle kartbilder" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123 msgid "Increase zoom" msgstr "Zoom inn" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132 msgid "Decrease zoom" msgstr "Zoom ut" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" msgstr "Tøm bildehurtiglager" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 -msgid "image not loaded" -msgstr "Bilde er ikke lest inn" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -msgid "image loading..." -msgstr "laster bilde …" +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 +msgid "image " +msgstr "" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 @@ -9962,14 +9963,18 @@ msgstr "Demp bakgrunn: " -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146 msgid "error loading metadata" msgstr "feil ved lesing av informasjon om data" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 +msgid "error requesting update: not zoom-level 12" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 #, java-format msgid "requested: {0}" msgstr "bestilt: {0}" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168 msgid "error requesting update" msgstr "feil ved bestilling av oppdatering" @@ -23039,4 +23044,7 @@ #~ msgstr "Kunne ikke laste programtillegg: {0} fra {1}" +#~ msgid "image not loaded" +#~ msgstr "Bilde er ikke lest inn" + #~ msgid "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -23289,2 +23297,5 @@ #~ msgid "Error when communicating with server." #~ msgstr "Klarte ikke kommunisere med tjener." + +#~ msgid "image loading..." +#~ msgstr "laster bilde …" Index: /applications/editors/josm/i18n/po/nl.po =================================================================== --- /applications/editors/josm/i18n/po/nl.po (revision 16492) +++ /applications/editors/josm/i18n/po/nl.po (revision 16493) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-12 13:56+0200\n" -"PO-Revision-Date: 2009-07-09 11:32+0000\n" -"Last-Translator: jefjan \n" +"POT-Creation-Date: 2009-07-14 18:01+0200\n" +"PO-Revision-Date: 2009-07-14 08:28+0000\n" +"Last-Translator: Valentijn Sessink \n" "Language-Team: Dutch \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-07-12 11:50+0000\n" +"X-Launchpad-Export-Date: 2009-07-14 15:25+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -22,5 +22,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" -msgstr "Hoofd-GUI aanmaken" +msgstr "Hoofdscherm aanmaken" #. FIXME why is help not a JosmAction? @@ -35,5 +35,5 @@ #, java-format msgid "The projection {0} could not be activated. Using Mercator" -msgstr "" +msgstr "De projectie {0} kon niet geactiveerd worden. Mercator wordt gebruikt" #: ../core/src/org/openstreetmap/josm/Main.java:394 @@ -85,5 +85,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 @@ -214,9 +214,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 @@ -225,5 +225,5 @@ msgstr "Waarschuwing" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 #, java-format msgid "" @@ -550,6 +550,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 @@ -721,5 +721,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -751,5 +751,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 @@ -921,5 +921,5 @@ #: ../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:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "New" msgstr "Nieuw" @@ -2171,31 +2171,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 msgid "Missing arguments for or." msgstr "Ontbrekende argumenten voor OR." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 msgid "Missing argument for not." msgstr "Ontbrekend argument voor NOT." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Expected closing parenthesis." msgstr "Sluithaak verwacht." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 #, java-format msgid "" @@ -2204,5 +2209,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -3319,5 +3324,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 @@ -3335,5 +3340,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3530,5 +3535,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 @@ -3822,5 +3827,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3867,5 +3872,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 @@ -3879,5 +3884,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -3949,5 +3954,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 @@ -4204,5 +4209,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 @@ -4247,34 +4252,34 @@ msgstr "Eigenschappen / Leden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -msgid "Open an editor for the selected relation" -msgstr "Een editor voor de geselecteerde relatie openen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -msgid "Delete the selected relation" -msgstr "De geselecteerde relatie verwijderen" - #. item "Land use/Quarry" text "Name" #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relaties" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 msgid "Open a list of all relations." msgstr "Een lijst met alle relaties openen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Create a new relation" msgstr "Een nieuwe relatie aanmaken" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 #, java-format msgid "Relations: {0}" msgstr "Relaties: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 +msgid "Open an editor for the selected relation" +msgstr "Een editor voor de geselecteerde relatie openen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 +msgid "Delete the selected relation" +msgstr "De geselecteerde relatie verwijderen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 @@ -4366,88 +4371,88 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 msgid "Apply Changes" msgstr "Wijzigingen toepassen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 msgid "Basic" msgstr "Basis" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "Occupied By" msgstr "Bezet door" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "linked" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move Up" msgstr "Omhoog bewegen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move the currently selected members up" msgstr "De geselecteerde leden omhoog verplaatsen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Add Selected" msgstr "Selectie toevoegen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 msgid "Add all currently selected objects as members" msgstr "Alle geselecteerde objecten als leden toevoegen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 msgid "Remove Selected" msgstr "Geselecteerde verwijderen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 msgid "Remove all currently selected objects from relation" msgstr "Alle nu geselecteerde objecten uit relatie verwijderen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 msgid "Sort the selected relation members or the whole list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move Down" msgstr "Omlaag bewegen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move the currently selected members down" msgstr "De geselecteerde leden omlaag verplaatsen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 msgid "Remove the member in the current table row from this relation" msgstr "De leden in de huidige tabelrij uit deze relatie verwijderen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 msgid "Download Members" msgstr "Leden downloaden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 msgid "Download all incomplete ways and nodes in relation" msgstr "Alle incomplete wegen en daarbij behorende knopen downloaden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 #, java-format msgid "Members: {0} (linked: {1})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 #, java-format msgid "Relation Editor: {0}" msgstr "Relatie-editor: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 msgid "Download relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 #, java-format @@ -4455,27 +4460,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Conflicts in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#, java-format +msgid "Create new relation in layer ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 -#, fuzzy, java-format -msgid "Create new relation in layer ''{0}''" -msgstr "Nieuwe relatie aanmaken" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98 -#, fuzzy, java-format +#, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "Nieuw relatie bewerken" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "Relatie #{0} bewerken" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -6654,11 +6659,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 +msgid "Map Paint Styles" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 -msgid "Map Paint Styles" msgstr "" @@ -9822,42 +9827,38 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74 msgid "Slippy Map" msgstr "Slippy-kaart" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Load Tile" msgstr "Tegel laden" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91 msgid "Show Tile Status" msgstr "Tegelstatus tonen" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102 msgid "Request Update" msgstr "Update aanvragen" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Load All Tiles" msgstr "Alle tegels laden" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123 msgid "Increase zoom" msgstr "Zoom vergroten" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132 msgid "Decrease zoom" msgstr "Zoom verkleinen" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 -msgid "image not loaded" -msgstr "afbeelding is niet geladen" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -msgid "image loading..." +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 +msgid "image " msgstr "" @@ -9899,14 +9900,18 @@ msgstr "Achtergrond vervagen: " -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146 msgid "error loading metadata" msgstr "laden van metadata is mislukt" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 +msgid "error requesting update: not zoom-level 12" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 #, java-format msgid "requested: {0}" msgstr "verzocht: {0}" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168 msgid "error requesting update" msgstr "update aanvragen is mislukt" @@ -16982,5 +16987,5 @@ #: build/trans_presets.java:2276 msgid "Power Station" -msgstr "Krachtcentrale" +msgstr "Verdeelstation" #. item @@ -16989,5 +16994,5 @@ #: build/trans_presets.java:2279 msgid "Edit Power Station" -msgstr "Krachtcentrale bewerken" +msgstr "Verdeelstation bewerken" #. item "Man Made/Power Station" text "Operator" @@ -22943,4 +22948,7 @@ #~ msgid "Navigation" #~ msgstr "Navigatie" + +#~ msgid "image not loaded" +#~ msgstr "afbeelding is niet geladen" #~ msgid "" Index: /applications/editors/josm/i18n/po/pl.po =================================================================== --- /applications/editors/josm/i18n/po/pl.po (revision 16492) +++ /applications/editors/josm/i18n/po/pl.po (revision 16493) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-12 13:56+0200\n" -"PO-Revision-Date: 2009-07-09 11:29+0000\n" +"POT-Creation-Date: 2009-07-14 18:01+0200\n" +"PO-Revision-Date: 2009-07-12 13:31+0000\n" "Last-Translator: Łukasz Cieśnik \n" "Language-Team: Polish \n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2009-07-12 11:50+0000\n" +"X-Launchpad-Export-Date: 2009-07-14 15:27+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: POLAND\n" @@ -87,5 +87,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 @@ -216,9 +216,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 @@ -227,5 +227,5 @@ msgstr "Uwaga" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 #, java-format msgid "" @@ -550,6 +550,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 @@ -723,5 +723,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -753,5 +753,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 @@ -921,5 +921,5 @@ #: ../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:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "New" msgstr "Nowa" @@ -2152,31 +2152,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 msgid "Missing arguments for or." msgstr "Brak argumentów dla operator lub." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 msgid "Missing argument for not." msgstr "Brak argumentu dla operatora nie." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Expected closing parenthesis." msgstr "Brak nawiasu zamykającego." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 #, java-format msgid "" @@ -2185,5 +2190,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -3278,5 +3283,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 @@ -3294,5 +3299,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3489,5 +3494,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 @@ -3781,5 +3786,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3826,5 +3831,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 @@ -3838,5 +3843,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -3908,5 +3913,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 @@ -4161,5 +4166,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 @@ -4204,34 +4209,34 @@ msgstr "Właściwości / członkostwo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -msgid "Open an editor for the selected relation" -msgstr "Otwiera okno edycji dla zaznaczonej relacji." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -msgid "Delete the selected relation" -msgstr "Usuwa zaznaczoną relację." - #. item "Land use/Quarry" text "Name" #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relacje" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 msgid "Open a list of all relations." msgstr "Otwiera listę wszystkich relacji" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Create a new relation" msgstr "Utwórz nową relację" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 #, java-format msgid "Relations: {0}" msgstr "Relacje: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 +msgid "Open an editor for the selected relation" +msgstr "Otwiera okno edycji dla zaznaczonej relacji." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 +msgid "Delete the selected relation" +msgstr "Usuwa zaznaczoną relację." #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 @@ -4324,88 +4329,88 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 msgid "Apply Changes" msgstr "Zastosuj zmiany" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 msgid "Basic" msgstr "Podstawowe" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "Occupied By" msgstr "Zajęte przez" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "linked" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move Up" msgstr "Przesuń w górę" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move the currently selected members up" msgstr "Przesuń aktualnie zaznaczonych członkół w górę" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Add Selected" msgstr "Dodaj zaznaczone" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 msgid "Add all currently selected objects as members" msgstr "Dodaj wszystkie obecnie zaznaczone obiekty jako członków" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 msgid "Remove Selected" msgstr "Usuń zaznaczone" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 msgid "Remove all currently selected objects from relation" msgstr "Usuń wszystkie zaznaczone obiekty z relacji" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 msgid "Sort the selected relation members or the whole list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move Down" msgstr "Przesuń w dół" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move the currently selected members down" msgstr "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 msgid "Remove the member in the current table row from this relation" msgstr "Usuń z relacji członka zawartego w aktualnym wierszu tabeli z" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 msgid "Download Members" msgstr "Pobierz członków" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 msgid "Download all incomplete ways and nodes in relation" msgstr "Pobierz wszystkie niekompletne drogi i węzły w relacji" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 #, java-format msgid "Members: {0} (linked: {1})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 #, java-format msgid "Relation Editor: {0}" msgstr "Edytor relacji: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 msgid "Download relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 #, java-format @@ -4413,27 +4418,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Conflicts in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#, java-format +msgid "Create new relation in layer ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 -#, fuzzy, java-format -msgid "Create new relation in layer ''{0}''" -msgstr "Tworzy nową relację" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98 -#, fuzzy, java-format +#, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "Edytuje nową relację" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "Modyfikuj relację #{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -6591,11 +6596,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 +msgid "Map Paint Styles" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 -msgid "Map Paint Styles" msgstr "" @@ -9686,42 +9691,38 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74 msgid "Slippy Map" msgstr "Mapa \"Slippy\"" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Load Tile" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91 msgid "Show Tile Status" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102 msgid "Request Update" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Load All Tiles" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123 msgid "Increase zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132 msgid "Decrease zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 -msgid "image not loaded" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -msgid "image loading..." +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 +msgid "image " msgstr "" @@ -9763,14 +9764,18 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146 msgid "error loading metadata" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 +msgid "error requesting update: not zoom-level 12" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 #, java-format msgid "requested: {0}" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168 msgid "error requesting update" msgstr "" Index: /applications/editors/josm/i18n/po/ro.po =================================================================== --- /applications/editors/josm/i18n/po/ro.po (revision 16492) +++ /applications/editors/josm/i18n/po/ro.po (revision 16493) @@ -8,7 +8,7 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-12 13:56+0200\n" -"PO-Revision-Date: 2009-07-09 11:19+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-07-14 18:01+0200\n" +"PO-Revision-Date: 2009-07-13 06:45+0000\n" +"Last-Translator: Manuel R. Ciosici \n" "Language-Team: Romanian \n" "MIME-Version: 1.0\n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 " "== 0) && (n != 0))) ? 2: 1));\n" -"X-Launchpad-Export-Date: 2009-07-12 11:49+0000\n" +"X-Launchpad-Export-Date: 2009-07-14 15:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: ROMANIA\n" @@ -26,5 +26,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165 msgid "Creating main GUI" -msgstr "Construind interfata grafica utilizator principala" +msgstr "Se creează interfața grafică" #. FIXME why is help not a JosmAction? @@ -34,10 +34,10 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305 msgid "Help" -msgstr "Ajutor" +msgstr "_Ajutor" #: ../core/src/org/openstreetmap/josm/Main.java:281 #, java-format msgid "The projection {0} could not be activated. Using Mercator" -msgstr "" +msgstr "Proiecția {0} nu a putut fi activată. Se folosește Mercator." #: ../core/src/org/openstreetmap/josm/Main.java:394 @@ -88,5 +88,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 @@ -217,16 +217,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +"Vă rog selectați cel puțin un nod, o cale sau relație care sunt deja " +"încărcate." + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 msgid "Warning" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +msgstr "Avertisment" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 #, java-format msgid "" @@ -362,9 +364,9 @@ #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 msgid "Failed to initialize API. Please try again later." -msgstr "" +msgstr "Eroare la inițializarea API-ului. Vă rog încercați mai târziu." #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 msgid "API initialization failed" -msgstr "" +msgstr "Inițializarea API-ului a eșuat" #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 @@ -549,6 +551,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 @@ -716,5 +718,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -746,5 +748,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 @@ -912,5 +914,5 @@ #: ../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:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "New" msgstr "" @@ -2112,31 +2114,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Expected closing parenthesis." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 #, java-format msgid "" @@ -2145,5 +2152,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -3235,5 +3242,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 @@ -3251,5 +3258,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3446,5 +3453,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 @@ -3738,5 +3745,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3783,5 +3790,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 @@ -3795,5 +3802,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -3865,5 +3872,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 @@ -4121,5 +4128,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 @@ -4164,33 +4171,33 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -msgid "Open an editor for the selected relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -msgid "Delete the selected relation" -msgstr "" - #. item "Land use/Quarry" text "Name" #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 #: build/trans_presets.java:2967 msgid "Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 msgid "Open a list of all relations." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Create a new relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 #, java-format msgid "Relations: {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 +msgid "Open an editor for the selected relation" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 +msgid "Delete the selected relation" msgstr "" @@ -4281,88 +4288,88 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 msgid "Apply Changes" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 msgid "Basic" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "Occupied By" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "linked" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move the currently selected members up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Add Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 msgid "Add all currently selected objects as members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 msgid "Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 msgid "Remove all currently selected objects from relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 msgid "Sort the selected relation members or the whole list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move the currently selected members down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 msgid "Remove the member in the current table row from this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 msgid "Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 msgid "Download all incomplete ways and nodes in relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 #, java-format msgid "Members: {0} (linked: {1})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 #, java-format msgid "Relation Editor: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 msgid "Download relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 #, java-format @@ -4370,24 +4377,24 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Conflicts in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#, java-format +msgid "Create new relation in layer ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 #, java-format -msgid "Create new relation in layer ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98 -#, java-format msgid "Edit new relation in layer ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 #, java-format msgid "Edit relation #{0} in layer ''{1}''" @@ -6526,11 +6533,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 +msgid "Map Paint Styles" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 -msgid "Map Paint Styles" msgstr "" @@ -9568,42 +9575,38 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74 msgid "Slippy Map" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Load Tile" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91 msgid "Show Tile Status" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102 msgid "Request Update" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Load All Tiles" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123 msgid "Increase zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132 msgid "Decrease zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 -msgid "image not loaded" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -msgid "image loading..." +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 +msgid "image " msgstr "" @@ -9645,14 +9648,18 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146 msgid "error loading metadata" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 +msgid "error requesting update: not zoom-level 12" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 #, java-format msgid "requested: {0}" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168 msgid "error requesting update" msgstr "" Index: /applications/editors/josm/i18n/po/ru.po =================================================================== --- /applications/editors/josm/i18n/po/ru.po (revision 16492) +++ /applications/editors/josm/i18n/po/ru.po (revision 16493) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-12 13:56+0200\n" -"PO-Revision-Date: 2009-07-11 21:22+0000\n" -"Last-Translator: sim \n" +"POT-Creation-Date: 2009-07-14 18:01+0200\n" +"PO-Revision-Date: 2009-07-12 23:40+0000\n" +"Last-Translator: pxx \n" "Language-Team: Koptev Oleg \n" "MIME-Version: 1.0\n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2009-07-12 11:52+0000\n" +"X-Launchpad-Export-Date: 2009-07-14 15:27+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: RUSSIAN FEDERATION\n" @@ -85,5 +85,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 @@ -217,5 +217,5 @@ "''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" @@ -223,5 +223,5 @@ "связь." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 @@ -230,5 +230,5 @@ msgstr "Предупреждение" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 #, java-format msgid "" @@ -563,6 +563,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 @@ -734,5 +734,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -764,5 +764,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 @@ -937,5 +937,5 @@ #: ../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:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "New" msgstr "Создать" @@ -1994,4 +1994,6 @@ "Really move them?" msgstr "" +"Перемещено больше чем {0} элементов. Перемещение такого количество элементов " +"часто является ошибкой. Действительно переместить?" #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 @@ -2230,5 +2232,10 @@ "использования: ключ=значение" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2236,26 +2243,26 @@ "Неизвестный тип примитива: {0}. Разрешенные значения точка, линия или связь" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 #, java-format msgid "Unexpected token: {0}" msgstr "Неожиданный знак: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 msgid "Missing arguments for or." msgstr "Отсутствуют параметры для \"ИЛИ\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 msgid "Missing argument for not." msgstr "Отсутствуют параметры для \"НЕ\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Expected closing parenthesis." msgstr "Отсутствует закрывающая скобка" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 msgid "Wrong number of parameters for nodes operator." msgstr "Неверное число параметров для оператора точек." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 #, java-format msgid "" @@ -2266,5 +2273,5 @@ "или диапазон, например, 10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2303,5 +2310,5 @@ #, java-format msgid "Add {0} {1}" -msgstr "" +msgstr "Добавить {0} {1}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46 @@ -3385,5 +3392,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 @@ -3401,5 +3408,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3604,5 +3611,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 @@ -3904,5 +3911,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3949,5 +3956,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 @@ -3961,5 +3968,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4031,5 +4038,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 @@ -4284,5 +4291,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 @@ -4327,34 +4334,34 @@ msgstr "Параметры / отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -msgid "Open an editor for the selected relation" -msgstr "Открыть редактор для выбранного отношения" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -msgid "Delete the selected relation" -msgstr "Удалить выбранное отношение" - #. item "Land use/Quarry" text "Name" #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 msgid "Open a list of all relations." msgstr "Показать список всех отношений." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Create a new relation" msgstr "Создать новое отношение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 #, java-format msgid "Relations: {0}" msgstr "Отношений: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 +msgid "Open an editor for the selected relation" +msgstr "Открыть редактор для выбранного отношения" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 +msgid "Delete the selected relation" +msgstr "Удалить выбранное отношение" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 @@ -4448,88 +4455,88 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 msgid "Apply Changes" msgstr "Применить изменения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 msgid "Basic" msgstr "Основной" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "Occupied By" msgstr "Объект" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "linked" msgstr "присоединенный" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move Up" msgstr "Переместить вверх" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move the currently selected members up" msgstr "Переместить выбранных членов отношения вверх" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Add Selected" msgstr "Добавить выбранное" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 msgid "Add all currently selected objects as members" msgstr "Сделать все выбранные объекты участниками отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 msgid "Remove Selected" msgstr "Удалить выбранные" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 msgid "Remove all currently selected objects from relation" msgstr "Удалить все выделенные объекты из связей" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 msgid "Sort the selected relation members or the whole list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move Down" msgstr "Переместить вниз" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move the currently selected members down" msgstr "Переместить выбранных членов отношения вниз" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 msgid "Remove the member in the current table row from this relation" msgstr "Удалить текущего участника из отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 msgid "Download Members" msgstr "Скачать участников" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 msgid "Download all incomplete ways and nodes in relation" msgstr "Скачать недостающие части линий и узлов, участвующих в отношении" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 #, java-format msgid "Members: {0} (linked: {1})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 #, java-format msgid "Relation Editor: {0}" msgstr "Редактор отношений: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 msgid "Download relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 #, java-format @@ -4537,27 +4544,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Conflicts in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#, java-format +msgid "Create new relation in layer ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 -#, fuzzy, java-format -msgid "Create new relation in layer ''{0}''" -msgstr "Создать новое отношение" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98 -#, fuzzy, java-format +#, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "Править новое отношение" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "Править отношение #{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -6751,11 +6758,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 +msgid "Map Paint Styles" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 -msgid "Map Paint Styles" msgstr "" @@ -9946,43 +9953,39 @@ msgstr "Введите значение толщины" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74 msgid "Slippy Map" msgstr "Интерактивная карта" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Load Tile" msgstr "Загрузить фрагмент" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91 msgid "Show Tile Status" msgstr "Показать статус фрагмента" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102 msgid "Request Update" msgstr "Запросить обновление" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Load All Tiles" msgstr "Загрузить все фрагменты" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123 msgid "Increase zoom" msgstr "Приблизить" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132 msgid "Decrease zoom" msgstr "Отодвинуть" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 -msgid "image not loaded" -msgstr "изображение не загружено" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -msgid "image loading..." -msgstr "изображение загружается..." +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 +msgid "image " +msgstr "" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 @@ -10023,14 +10026,18 @@ msgstr "Бледный фон: " -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146 msgid "error loading metadata" msgstr "ошибка загрузки метаданных" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 +msgid "error requesting update: not zoom-level 12" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 #, java-format msgid "requested: {0}" msgstr "предлагается: {0}" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168 msgid "error requesting update" msgstr "ошибка при запросе обновления" @@ -23146,4 +23153,7 @@ #~ msgstr "Навигация" +#~ msgid "image not loaded" +#~ msgstr "изображение не загружено" + #~ msgid "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " @@ -23474,2 +23484,5 @@ #~ msgid "Selection too big" #~ msgstr "Выборка слишком большая" + +#~ msgid "image loading..." +#~ msgstr "изображение загружается..." Index: /applications/editors/josm/i18n/po/sk.po =================================================================== --- /applications/editors/josm/i18n/po/sk.po (revision 16492) +++ /applications/editors/josm/i18n/po/sk.po (revision 16493) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-12 13:56+0200\n" -"PO-Revision-Date: 2009-07-10 03:18+0000\n" +"POT-Creation-Date: 2009-07-14 18:01+0200\n" +"PO-Revision-Date: 2009-07-12 19:14+0000\n" "Last-Translator: Vlado \n" "Language-Team: Slovak \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" -"X-Launchpad-Export-Date: 2009-07-12 11:51+0000\n" +"X-Launchpad-Export-Date: 2009-07-14 15:27+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -82,5 +82,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 @@ -214,9 +214,9 @@ "''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 msgid "Please select at least one already uploaded node, way, or relation." msgstr "Prosím vybrať aspoň jeden už nahraný bod, cestu, alebo reláciu." -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 @@ -225,5 +225,5 @@ msgstr "Varovanie" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 #, java-format msgid "" @@ -557,6 +557,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 @@ -728,5 +728,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -758,5 +758,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 @@ -930,5 +930,5 @@ #: ../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:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "New" msgstr "Nový" @@ -1465,5 +1465,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 msgid "No data" -msgstr "" +msgstr "Žiadne dáta" #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 @@ -1652,5 +1652,5 @@ #, java-format msgid "Uploading failed.
{0}" -msgstr "" +msgstr "Upload zlyhal.
{0}" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 @@ -1980,4 +1980,7 @@ "Really move them?" msgstr "" +"Presunuli ste viac ako {0} objektov. Presun veľkého množstva objektov je " +"často chyba.\n" +"Skutočne ich presunúť?" #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451 @@ -2215,5 +2218,10 @@ "použitia: kľúč=hodnota" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2221,26 +2229,26 @@ "Neznámy pôvodný typ: {0}. Povolené hodnoty sú, body, cesty, alebo relácie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 #, java-format msgid "Unexpected token: {0}" msgstr "Neočakávaná značka: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 msgid "Missing arguments for or." msgstr "Chýbajúci argument pre \"alebo\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 msgid "Missing argument for not." msgstr "Chýbajúci argument pre \"NOT\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Expected closing parenthesis." msgstr "Očakávam uzatváraciu zátvorku." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 msgid "Wrong number of parameters for nodes operator." msgstr "Zlé číslo parametrov pre operátor bodov." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 #, java-format msgid "" @@ -2251,5 +2259,5 @@ "alebo rozsah bodov, napr. body:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2329,5 +2337,5 @@ #, java-format msgid "Change relation member role for {0} {1}" -msgstr "" +msgstr "Zmena funkcie relačného člena pre {0} {1}" #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62 @@ -2335,5 +2343,5 @@ #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94 msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore" -msgstr "" +msgstr "Nemôžem zrušiť príkaz \"{0}\", pretože vrstva \"{1}\" nie je vybraná." #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 @@ -2456,5 +2464,5 @@ #, java-format msgid "Remove relation member {0} {1}" -msgstr "" +msgstr "Odstrániť člena relácie {0} {1}" #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142 @@ -2490,5 +2498,5 @@ #, java-format msgid "Main dataset does not include node {0}" -msgstr "" +msgstr "Hlavná dátová sada neobsahuje bod {0}" #: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 @@ -3370,5 +3378,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 @@ -3386,5 +3394,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3598,5 +3606,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 @@ -3911,5 +3919,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3957,5 +3965,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 @@ -3969,5 +3977,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4039,5 +4047,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 @@ -4300,5 +4308,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 @@ -4343,34 +4351,34 @@ msgstr "Vlastnosti / Memberships" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -msgid "Open an editor for the selected relation" -msgstr "Otvoriť editor pre zvolenú reláciu" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -msgid "Delete the selected relation" -msgstr "Zmazať vybraté relácie" - #. item "Land use/Quarry" text "Name" #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relácie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 msgid "Open a list of all relations." msgstr "Otvoríť zoznam všetkých relácií" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Create a new relation" msgstr "Vytvoriť novú reláciu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 #, java-format msgid "Relations: {0}" msgstr "Relácie: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 +msgid "Open an editor for the selected relation" +msgstr "Otvoriť editor pre zvolenú reláciu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 +msgid "Delete the selected relation" +msgstr "Zmazať vybraté relácie" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 @@ -4464,88 +4472,88 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 msgid "Apply Changes" msgstr "Použiť zmeny" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 msgid "Basic" msgstr "Základný" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "Occupied By" msgstr "Využité (kým)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "linked" msgstr "zviazané" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move Up" msgstr "Posunút Hore" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move the currently selected members up" msgstr "Pridať všetky zvolené objekty medzi členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Add Selected" msgstr "Pridať vybrané" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 msgid "Add all currently selected objects as members" msgstr "Pridať všetky zvolené objekty medzi členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 msgid "Remove Selected" msgstr "Odstrániť označené" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 msgid "Remove all currently selected objects from relation" msgstr "Odstrániť všetky vybrané objekty z relácie(zo vzťahu)" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 msgid "Sort" msgstr "Triediť" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 msgid "Sort the selected relation members or the whole list" msgstr "Roztriediť vybrané relačné členy, alebo celý zoznam" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move Down" msgstr "Posunúť dole" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move the currently selected members down" msgstr "Presunúť zvolenú vrstvu o riadok dolu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 msgid "Remove the member in the current table row from this relation" msgstr "Odstrániť člena(member) v aktuálnom riadku tabuľky z tejto relácie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 msgid "Download Members" msgstr "Stiahnuť členov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 msgid "Download all incomplete ways and nodes in relation" msgstr "Stiahnuť všetky nekompletné cesty a uzly v relácii" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 #, java-format msgid "Members: {0} (linked: {1})" msgstr "Členy: {0} (spojenie: {1})" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 #, java-format msgid "Relation Editor: {0}" msgstr "Editor relácie: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 msgid "Download relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +msgstr "Stiahnuť členov relácie" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 #, java-format @@ -4553,27 +4561,27 @@ msgstr "Boli tam {0} konflikty počas importu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Conflicts in data" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +msgstr "Konflikt v dátach" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" -msgstr "" +msgstr "Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#, java-format +msgid "Create new relation in layer ''{0}''" +msgstr "Vytvoriť novú reláciu vo vrstve \"{0}\"" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 -#, fuzzy, java-format -msgid "Create new relation in layer ''{0}''" -msgstr "Vytvoriť novú reláciu" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98 -#, fuzzy, java-format +#, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "Upraviť novú reláciu" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#, fuzzy, java-format +msgstr "Upraviť novú reláciu vo vrstve \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "Upraviť reláciu #{0}" +msgstr "Upraviť reláciu #{0} vo vrstve \"{1}\"" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -4769,4 +4777,7 @@ "Click." msgstr "" +"Zoom: Koliesko myši, dvojklik alebo Ctrl + Hore/Dole Pohyb mapy: Podržať pravé tlašítko myši a pohnúť myšou alebo použiť kurzorové " +"klávesy. Vybrať: Click." #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113 @@ -6765,12 +6776,12 @@ msgstr "Povoliť built-in ocon východzí" -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 +msgid "Map Paint Styles" +msgstr "Map Paint Styles" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" msgstr "Použitý štýl" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 -msgid "Map Paint Styles" -msgstr "Map Paint Styles" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44 @@ -6991,9 +7002,9 @@ #, java-format msgid "The XML source (URL or filename) for {0} definition files." -msgstr "" +msgstr "The XML zdroj (URL alebo názov súboru)pre {0} rozlíšenie súborov." #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222 msgid "Add a new XML source to the list." -msgstr "" +msgstr "Pridať nový XML zdroj do zoznamu." #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223 @@ -7442,10 +7453,10 @@ #, java-format msgid "(Code={0})" -msgstr "" +msgstr "(Kód={0})" #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93 #, java-format msgid "The server replied an error with code {0}" -msgstr "" +msgstr "Server odpovedal chybou s kódom {0}" #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18 @@ -7661,4 +7672,7 @@ "use changesets, but API is not able to handle them. Ignoring changesets." msgstr "" +"UPOZORNENIE: preferencie ''{0}'' alebo api verzia ''{1}'' z dátovej sady " +"požaduje použiť zmenu nastavení, ale API nie je schopné ovládať ich. " +"Ignorujem zmenu nastavení." #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129 @@ -9879,13 +9893,13 @@ #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 msgid "Edit relation" -msgstr "" +msgstr "Upraviť reláciu" #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 msgid "Edit relations" -msgstr "" +msgstr "Upraviť relácie" #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:72 msgid "No relation is selected" -msgstr "" +msgstr "Nie je vybraná žiadna relácia" #. Add menu @@ -9965,43 +9979,39 @@ msgstr "Vstup hmotnostnej hodnoty" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74 msgid "Slippy Map" msgstr "Slippy Map" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Load Tile" msgstr "Nahrať Dlaždice (Tiles)" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91 msgid "Show Tile Status" msgstr "Zobraziť Stav Dlaždíc" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102 msgid "Request Update" msgstr "Žiadosť na aktualizáciu" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Load All Tiles" msgstr "Nahrať Všetky Dlaždice" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123 msgid "Increase zoom" msgstr "Priblíženie" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132 msgid "Decrease zoom" msgstr "Oddialiť" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" msgstr "Flush Tile Cache" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 -msgid "image not loaded" -msgstr "Obrázok nie je nahratý" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -msgid "image loading..." -msgstr "nahrávam obrázok..." +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 +msgid "image " +msgstr "" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 @@ -10042,14 +10052,18 @@ msgstr "Vyblednúť pozadie: " -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146 msgid "error loading metadata" msgstr "chyba pri zavádzaní metadát" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 +msgid "error requesting update: not zoom-level 12" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 #, java-format msgid "requested: {0}" msgstr "požadovaný: {0}" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168 msgid "error requesting update" msgstr "chyba požadovanej aktualizácie" @@ -10897,9 +10911,9 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 msgid "Use default tag ignore file." -msgstr "" +msgstr "Použite východzie značky ignorovaného súboru." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726 msgid "Use the default tag ignore file (recommended)." -msgstr "" +msgstr "Použite východzie značky ignorovaného súboru (doporučené)." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729 @@ -11144,5 +11158,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92 msgid "Unnamed junction" -msgstr "" +msgstr "Nepomenované spojenie" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99 @@ -11434,5 +11448,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124 msgid "Downloader:" -msgstr "" +msgstr "Stahovač:" #. * @@ -11653,4 +11667,6 @@ "defined in routes.xml file in plugin directory" msgstr "" +"Vykresluje cesty (autobusy, turistika, cyklistika). Cesty musia byť " +"definované v súbore routes.xml v adresári pluginov." #. Plugin routing @@ -22892,5 +22908,5 @@ #: build/trans_validator.java:47 msgid "Unnamed unclassified highway" -msgstr "" +msgstr "Nepomenovaná nezaradená(unclassified) hlavná cesta(highway)" #. way : W : highway == unclassified && name != * @@ -23003,20 +23019,20 @@ #: build/trans_wms.java:13 msgid "Yahoo Sat" -msgstr "" +msgstr "Yahoo Sat" #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? #: build/trans_wms.java:14 msgid "OpenStreetMap" -msgstr "" +msgstr "OpenStreetMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? #: build/trans_wms.java:15 msgid "OpenCycleMap" -msgstr "" +msgstr "OpenCycleMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? #: build/trans_wms.java:16 msgid "TilesAtHome" -msgstr "" +msgstr "TilesAtHome" #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html? @@ -23167,4 +23183,7 @@ #~ msgid "Navigation" #~ msgstr "Navigácia" + +#~ msgid "image not loaded" +#~ msgstr "Obrázok nie je nahratý" #~ msgid "" @@ -23511,2 +23530,5 @@ #~ msgid "Error when communicating with server." #~ msgstr "Chyba počas komunikácie so serverom" + +#~ msgid "image loading..." +#~ msgstr "nahrávam obrázok..." Index: /applications/editors/josm/i18n/po/sl.po =================================================================== --- /applications/editors/josm/i18n/po/sl.po (revision 16492) +++ /applications/editors/josm/i18n/po/sl.po (revision 16493) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-12 13:56+0200\n" -"PO-Revision-Date: 2009-07-09 11:23+0000\n" +"POT-Creation-Date: 2009-07-14 18:01+0200\n" +"PO-Revision-Date: 2009-07-12 13:17+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Slovenian \n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" -"X-Launchpad-Export-Date: 2009-07-12 11:50+0000\n" +"X-Launchpad-Export-Date: 2009-07-14 15:27+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -85,5 +85,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 @@ -214,9 +214,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 @@ -225,5 +225,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 #, java-format msgid "" @@ -544,6 +544,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 @@ -713,5 +713,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -743,5 +743,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 @@ -909,5 +909,5 @@ #: ../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:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "New" msgstr "Nova" @@ -2110,31 +2110,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 msgid "Missing arguments for or." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 msgid "Missing argument for not." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Expected closing parenthesis." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 #, java-format msgid "" @@ -2143,5 +2148,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -3241,5 +3246,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 @@ -3257,5 +3262,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3452,5 +3457,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 @@ -3744,5 +3749,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3789,5 +3794,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 @@ -3801,5 +3806,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -3871,5 +3876,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 @@ -4126,5 +4131,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 @@ -4169,34 +4174,34 @@ msgstr "Lastnosti / Članstva" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -msgid "Open an editor for the selected relation" -msgstr "Odpri urejevalnik za izbrano relacijo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -msgid "Delete the selected relation" -msgstr "Izbriši izbrano relacijo" - #. item "Land use/Quarry" text "Name" #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relacije" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 msgid "Open a list of all relations." msgstr "Odpri seznam vseh relacij." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Create a new relation" msgstr "Ustvari novo relacijo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 #, java-format msgid "Relations: {0}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 +msgid "Open an editor for the selected relation" +msgstr "Odpri urejevalnik za izbrano relacijo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 +msgid "Delete the selected relation" +msgstr "Izbriši izbrano relacijo" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 @@ -4286,88 +4291,88 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 msgid "Apply Changes" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 msgid "Basic" msgstr "Osnovno" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "Occupied By" msgstr "Član" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "linked" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move the currently selected members up" msgstr "Pomakni izbranega člana vrstico višje." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Add Selected" msgstr "Dodaj izbrano" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 msgid "Add all currently selected objects as members" msgstr "Dodaj kot člane vse trenutno izbrane predmete" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 msgid "Remove Selected" msgstr "Odstrani izbrano" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 msgid "Remove all currently selected objects from relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 msgid "Sort the selected relation members or the whole list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move the currently selected members down" msgstr "Pomakni izbranega člana vrstico nižje." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 msgid "Remove the member in the current table row from this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 msgid "Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 msgid "Download all incomplete ways and nodes in relation" msgstr "Sprejmi vse nepopolne poti in vozlišča v relaciji" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 #, java-format msgid "Members: {0} (linked: {1})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 #, java-format msgid "Relation Editor: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 msgid "Download relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 #, java-format @@ -4375,27 +4380,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Conflicts in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#, java-format +msgid "Create new relation in layer ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 -#, fuzzy, java-format -msgid "Create new relation in layer ''{0}''" -msgstr "Ustvari novo relacijo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98 -#, fuzzy, java-format +#, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "Uredi novo relacijo" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "Uredi relacijo #{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -6539,11 +6544,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 +msgid "Map Paint Styles" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 -msgid "Map Paint Styles" msgstr "" @@ -9608,42 +9613,38 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74 msgid "Slippy Map" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Load Tile" msgstr "Naloži ploščico" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91 msgid "Show Tile Status" msgstr "Prikaži stanje ploščice" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102 msgid "Request Update" msgstr "Zahtevaj posodobitev" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Load All Tiles" msgstr "Naloži vse ploščice" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123 msgid "Increase zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132 msgid "Decrease zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 -msgid "image not loaded" -msgstr "slika ni naložena" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -msgid "image loading..." +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 +msgid "image " msgstr "" @@ -9685,14 +9686,18 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146 msgid "error loading metadata" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 +msgid "error requesting update: not zoom-level 12" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 #, java-format msgid "requested: {0}" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168 msgid "error requesting update" msgstr "napaka pri oddaji zahtevka za pososobitev" @@ -22643,4 +22648,7 @@ #~ msgstr "Sprejem vstavka {0} z naslova {1} ni bil mogoč" +#~ msgid "image not loaded" +#~ msgstr "slika ni naložena" + #~ msgid "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " Index: /applications/editors/josm/i18n/po/sv.po =================================================================== --- /applications/editors/josm/i18n/po/sv.po (revision 16492) +++ /applications/editors/josm/i18n/po/sv.po (revision 16493) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-12 13:56+0200\n" -"PO-Revision-Date: 2009-06-27 14:56+0000\n" -"Last-Translator: Konrad Skeri \n" +"POT-Creation-Date: 2009-07-14 18:01+0200\n" +"PO-Revision-Date: 2009-07-12 17:35+0000\n" +"Last-Translator: David S \n" "Language-Team: Swedish \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-07-12 11:49+0000\n" +"X-Launchpad-Export-Date: 2009-07-14 15:26+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 "" +msgstr "Projektionen {0} kunde inte aktiveras. Använder Merkator" #: ../core/src/org/openstreetmap/josm/Main.java:394 @@ -83,5 +83,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 @@ -211,10 +211,12 @@ "OSM primitive will probably fail. API base URL is: ''{0}''" msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +"VARNING: dåligt format på APIs bas-URL. Omdirigering till historiksida för " +"OSM primitiv kommer troligtvis att misslyckas. API bas-URL är: \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 msgid "Please select at least one already uploaded node, way, or relation." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +msgstr "Välj åtminstonde en redan upladdad nod, väg eller relation" + +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 @@ -223,5 +225,5 @@ msgstr "Varning" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 #, java-format msgid "" @@ -349,17 +351,19 @@ "{0}, max is {1}" msgstr "" +"Antal ändringar överskrider det maximala antalet ändringar, antal ändringar " +"är {0}, max är {1}" #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116 msgid "API Capabilities Violation" -msgstr "" +msgstr "Bryter mot API:ns möjligheter" #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65 msgid "Failed to initialize API. Please try again later." -msgstr "" +msgstr "Misslyckades att initialisera API. Vänligen försök igen senare." #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66 msgid "API initialization failed" -msgstr "" +msgstr "Misslyckades att initialisera API." #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85 @@ -369,4 +373,6 @@ "{1}" msgstr "" +"VARNING: trunkerar automatiskt värde för tagg \"{0}\" på borttagen primitiv " +"{1}" #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94 @@ -376,4 +382,6 @@ "length {2}. Values length is {3}." msgstr "" +"Längd på värde för tagg \"{0}\" på primitiv {1} överskrider det max. " +"tillåtna längden ({2}). Värdets längd är {3}." #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97 @@ -547,6 +555,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 @@ -718,5 +726,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -748,5 +756,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 @@ -919,5 +927,5 @@ #: ../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:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "New" msgstr "Ny" @@ -1451,5 +1459,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65 msgid "No data" -msgstr "" +msgstr "Inga data" #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61 @@ -1582,4 +1590,9 @@ "{1} to abort and continue editing.
" msgstr "" +"Uppladdning misslyckadesav någon av dina noder, vägar eller relationer.

Klicka på " +"{0} för att synkronisera all lokal data med servern." +"
Klicka på {1} för att avbryta och fortsätta redigera." +"
" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406 @@ -1587,4 +1600,5 @@ msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\"" msgstr "" +"Varning: felaktigt huvud \"{0}\" matchade inte förväntat mönster \"{1}\"" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419 @@ -1595,4 +1609,7 @@ "html>" msgstr "" +"Uppladdning till servern misslyckades eftersom " +"dina
nuvarande data bryter mot ett förhandsvillkor.
Felmeddelandet " +"är:
{0}" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426 @@ -1607,4 +1624,7 @@ "
{0}" msgstr "" +"Uppladdning misslyckades eftersom en primitiv du " +"försökte
ta bort från servern redan är borttagen.

Felmeddelandet " +"är:
{0}" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470 @@ -1620,5 +1640,5 @@ #, java-format msgid "Uploading failed.
{0}" -msgstr "" +msgstr "Uppladdning misslyckades.
{0}" #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545 @@ -1767,4 +1787,9 @@ " to ignore.
" msgstr "" +"Det finns {0} primitiver i din data som kanske
är borttagna från " +"servern. Om du senare försöker ta bort eller
uppdatera de från servern " +"kommer det troligtvis leda till
en konflikt.

Klicka på {1}" +" för att kontrollera statusen på dessa primitiv
på servern." +"
Klicka på {2} för att ignorera.
" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162 @@ -1931,5 +1956,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447 msgid "Move elements" -msgstr "" +msgstr "Flytta element" #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448 @@ -2176,31 +2201,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 msgid "Missing arguments for or." msgstr "Det saknas argument för eller (or)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 msgid "Missing argument for not." msgstr "Det saknas argument för inte (not)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Expected closing parenthesis." msgstr "En avslutande parentes förväntades" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 #, java-format msgid "" @@ -2209,5 +2239,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -3316,5 +3346,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 @@ -3332,5 +3362,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3527,5 +3557,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 @@ -3821,5 +3851,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3866,5 +3896,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 @@ -3878,5 +3908,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -3948,5 +3978,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 @@ -4200,5 +4230,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 @@ -4243,34 +4273,34 @@ msgstr "Egenskaper / Roller" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -msgid "Open an editor for the selected relation" -msgstr "Öppna en redigerare för den valda relationen" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -msgid "Delete the selected relation" -msgstr "Ta bort den valda relationen" - #. item "Land use/Quarry" text "Name" #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 #: build/trans_presets.java:2967 msgid "Relations" msgstr "Relationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 msgid "Open a list of all relations." msgstr "Öppna en lista över alla relationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Create a new relation" msgstr "Skapa en ny relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 #, java-format msgid "Relations: {0}" msgstr "Relationer: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 +msgid "Open an editor for the selected relation" +msgstr "Öppna en redigerare för den valda relationen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 +msgid "Delete the selected relation" +msgstr "Ta bort den valda relationen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 @@ -4362,88 +4392,88 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 msgid "Apply Changes" msgstr "Verkställ ändringar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 msgid "Basic" msgstr "Grundläggande" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "Occupied By" msgstr "Innehas av" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "linked" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move Up" msgstr "Flytta uppåt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move the currently selected members up" msgstr "Flytta vald medlem/valda medlemmar uppåt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Add Selected" msgstr "Lägg till vald" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 msgid "Add all currently selected objects as members" msgstr "Lägg till alla för närvarande valda objekt som medlemmar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 msgid "Remove Selected" msgstr "Ta bort det valda" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 msgid "Remove all currently selected objects from relation" msgstr "Ta bort alla för närvarande valda objekt från relationen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 msgid "Sort the selected relation members or the whole list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move Down" msgstr "Flytta nedåt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move the currently selected members down" msgstr "Flytta vald medlem/valda medlemmar nedåt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 msgid "Remove the member in the current table row from this relation" msgstr "Ta bort medlemmen på den nuvarande tabellraden från denna relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 msgid "Download Members" msgstr "Hämta medlemmar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 msgid "Download all incomplete ways and nodes in relation" msgstr "Hämta alla ofullständiga sträckor och noder i relationen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 #, java-format msgid "Members: {0} (linked: {1})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 #, java-format msgid "Relation Editor: {0}" msgstr "Relationsredigerare:{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 msgid "Download relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 #, java-format @@ -4451,27 +4481,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Conflicts in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#, java-format +msgid "Create new relation in layer ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 -#, fuzzy, java-format -msgid "Create new relation in layer ''{0}''" -msgstr "Skapa ny relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98 -#, fuzzy, java-format +#, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "Redigera ny relation" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "Redigera relation # {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -6641,11 +6671,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 +msgid "Map Paint Styles" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 -msgid "Map Paint Styles" msgstr "" @@ -9805,42 +9835,38 @@ msgstr "Ange viktvärden" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74 msgid "Slippy Map" msgstr "Glidande karta" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Load Tile" msgstr "Hämta ruta" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91 msgid "Show Tile Status" msgstr "Visa status för ruta" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102 msgid "Request Update" msgstr "Begär omrendering" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Load All Tiles" msgstr "Hämta alla rutor" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123 msgid "Increase zoom" msgstr "Öka zoomläge" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132 msgid "Decrease zoom" msgstr "Minska zoomläge" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 -msgid "image not loaded" -msgstr "bilden har inte hämtats" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -msgid "image loading..." +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 +msgid "image " msgstr "" @@ -9882,14 +9908,18 @@ msgstr "Tona bakgrund: " -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146 msgid "error loading metadata" msgstr "fel vid hämtning av metadata" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 +msgid "error requesting update: not zoom-level 12" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 #, java-format msgid "requested: {0}" msgstr "begärd: {0}" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168 msgid "error requesting update" msgstr "fel vid begäran om uppdatering" @@ -22934,4 +22964,7 @@ #~ msgstr "Navigation" +#~ msgid "image not loaded" +#~ msgstr "bilden har inte hämtats" + #~ msgid "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " Index: /applications/editors/josm/i18n/po/tr.po =================================================================== --- /applications/editors/josm/i18n/po/tr.po (revision 16492) +++ /applications/editors/josm/i18n/po/tr.po (revision 16493) @@ -10,6 +10,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-12 13:56+0200\n" -"PO-Revision-Date: 2009-07-09 11:25+0000\n" +"POT-Creation-Date: 2009-07-14 18:01+0200\n" +"PO-Revision-Date: 2009-07-12 13:32+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Türkçe\n" @@ -18,5 +18,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-07-12 11:50+0000\n" +"X-Launchpad-Export-Date: 2009-07-14 15:27+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -84,5 +84,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 @@ -213,9 +213,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 msgid "Please select at least one already uploaded node, way, or relation." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 @@ -224,5 +224,5 @@ msgstr "Uyarı" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 #, java-format msgid "" @@ -547,6 +547,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 @@ -718,5 +718,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -748,5 +748,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 @@ -914,5 +914,5 @@ #: ../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:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "New" msgstr "Yeni" @@ -2139,31 +2139,36 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 msgid "Missing arguments for or." msgstr "or için eksik argüman." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 msgid "Missing argument for not." msgstr "not için eksik argüman." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Expected closing parenthesis." msgstr "Parantezlerin kapanması beklenir." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 msgid "Wrong number of parameters for nodes operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 #, java-format msgid "" @@ -2172,5 +2177,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -3267,5 +3272,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 @@ -3283,5 +3288,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3478,5 +3483,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 @@ -3770,5 +3775,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3815,5 +3820,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 @@ -3827,5 +3832,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -3897,5 +3902,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 @@ -4146,5 +4151,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 @@ -4189,34 +4194,34 @@ msgstr "Özellik / Üyelik" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -msgid "Open an editor for the selected relation" -msgstr "Seçili ilişki için bir editör aç." - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -msgid "Delete the selected relation" -msgstr "Seçili ilişkiyi sil" - #. item "Land use/Quarry" text "Name" #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 #: build/trans_presets.java:2967 msgid "Relations" msgstr "İlişkiler" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 msgid "Open a list of all relations." msgstr "İlişkilerin listesini göster." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Create a new relation" msgstr "Yeni ilişki oluştur" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 #, java-format msgid "Relations: {0}" msgstr "İlişkiler: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 +msgid "Open an editor for the selected relation" +msgstr "Seçili ilişki için bir editör aç." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 +msgid "Delete the selected relation" +msgstr "Seçili ilişkiyi sil" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 @@ -4304,88 +4309,88 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 msgid "Apply Changes" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 msgid "Basic" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "Occupied By" msgstr "Meşgul Eden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "linked" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move the currently selected members up" msgstr "Seçili üyeyi yukarı taşı" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Add Selected" msgstr "Seçileni Ekle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 msgid "Add all currently selected objects as members" msgstr "Seçili bütün objeleri üye olarak ekle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 msgid "Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 msgid "Remove all currently selected objects from relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 msgid "Sort the selected relation members or the whole list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move the currently selected members down" msgstr "Seçili üyeyi aşağı taşı" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 msgid "Remove the member in the current table row from this relation" msgstr "Seçili satırdaki üyeyi bu ilişkiden kaldır" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 msgid "Download Members" msgstr "Üyeleri İndir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 msgid "Download all incomplete ways and nodes in relation" msgstr "Bütün eksik yolları ve kavşakları ilişkili olarak indir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 #, java-format msgid "Members: {0} (linked: {1})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 #, java-format msgid "Relation Editor: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 msgid "Download relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 #, java-format @@ -4393,27 +4398,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Conflicts in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#, java-format +msgid "Create new relation in layer ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 -#, fuzzy, java-format -msgid "Create new relation in layer ''{0}''" -msgstr "Yeni ilişki oluştur" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98 -#, fuzzy, java-format +#, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "Yeni ilişkiyi düzenle" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "İlişki Düzenle #{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -6544,11 +6549,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 +msgid "Map Paint Styles" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 -msgid "Map Paint Styles" msgstr "" @@ -9654,42 +9659,38 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74 msgid "Slippy Map" msgstr "Hareketli Harita" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Load Tile" msgstr "Mozaik Yükle" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91 msgid "Show Tile Status" msgstr "Mozaik Durumunu Göster" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102 msgid "Request Update" msgstr "Güncelleme İste" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Load All Tiles" msgstr "Bütün Mozaikleri Yükle" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123 msgid "Increase zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132 msgid "Decrease zoom" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 -msgid "image not loaded" -msgstr "görüntü yüklenemedi" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -msgid "image loading..." +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 +msgid "image " msgstr "" @@ -9731,14 +9732,18 @@ msgstr "" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146 msgid "error loading metadata" msgstr "meta veri yüklemesinde hata" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 +msgid "error requesting update: not zoom-level 12" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 #, java-format msgid "requested: {0}" msgstr "istendi: {0}" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168 msgid "error requesting update" msgstr "güncelleme isteğinde hata" @@ -22750,4 +22755,7 @@ #~ msgstr "Navigasyon" +#~ msgid "image not loaded" +#~ msgstr "görüntü yüklenemedi" + #~ msgid "" #~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " Index: /applications/editors/josm/i18n/po/zh_TW.po =================================================================== --- /applications/editors/josm/i18n/po/zh_TW.po (revision 16492) +++ /applications/editors/josm/i18n/po/zh_TW.po (revision 16493) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-12 13:56+0200\n" -"PO-Revision-Date: 2009-07-09 10:20+0000\n" +"POT-Creation-Date: 2009-07-14 18:01+0200\n" +"PO-Revision-Date: 2009-07-12 13:11+0000\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Traditional Chinese\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-07-12 11:49+0000\n" +"X-Launchpad-Export-Date: 2009-07-14 15:27+0000\n" "X-Generator: Launchpad (build Unknown)\n" "Language: zh_TW\n" @@ -83,5 +83,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219 @@ -212,9 +212,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62 msgid "Please select at least one already uploaded node, way, or relation." msgstr "請至少選擇一個已上傳的節點、路徑或關係。" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53 @@ -223,5 +223,5 @@ msgstr "警告" -#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73 #, java-format msgid "" @@ -542,6 +542,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102 @@ -711,5 +711,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:813 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28 @@ -741,5 +741,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92 @@ -909,5 +909,5 @@ #: ../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:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "New" msgstr "新增" @@ -2128,31 +2128,36 @@ msgstr "使用標籤(tag)運算子時設定鍵不能空白。使用範例：key=value" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215 +#, java-format +msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:493 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497 #, java-format msgid "Unexpected token: {0}" msgstr "未預期的記號：{0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:514 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518 msgid "Missing arguments for or." msgstr "沒有 or 所需的引數。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:525 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529 msgid "Missing argument for not." msgstr "沒有 not 所需的引數。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540 msgid "Expected closing parenthesis." msgstr "需要關閉括弧。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:592 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596 msgid "Wrong number of parameters for nodes operator." msgstr "給 nodes 運算子錯誤的參數數量。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599 #, java-format msgid "" @@ -2163,5 +2168,5 @@ "nodes:10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:602 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -3260,5 +3265,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108 @@ -3276,5 +3281,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:272 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69 msgid "Members" @@ -3471,5 +3476,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186 @@ -3764,5 +3769,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19 msgid "Role" @@ -3809,5 +3814,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110 @@ -3821,5 +3826,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -3891,5 +3896,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54 @@ -4143,5 +4148,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122 @@ -4186,34 +4191,34 @@ msgstr "屬性 / 成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56 -msgid "Open an editor for the selected relation" -msgstr "開啓選取的關係編輯器" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:65 -msgid "Delete the selected relation" -msgstr "刪除選取的關係" - #. item "Land use/Quarry" text "Name" #. #. -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141 #: build/trans_presets.java:2967 msgid "Relations" msgstr "關係" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:77 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69 msgid "Open a list of all relations." msgstr "開啓所有關係的清單。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88 msgid "Create a new relation" msgstr "建立新的關係" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139 #, java-format msgid "Relations: {0}" msgstr "關係：{0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245 +msgid "Open an editor for the selected relation" +msgstr "開啓選取的關係編輯器" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274 +msgid "Delete the selected relation" +msgstr "刪除選取的關係" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81 @@ -4301,88 +4306,88 @@ #. We need this twice, so cache result -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:108 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:101 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 msgid "Apply Changes" msgstr "套用變更" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182 msgid "Basic" msgstr "基本" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "Occupied By" msgstr "被此佔據：" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217 msgid "linked" msgstr "已連結" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move Up" msgstr "上移" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310 msgid "Move the currently selected members up" msgstr "將目前選取的成員上移" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 msgid "Add Selected" msgstr "加入選取的" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317 msgid "Add all currently selected objects as members" msgstr "將所有目前選取的物件加入為成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:322 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 msgid "Remove Selected" msgstr "移陳選取的" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324 msgid "Remove all currently selected objects from relation" msgstr "將所有目前選取的物件從關係中移除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:329 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331 msgid "Sort the selected relation members or the whole list" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move Down" msgstr "下移" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337 msgid "Move the currently selected members down" msgstr "將目前選取的成員下移" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344 msgid "Remove the member in the current table row from this relation" msgstr "將目前表格列中的成員自這個關係中移除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:356 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 msgid "Download Members" msgstr "下載成員" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358 msgid "Download all incomplete ways and nodes in relation" msgstr "下載關係中所有不完整的路徑和節點" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:684 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733 #, java-format msgid "Members: {0} (linked: {1})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741 #, java-format msgid "Relation Editor: {0}" msgstr "關係編輯器：{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:797 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846 msgid "Download relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 #, java-format @@ -4390,27 +4395,27 @@ msgstr "匯入時有 {0} 個衝突。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:853 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902 msgid "Conflicts in data" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94 +#, java-format +msgid "Create new relation in layer ''{0}''" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96 -#, fuzzy, java-format -msgid "Create new relation in layer ''{0}''" -msgstr "建立新的關係" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:98 -#, fuzzy, java-format +#, java-format msgid "Edit new relation in layer ''{0}''" -msgstr "編輯新的關係" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97 +#, java-format msgid "Edit relation #{0} in layer ''{1}''" -msgstr "編輯關係 #{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70 @@ -6531,11 +6536,11 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:54 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40 +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:65 +msgid "Map Paint Styles" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60 msgid "Used style" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:59 -#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:61 -msgid "Map Paint Styles" msgstr "" @@ -9640,43 +9645,39 @@ msgstr "輸入重量限制值" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74 msgid "Slippy Map" msgstr "快速地圖" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80 msgid "Load Tile" msgstr "載入拼貼" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91 msgid "Show Tile Status" msgstr "載入拼貼狀態" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102 msgid "Request Update" msgstr "要求更新" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113 msgid "Load All Tiles" msgstr "載入所有拼貼" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123 msgid "Increase zoom" msgstr "增加縮放" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132 msgid "Decrease zoom" msgstr "減少縮放" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140 msgid "Flush Tile Cache" msgstr "清除拼貼快取" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442 -msgid "image not loaded" -msgstr "尚未載入圖片" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446 -msgid "image loading..." -msgstr "正在載入圖片..." +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516 +msgid "image " +msgstr "" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29 @@ -9717,14 +9718,18 @@ msgstr "淡化背景： " -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146 msgid "error loading metadata" msgstr "載入中繼資料時發生錯誤" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154 +msgid "error requesting update: not zoom-level 12" +msgstr "" + +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164 #, java-format msgid "requested: {0}" msgstr "要求的：{0}" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168 msgid "error requesting update" msgstr "要求更新時發生錯誤" @@ -22673,4 +22678,7 @@ #~ msgstr "標籤預設組合來源" +#~ msgid "image not loaded" +#~ msgstr "尚未載入圖片" + #~ msgid "EPSG:4326" #~ msgstr "EPSG:4326" @@ -22749,2 +22757,5 @@ #~ msgid "Error when communicating with server." #~ msgstr "與伺服器連線時發生錯誤。" + +#~ msgid "image loading..." +#~ msgstr "正在載入圖片..."