Index: /applications/editors/josm/i18n/po/ar.po =================================================================== --- /applications/editors/josm/i18n/po/ar.po (revision 17945) +++ /applications/editors/josm/i18n/po/ar.po (revision 17946) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 16:38+0200\n" -"PO-Revision-Date: 2009-09-22 18:55+0000\n" +"POT-Creation-Date: 2009-10-02 22:03+0200\n" +"PO-Revision-Date: 2009-09-28 18:24+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Arabic \n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= " "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n" -"X-Launchpad-Export-Date: 2009-09-28 14:34+0000\n" +"X-Launchpad-Export-Date: 2009-10-02 19:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -48,5 +48,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -91,9 +91,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -126,6 +126,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -148,5 +148,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 @@ -329,5 +329,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -339,12 +339,12 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -366,5 +366,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 @@ -453,9 +453,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -490,6 +490,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -619,22 +619,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 msgid "Combine Way" msgstr "ادمج الطريق" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine several ways into one." msgstr "ادمج عدة طرق في طريق واحدة." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Change directions?" msgstr "غيّر الإتجاه ؟" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 msgid "Reverse and Combine" msgstr "أعكس ثم إدمج" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -642,5 +642,5 @@ msgstr "لا يمكن ضمّ الطرقات في إتجاهاتها الحالية. هل تريد عكس إتجاهات بعضها ؟" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -648,10 +648,10 @@ msgstr "لا يمكن تجميع الطرق (لا يمكن دمجها في سلسلة عقد واحدة)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "ادمج {0} طرقات" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "الرجاء إختر على الأقل طريقتين للدمج." @@ -696,5 +696,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -762,5 +762,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333 msgid "OK" @@ -845,8 +845,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -882,5 +882,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 @@ -952,5 +952,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1038,22 +1038,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 msgid "Merge Nodes" msgstr "إدمج العقد" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge nodes into the oldest one." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Please select at least two nodes to merge." msgstr "الرجاء إختيار على الأقل عقدتين للدمج." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "غير قادر على دمج العقد: فسيتم محو طريق هو قيد الإستعمال." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261 #, java-format msgid "Merge {0} nodes" @@ -1230,5 +1230,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106 #, java-format msgid "Pasting {0} tag" @@ -1237,5 +1237,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107 #, java-format msgid "to {0} primitive" @@ -2109,53 +2109,53 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a search string." msgstr "الرجاء إدخال مصطلحات البحث." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 msgid "replace selection" msgstr "إستبدل الخيار" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "add to selection" msgstr "أضف إلى اخيار" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75 msgid "remove from selection" msgstr "أحذف من الخيار" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 msgid "case sensitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "regular expression" msgstr "عبارة منتظمة" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"شارع الفران\" - 'شارع الفران' في أي مفتاح أو إسم." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "type=route - key 'type' with value exactly 'route'." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2163,72 +2163,72 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "-name:Bak - not 'Bak' in the name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "foot: - key=foot set to any value." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "Special targets:" msgstr "الأهداف المميزة:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "" "type: - type of the object (node, way, relation)" msgstr "النوع: - نوع الغرض (عقدة, طريق, علاقة)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "user:... - all objects changed by user" msgstr "المستخدم:... - كلّ الأغراض اللتي قام المستخدم بتغييرها" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "id:... - object with given ID (0 for new objects)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "nodes:... - object with given number of nodes" msgstr "العقد:... - الغرض ذات عدد العقد المحدد" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "modified - all changed objects" msgstr "مغيير - كلّ الأغراض المغييرة" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "selected - all selected objects" msgstr "المختارة - كلّ الأغراض المختارة" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "incomplete - all incomplete objects" msgstr "غير المكتملة - كلّ الأغراض غير المكتملة" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 msgid "untagged - all untagged objects" msgstr "غير المسمات - كلّ الأغراض غير المسمات" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "Use | or OR to combine with logical or" msgstr "إستعمل | أو أو للدمج بالأو المنطقي" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2238,51 +2238,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "إبحث" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Start Search" msgstr "إبدء البحث" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 #, java-format msgid "No match found for ''{0}''" msgstr "لم أجد شيء مطابق لِــ ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, java-format -msgid "Nothing find in selection by searching for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254 +#, java-format +msgid "Nothing found in selection by searching for ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264 #, java-format msgid "Found {0} matches" msgstr "وجدتُ {0} مطابقات" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 msgid "RX" msgstr "" @@ -2591,5 +2591,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 msgid "Delete from relation" msgstr "أمحي من العلاقة" @@ -2640,12 +2640,12 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 -#, fuzzy, java-format +#, java-format msgid "Purged object ''{0}''" -msgstr "حرّك الأغراض {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 -#, fuzzy, java-format +#, java-format msgid "Purged {0} objects" -msgstr "غيّر غرض {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 @@ -2657,7 +2657,7 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 -#, fuzzy, java-format +#, java-format msgid "Removing reference from relation {0}" -msgstr "هل حقاً أمحي الخيار من العلاقة {0} ؟" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 @@ -3018,14 +3018,14 @@ msgstr "تحذير: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3033,5 +3033,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3391,7 +3391,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 #, java-format @@ -3437,7 +3435,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 -#, fuzzy msgid "Not Found" -msgstr "لم يُعثر على الملف" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 @@ -3743,9 +3740,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289 msgid "(no object)" msgstr "(لا يوجد أي غرض)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416 msgid "User:" msgstr "" @@ -4209,5 +4206,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "تم حذفه" @@ -4308,5 +4305,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4353,6 +4350,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 @@ -4366,6 +4363,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4423,34 +4420,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115 msgid "Conflicts when combining primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121 #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257 msgid "No conflicts to resolve" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 @@ -4468,23 +4465,23 @@ msgstr "الكلّ" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66 msgid "Choose a value" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 -msgid "Please decided which values to keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68 +msgid "Please decide which values to keep" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73 #, java-format msgid "Value ''{0}'' is going to be applied for key ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79 #, java-format msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84 #, java-format msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" @@ -4528,7 +4525,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "Paste ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "From ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "To ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:444 +#, java-format +msgid "{0} tag" +msgid_plural "{0} tags" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 #, java-format @@ -4542,7 +4559,5 @@ msgstr[5] "{0} طريق" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format @@ -4552,26 +4567,4 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "Paste ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "From ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "To ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425 -#, java-format -msgid "{0} tag" -msgid_plural "{0} tags" -msgstr[0] "" -msgstr[1] "" - #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 #, java-format @@ -4637,4 +4630,12 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 msgid "Decision" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42 +msgid "Please select the values to keep for the following tags." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 +msgid "Show tags with conflicts only" msgstr "" @@ -4654,5 +4655,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 @@ -4745,5 +4746,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -4899,6 +4900,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323 #, java-format msgid "This will change up to {0} object." @@ -4907,22 +4908,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149 msgid "An empty value deletes the key." msgstr "قيمة فارغة ستمحي المفتاح." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108 msgid "" msgstr "<مختلف>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347 msgid "Change values?" msgstr "غيّر القيم ؟" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264 #, java-format msgid "Change properties of up to {0} object" @@ -4931,69 +4932,69 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 msgid "Please select a key" msgstr "الرجاء إختيار مفتاح" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335 msgid "Please select a value" msgstr "الرجاء إختيار قيمة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447 msgid "Please select the objects you want to change properties for." msgstr "الرجاء إختيار الأغراض اللتي تريد تغيير خصائصها." +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "خصائص/عضويات" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 msgid "Properties for selected objects." msgstr "خصائص الأغراض المختارة." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 msgid "Member Of" msgstr "عضو من" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576 msgid "Add Properties" msgstr "أضف صفة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 msgid "Add a new key/value pair to all objects" msgstr "أضف زوج جديد مفتاح/قيمة إلى كلّ الأغراض" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Edit Properties" msgstr "حرّر الخصائص" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 msgid "Edit the value of the selected key for all objects" msgstr "حرّر المحتاح المنقى لكلّ الأغراض" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "الخصائص: {0} / العضويات: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799 msgid "Properties / Memberships" msgstr "الخصائص/ العضويات" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Change relation" msgstr "غيّر العلاقة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 #, java-format msgid "Really delete selection from relation {0}?" msgstr "هل حقاً أمحي الخيار من العلاقة {0} ؟" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860 msgid "Delete the selected key in all objects" msgstr "أمحي المفتاح المنتقى من كلّ الأغراض" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862 msgid "Delete Properties" msgstr "أمحي الخصائص" @@ -5035,7 +5036,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 -#, fuzzy msgid "Set the current selection to the list of selected relations" -msgstr "إفتح محرر نص للعلاقة المحددة" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5076,14 +5076,14 @@ msgstr "الخيار: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307 msgid "Undock the panel" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "أغلق هذه اللوحة. يمكنك إعادة فتحها في شريط الأدوات اليساري." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332 msgid "Click to minimize/maximize the panel content" msgstr "أنقر لتكبير/تصغير محتويات اللوحة" @@ -6501,5 +6501,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 #: build/trans_presets.java:67 build/trans_presets.java:103 #: build/trans_presets.java:143 build/trans_presets.java:180 @@ -6877,7 +6877,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -#, fuzzy msgid "Save/Upload and Exit" -msgstr "حفظ و خروج" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 @@ -6886,7 +6885,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -#, fuzzy msgid "Save/Upload and Delete" -msgstr "تمّ إلغاء التحميل" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 @@ -7100,5 +7098,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7455,8 +7453,4 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" -msgstr[5] "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 @@ -7470,13 +7464,8 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" -msgstr[5] "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 -#, fuzzy msgid "Conflicts detected" -msgstr "التناقضات" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 @@ -7815,5 +7804,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "اللون" @@ -8785,5 +8774,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313 msgid "Parse error: invalid document structure for GPX document." msgstr "" @@ -8962,19 +8951,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10130,69 +10119,73 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911 +msgid "Starting and ending numbers must be the same for alphabetic addresses" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943 msgid "Starting address number must be less than ending address number" msgstr "" @@ -19698,24 +19691,20 @@ #. item "Man Made/Tower" text "Name" #: build/trans_presets.java:2296 -#, fuzzy msgid "Tower type" -msgstr "نوع الطريق" +msgstr "" #. item "Man Made/Tower" combo "Tower type" #: build/trans_presets.java:2296 -#, fuzzy msgid "communication" -msgstr "الإتصال" +msgstr "" #: build/trans_presets.java:2296 -#, fuzzy msgid "observation" -msgstr "إرتفاع" +msgstr "" #. #: build/trans_presets.java:2298 -#, fuzzy msgid "Height (meters)" -msgstr "الإرتفاع الأقصى (أمتار)" +msgstr "" #. item "Man Made/Tower" text "Operator" @@ -19775,7 +19764,6 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "oil" -msgstr "طاقة أحفورية" +msgstr "" #: build/trans_presets.java:2330 build/trans_presets.java:2372 @@ -19784,12 +19772,10 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "sewage" -msgstr "الإستعمال" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "heat" -msgstr "أرض بور" +msgstr "" #: build/trans_presets.java:2330 @@ -19798,12 +19784,10 @@ #: build/trans_presets.java:2331 -#, fuzzy msgid "underwater" -msgstr "الماء" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "overground" -msgstr "تحت الأرض" +msgstr "" #: build/trans_presets.java:2333 @@ -19948,17 +19932,14 @@ #. item "Man Made/Power Tower" combo "Type" #: build/trans_presets.java:2398 -#, fuzzy msgid "tower" -msgstr "برج" +msgstr "" #: build/trans_presets.java:2398 -#, fuzzy msgid "pole" -msgstr "الدّور" +msgstr "" #: build/trans_presets.java:2399 -#, fuzzy msgid "Tower reference" -msgstr "رقم الخط" +msgstr "" #. item "Man Made/Power Tower" text "Tower reference" @@ -19976,13 +19957,11 @@ #. item "Man Made/Power Line" label "Edit Power Line" #: build/trans_presets.java:2405 -#, fuzzy msgid "Line type" -msgstr "نوع الطريق" +msgstr "" #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2405 -#, fuzzy msgid "line" -msgstr "خط أنابيب" +msgstr "" #: build/trans_presets.java:2405 @@ -19997,7 +19976,6 @@ #. item "Man Made/Power Line" text "Voltage" #: build/trans_presets.java:2409 -#, fuzzy msgid "Amount of Cables" -msgstr "عدد الأسلاك" +msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" @@ -20008,22 +19986,18 @@ #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" #: build/trans_presets.java:2410 -#, fuzzy msgid "single" -msgstr "الزاوية" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "double" -msgstr "الدّور" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "triple" -msgstr "الملفّ" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "quad" -msgstr "كسارة / مقلع حجارة" +msgstr "" #: build/trans_presets.java:2413 @@ -25918,9 +25892,138 @@ msgstr "" +#~ msgid "Unknown version" +#~ msgstr "نسخة مجهولة" + +#~ msgid "Aborting..." +#~ msgstr "إجهاض..." + +#~ msgid "false" +#~ msgstr "خاطئ" + +#~ msgid "true" +#~ msgstr "حقيقي" + +#~ msgid "different" +#~ msgstr "مختلف" + +#~ msgid "Rotate" +#~ msgstr "أدر" + +#~ msgid "Change" +#~ msgstr "غيّر" + +#~ msgid "Move" +#~ msgstr "حرك" + +#~ msgid "unnamed" +#~ msgstr "غيرمسمى" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "دمج العقد رغم عضويتها المختلفة ؟" + +#~ msgid "No document open so nothing to save." +#~ msgstr "لم تفتح أي مستند لذالك لم يتم تحميل أي شيء." + +#~ msgid "Unknown file extension." +#~ msgstr "إمتداد ملف غير معروف." + +#~ msgid "Email" +#~ msgstr "البريد الإلكتروني" + +#~ msgid "No data imported." +#~ msgstr "لم يتم تحميل أي معطيات" + +#~ msgid "Data Layer" +#~ msgstr "طبقة المعطيات" + +#~ msgid "citymap" +#~ msgstr "خريطة المدينة" + +#~ msgid "map" +#~ msgstr "خريطة" + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "ردّ الخادم بخطأ داخلي. حاول مرة ثانية بمنطقة أصغر أو إنتظر بعض الوقت." + +#~ msgid " has zero ref" +#~ msgstr "لا يوجد لــ أي مرجع" + +#~ msgid "Ill-formed node id" +#~ msgstr "ضذوذ تكوين معرف العقدة" + +#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" +#~ msgstr "إجهاض عملية النقل لسبب خطأ ( سأنتظر 5 ثواني ):" + +#~ msgid "Basic" +#~ msgstr "الأساسي" + +#~ msgid "Date" +#~ msgstr "التاريخ" + +#~ msgid "Object" +#~ msgstr "الغرض" + +#~ msgid "Cannot connect to server." +#~ msgstr "غير قادر على الإتصال بلمخدم." + +#~ msgid "Authors: {0}" +#~ msgstr "المؤلفون: {0}" + +#~ msgid "Occupied By" +#~ msgstr "المشغول من" + +#~ msgid "Remove Selected" +#~ msgstr "أزل المختارة" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "أضف كلّ الأغراض المختارة حالياً كأعضاء" + +#~ msgid "Click Reload to refresh list" +#~ msgstr "أنقر إعادة التعبئة لإنعاش اللائحة" + +#~ msgid "Revert" +#~ msgstr "إسترجع" + +#~ msgid "Error parsing server response." +#~ msgstr "خطأ عند التحليل النحوي لردّ المخدم." + +#~ msgid "Conflicts: {0}" +#~ msgstr "التناقضات: {0}" + +#~ msgid "Delete {1} {0}" +#~ msgstr "أمحي {1} {0}" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "Empty member in relation." +#~ msgstr "عضو فارغ في العلاقة." + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "يمكنك إستعمال الفأرة أو المفاتيح Ctrl+سهم كي تكبر/تصغر أو للإزاحة" + +#~ msgid "bicyclemap" +#~ msgstr "خريطة راكب دراجة" + +#~ msgid "There were conflicts during import." +#~ msgstr "حصل تعارض حين الإستيراد." + +#~ msgid "Move Down" +#~ msgstr "حرّك إلى الأسفل" + +#~ msgid "Move Up" +#~ msgstr "حرّك إلى الأعلى" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "محرّر العلاقات: {0}" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "غير قادر على فتح دليل التفضيلات: {0}" + #~ msgid "Combine ways with different memberships?" #~ msgstr "ادمج الطرقات رغم إختلاف عضويتها ؟" - -#~ msgid "Combine Anyway" -#~ msgstr "على أي حال ادمج" #~ msgid "" @@ -25930,138 +26033,9 @@ #~ "إن للطرقات المختارة عضويات في علاقات مختلفة. هل تريد دمجها رغم ذلك ؟" -#~ msgid "Empty member in relation." -#~ msgstr "عضو فارغ في العلاقة." - -#~ msgid "Unknown version" -#~ msgstr "نسخة مجهولة" - -#~ msgid "Aborting..." -#~ msgstr "إجهاض..." - -#~ msgid "false" -#~ msgstr "خاطئ" - -#~ msgid "true" -#~ msgstr "حقيقي" - -#~ msgid "different" -#~ msgstr "مختلف" - -#~ msgid "Rotate" -#~ msgstr "أدر" - -#~ msgid "Change" -#~ msgstr "غيّر" - -#~ msgid "Move" -#~ msgstr "حرك" - -#~ msgid "unnamed" -#~ msgstr "غيرمسمى" - -#~ msgid "Merge nodes with different memberships?" -#~ msgstr "دمج العقد رغم عضويتها المختلفة ؟" - -#~ msgid "No document open so nothing to save." -#~ msgstr "لم تفتح أي مستند لذالك لم يتم تحميل أي شيء." - -#~ msgid "Unknown file extension." -#~ msgstr "إمتداد ملف غير معروف." - -#~ msgid "Email" -#~ msgstr "البريد الإلكتروني" - -#~ msgid "No data imported." -#~ msgstr "لم يتم تحميل أي معطيات" - -#~ msgid "Data Layer" -#~ msgstr "طبقة المعطيات" - -#~ msgid "citymap" -#~ msgstr "خريطة المدينة" - -#~ msgid "map" -#~ msgstr "خريطة" - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "ردّ الخادم بخطأ داخلي. حاول مرة ثانية بمنطقة أصغر أو إنتظر بعض الوقت." - -#~ msgid " has zero ref" -#~ msgstr "لا يوجد لــ أي مرجع" - -#~ msgid "Ill-formed node id" -#~ msgstr "ضذوذ تكوين معرف العقدة" - -#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" -#~ msgstr "إجهاض عملية النقل لسبب خطأ ( سأنتظر 5 ثواني ):" - -#~ msgid "Basic" -#~ msgstr "الأساسي" - -#~ msgid "Date" -#~ msgstr "التاريخ" - -#~ msgid "Object" -#~ msgstr "الغرض" - -#~ msgid "Cannot connect to server." -#~ msgstr "غير قادر على الإتصال بلمخدم." - -#~ msgid "Authors: {0}" -#~ msgstr "المؤلفون: {0}" - -#~ msgid "Occupied By" -#~ msgstr "المشغول من" - -#~ msgid "Remove Selected" -#~ msgstr "أزل المختارة" - -#~ msgid "Add all currently selected objects as members" -#~ msgstr "أضف كلّ الأغراض المختارة حالياً كأعضاء" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "أنقر إعادة التعبئة لإنعاش اللائحة" - -#~ msgid "Revert" -#~ msgstr "إسترجع" - -#~ msgid "Error parsing server response." -#~ msgstr "خطأ عند التحليل النحوي لردّ المخدم." - -#~ msgid "Conflicts: {0}" -#~ msgstr "التناقضات: {0}" - -#~ msgid "Delete {1} {0}" -#~ msgstr "أمحي {1} {0}" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "يمكنك إستعمال الفأرة أو المفاتيح Ctrl+سهم كي تكبر/تصغر أو للإزاحة" - -#~ msgid "bicyclemap" -#~ msgstr "خريطة راكب دراجة" - -#~ msgid "There were conflicts during import." -#~ msgstr "حصل تعارض حين الإستيراد." - -#~ msgid "Move Down" -#~ msgstr "حرّك إلى الأسفل" - -#~ msgid "Move Up" -#~ msgstr "حرّك إلى الأعلى" - -#~ msgid "Relation Editor: {0}" -#~ msgstr "محرّر العلاقات: {0}" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "غير قادر على فتح دليل التفضيلات: {0}" - #~ msgid "All the ways were empty" #~ msgstr "كل الطرقات كانت فارغة" + +#~ msgid "Combine Anyway" +#~ msgstr "على أي حال ادمج" #~ msgid "Merge Anyway" Index: /applications/editors/josm/i18n/po/bg.po =================================================================== --- /applications/editors/josm/i18n/po/bg.po (revision 17945) +++ /applications/editors/josm/i18n/po/bg.po (revision 17946) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 16:38+0200\n" -"PO-Revision-Date: 2009-09-24 20:31+0000\n" -"Last-Translator: pl71 \n" +"POT-Creation-Date: 2009-10-02 22:03+0200\n" +"PO-Revision-Date: 2009-09-28 18:27+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Bulgarian \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-28 14:32+0000\n" +"X-Launchpad-Export-Date: 2009-10-02 19:25+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -48,5 +48,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -91,9 +91,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -126,6 +126,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -148,5 +148,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 @@ -337,5 +337,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -347,12 +347,12 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -374,5 +374,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 @@ -463,9 +463,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -500,6 +500,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -629,22 +629,22 @@ msgstr "Зареждане на отворени пакети с изменения" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 msgid "Combine Way" msgstr "Обедини линии" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine several ways into one." msgstr "Обединява няколко отделни линии в една." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Change directions?" msgstr "Промени посоката?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 msgid "Reverse and Combine" msgstr "Връщане и Комбиниране" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -654,5 +654,5 @@ "посоката на някои от тях?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -662,10 +662,10 @@ "последователност от възли)." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Обединяване {0} линии" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Моля, изберете поне две линии за комбиниране." @@ -710,5 +710,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -777,5 +777,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333 msgid "OK" @@ -861,8 +861,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -898,5 +898,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 @@ -968,5 +968,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1058,18 +1058,18 @@ msgstr "Обединява текущия слой в друг слой" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 msgid "Merge Nodes" msgstr "Обедини точки" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge nodes into the oldest one." msgstr "Обедини точките в най-старата от тях." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Please select at least two nodes to merge." msgstr "Моля, изберете поне две точки за обединение." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -1077,5 +1077,5 @@ "използва." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261 #, java-format msgid "Merge {0} nodes" @@ -1257,5 +1257,5 @@ msgstr "Приложи маркерите от буфера за копиране към всички избрани обекти." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106 #, java-format msgid "Pasting {0} tag" @@ -1264,5 +1264,5 @@ msgstr[1] "Поставяне на {0} етикета" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107 #, java-format msgid "to {0} primitive" @@ -1922,7 +1922,6 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 -#, fuzzy msgid "No data found in this area." -msgstr "На устройството не са открити данни." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2191,53 +2190,53 @@ msgstr "Не може да се търси защото няма заредени данни" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a filter string." msgstr "Моля въведете филтър." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a search string." msgstr "Моля, въведете низ за търсене." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 msgid "replace selection" msgstr "замени селекцията" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "add to selection" msgstr "добави към селекцията" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75 msgid "remove from selection" msgstr "изтрий от селекцията" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76 msgid "find in selection" msgstr "търсене в селекцията" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 msgid "case sensitive" msgstr "чувствителност към регистъра" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "regular expression" msgstr "регулярен израз" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "Baker Street - 'Baker' и 'Street' в кой да е ключ или име." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"Baker Street\" - 'Baker Street' в кой да е ключ или име." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' където и да е в името." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - ключ 'type' със стойност именно 'route'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2247,50 +2246,50 @@ "*=value, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - няма 'Bak' в името." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "foot: - key=foot set to any value." msgstr "foot: - ключ=foot, независимо от стойността." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "Special targets:" msgstr "Специални цели:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "" "type: - type of the object (node, way, relation)" msgstr "тип: - тип на обекта (възел, път, връзка)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "user:... - all objects changed by user" msgstr "user:... - всички обекти, променени от зададения потребител" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - обект с дадено ID (0 за нови обекти)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - обекти с дадено количество възели / точки" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "modified - all changed objects" msgstr "modified - всички променени обекти" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "selected - all selected objects" msgstr "selected - всички избрани обекти" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "incomplete - all incomplete objects" msgstr "incomplete - всички непълни обекти" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 msgid "untagged - all untagged objects" msgstr "untagged - всички немаркирани обекти" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 msgid "" "child expr - all children of objects matching the expression" @@ -2298,5 +2297,5 @@ "child израз - всички обекти наследници, отговарящи на израза" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "" "parent expr - all parents of objects matching the expression" @@ -2304,9 +2303,9 @@ "parent израз - все предки объектов, соответствующие выражению" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "Use | or OR to combine with logical or" msgstr "Използвайте | или OR за да обедините в логическо \"ИЛИ\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2314,9 +2313,9 @@ "ключ съдържа двоеточие)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "Use ( and ) to group expressions" msgstr "Използвайте ( и ) за да групирате изрази" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2326,51 +2325,51 @@ msgstr "Филтър" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Търсене" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Submit filter" msgstr "Приемане на филтър" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Start Search" msgstr "Стартиране търсене" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 #, java-format msgid "No match found for ''{0}''" msgstr "Не е намерено съвпадение за ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Нищо не е добавено към селекцията в резултат на търсенето за ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Нищо не е премахнато от селекцията в резултат на търсенето за ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, java-format -msgid "Nothing find in selection by searching for ''{0}''" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254 +#, fuzzy, java-format +msgid "Nothing found in selection by searching for ''{0}''" msgstr "Нищо не е открито в селекцията чрез търсене на ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264 #, java-format msgid "Found {0} matches" msgstr "Намерени са {0} съвпадения" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 msgid "RX" msgstr "RX" @@ -2647,10 +2646,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 -#, fuzzy, java-format +#, java-format msgid "" "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" -"Невъзможно е връщането на командата ''{0}'', защото слой ''{1}'' не е " -"наличен вече" #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 @@ -2699,5 +2696,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 msgid "Delete from relation" msgstr "Изтриване от връзка" @@ -2755,12 +2752,12 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 -#, fuzzy, java-format +#, java-format msgid "Purged object ''{0}''" -msgstr "Преместване обекти {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 -#, fuzzy, java-format +#, java-format msgid "Purged {0} objects" -msgstr "Промяна {0} обект" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 @@ -2774,7 +2771,7 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 -#, fuzzy, java-format +#, java-format msgid "Removing reference from relation {0}" -msgstr "Премахване на отношението от връзката {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 @@ -3147,14 +3144,14 @@ msgstr "Предупреждение: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3162,5 +3159,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3516,7 +3513,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 #, java-format @@ -3558,7 +3553,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 -#, fuzzy msgid "Not Found" -msgstr "Не сте свързан" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 @@ -3872,9 +3866,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289 msgid "(no object)" msgstr "(няма обект)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416 msgid "User:" msgstr "" @@ -4346,5 +4340,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "изтрито" @@ -4447,5 +4441,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4492,6 +4486,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 @@ -4505,6 +4499,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4562,34 +4556,34 @@ msgstr "Тяхната база данни не съдържа етикет с ключ {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115 msgid "Conflicts when combining primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121 #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257 msgid "No conflicts to resolve" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 @@ -4607,23 +4601,23 @@ msgstr "всички" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66 msgid "Choose a value" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 -msgid "Please decided which values to keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68 +msgid "Please decide which values to keep" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73 #, java-format msgid "Value ''{0}'' is going to be applied for key ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79 #, java-format msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84 #, java-format msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" @@ -4667,7 +4661,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "Paste ..." +msgstr "Поставяне..." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "From ..." +msgstr "От..." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "To ..." +msgstr "На..." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:444 +#, java-format +msgid "{0} tag" +msgid_plural "{0} tags" +msgstr[0] "{0} етикет" +msgstr[1] "{0} етикета" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 #, java-format @@ -4677,7 +4691,5 @@ msgstr[1] "{0} пътя" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format @@ -4686,26 +4698,4 @@ msgstr[0] "{0} релация" msgstr[1] "{0} релации" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "Paste ..." -msgstr "Поставяне..." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "From ..." -msgstr "От..." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "To ..." -msgstr "На..." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425 -#, java-format -msgid "{0} tag" -msgid_plural "{0} tags" -msgstr[0] "{0} етикет" -msgstr[1] "{0} етикета" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 @@ -4774,4 +4764,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42 +msgid "Please select the values to keep for the following tags." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 +#, fuzzy +msgid "Show tags with conflicts only" +msgstr "Възли(с конфликт)" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -4789,5 +4788,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 @@ -4880,5 +4879,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -5034,6 +5033,6 @@ msgstr "Информация за слоя" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323 #, java-format msgid "This will change up to {0} object." @@ -5042,22 +5041,22 @@ msgstr[1] "Това ще промени до {0} обекта" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149 msgid "An empty value deletes the key." msgstr "Празна стойност изтрива ключа." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108 msgid "" msgstr "<различни>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347 msgid "Change values?" msgstr "Промени стойностите?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264 #, java-format msgid "Change properties of up to {0} object" @@ -5066,69 +5065,69 @@ msgstr[1] "Промяна параметрите на {0} обекта" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 msgid "Please select a key" msgstr "Моля, изберете ключ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335 msgid "Please select a value" msgstr "Изберете стойност" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447 msgid "Please select the objects you want to change properties for." msgstr "Моля, изберете обектите, чиито параметри искате да промените." +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "Параметри/Отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 msgid "Properties for selected objects." msgstr "Параметри на избраните обекти" #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 msgid "Member Of" msgstr "Член на" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576 msgid "Add Properties" msgstr "Добавяне на параметри" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 msgid "Add a new key/value pair to all objects" msgstr "Добавяне на нова двойка ключ/стойност за всички обекти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Edit Properties" msgstr "Редактиране на параметри" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 msgid "Edit the value of the selected key for all objects" msgstr "Редактиране стойността на избрания ключ за всички обекти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Свойства: {0} / Членство: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799 msgid "Properties / Memberships" msgstr "Параметри / Отношения" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Change relation" msgstr "Промяна на връзка" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Изваждане на избраните обекти от релация {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860 msgid "Delete the selected key in all objects" msgstr "Изтриване на избрания ключ за всички обекти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862 msgid "Delete Properties" msgstr "Изтриване на параметри" @@ -5170,7 +5169,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 -#, fuzzy msgid "Set the current selection to the list of selected relations" -msgstr "Текушата селекция не може да се използва за разделяне." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5211,9 +5209,9 @@ msgstr "Избрано: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307 msgid "Undock the panel" msgstr "Отсъедини панела" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5222,5 +5220,5 @@ "левия панел." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332 msgid "Click to minimize/maximize the panel content" msgstr "Натиснете за да минимизирате/максимизирате съдържанието на панела" @@ -6644,5 +6642,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 #: build/trans_presets.java:67 build/trans_presets.java:103 #: build/trans_presets.java:143 build/trans_presets.java:180 @@ -7020,7 +7018,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -#, fuzzy msgid "Save/Upload and Exit" -msgstr "Запис и Изход" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 @@ -7029,7 +7026,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -#, fuzzy msgid "Save/Upload and Delete" -msgstr "Запис и изтриване" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 @@ -7245,5 +7241,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7597,9 +7593,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 -#, fuzzy, java-format +#, java-format msgid "There was {0} conflict detected." msgid_plural "There were {0} conflicts detected." -msgstr[0] "{0} конфликт(а) при въвеждането" -msgstr[1] "{0} конфликт(а) при въвеждането" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 @@ -7615,7 +7611,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 -#, fuzzy msgid "Conflicts detected" -msgstr "Забелязан е конфликт." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 @@ -7968,5 +7963,5 @@ msgstr "Калибровка на звукозаписа" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Цвят" @@ -8980,5 +8975,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313 msgid "Parse error: invalid document structure for GPX document." msgstr "Грешка при разбор: невалидна структура на gpx документа" @@ -9159,19 +9154,19 @@ msgstr "ОК - нов опит" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9636,7 +9631,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' must not be null" -msgstr "Параметърът {0} не трябва да е празен" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 @@ -10371,69 +10366,73 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911 +msgid "Starting and ending numbers must be the same for alphabetic addresses" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943 msgid "Starting address number must be less than ending address number" msgstr "" @@ -20097,24 +20096,20 @@ #. item "Man Made/Tower" text "Name" #: build/trans_presets.java:2296 -#, fuzzy msgid "Tower type" -msgstr "Тип маршрут" +msgstr "" #. item "Man Made/Tower" combo "Tower type" #: build/trans_presets.java:2296 -#, fuzzy msgid "communication" -msgstr "връзка" +msgstr "" #: build/trans_presets.java:2296 -#, fuzzy msgid "observation" -msgstr "Надморска височина" +msgstr "" #. #: build/trans_presets.java:2298 -#, fuzzy msgid "Height (meters)" -msgstr "Макс.височина (метри)" +msgstr "" #. item "Man Made/Tower" text "Operator" @@ -20174,7 +20169,6 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "oil" -msgstr "енергия от изкопаеми горива" +msgstr "" #: build/trans_presets.java:2330 build/trans_presets.java:2372 @@ -20183,27 +20177,22 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "sewage" -msgstr "използване" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "heat" -msgstr "пустош" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "any substance" -msgstr "A по разстояние" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "underwater" -msgstr "вода" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "overground" -msgstr "подземен" +msgstr "" #: build/trans_presets.java:2333 @@ -20348,17 +20337,14 @@ #. item "Man Made/Power Tower" combo "Type" #: build/trans_presets.java:2398 -#, fuzzy msgid "tower" -msgstr "Кула" +msgstr "" #: build/trans_presets.java:2398 -#, fuzzy msgid "pole" -msgstr "Роля" +msgstr "" #: build/trans_presets.java:2399 -#, fuzzy msgid "Tower reference" -msgstr "Номер линия" +msgstr "" #. item "Man Made/Power Tower" text "Tower reference" @@ -20376,18 +20362,15 @@ #. item "Man Made/Power Line" label "Edit Power Line" #: build/trans_presets.java:2405 -#, fuzzy msgid "Line type" -msgstr "Тип писта" +msgstr "" #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2405 -#, fuzzy msgid "line" -msgstr "Наклон" +msgstr "" #: build/trans_presets.java:2405 -#, fuzzy msgid "minor_line" -msgstr "Автомагистрална връзка" +msgstr "" #. item "Man Made/Power Line" text "Line reference" @@ -20398,7 +20381,6 @@ #. item "Man Made/Power Line" text "Voltage" #: build/trans_presets.java:2409 -#, fuzzy msgid "Amount of Cables" -msgstr "Брой жици" +msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" @@ -20409,22 +20391,18 @@ #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" #: build/trans_presets.java:2410 -#, fuzzy msgid "single" -msgstr "Ъгъл" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "double" -msgstr "Буле (игра с мет.топчета)" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "triple" -msgstr "Стълби за преминаване през ограда" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "quad" -msgstr "Кваркери" +msgstr "" #: build/trans_presets.java:2413 @@ -26318,31 +26296,4 @@ msgid "Czech UHUL:ORTOFOTO" msgstr "Czech UHUL:ORTOFOTO" - -#~ msgid "Combine ways with different memberships?" -#~ msgstr "Обединяване на линии, влизащи в различни релации?" - -#~ msgid "Combine Anyway" -#~ msgstr "Комбиниране въпреки всичко" - -#~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want " -#~ "to combine them?" -#~ msgstr "" -#~ "Избраните пътища имат различни участия в релации. Въпреки това искате ли " -#~ "да ги обеденим?" - -#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -#~ msgstr "" -#~ "Началото на съобщението за грешка \"{0}\" не отговаря на очаквания шаблон " -#~ "\"{1}\"" - -#~ msgid "Purging 1 primitive" -#~ msgstr "Изчистване на 1 примитив" - -#~ msgid "removing reference from way {0}" -#~ msgstr "премахване на справка от път {0}" - -#~ msgid "Empty member in relation." -#~ msgstr "В релацията има празен член." #~ msgid "{0} Plugin successfully updated. Please restart JOSM." @@ -26695,4 +26646,7 @@ #~ msgstr "Разширението вече съществува" +#~ msgid "Empty member in relation." +#~ msgstr "В релацията има празен член." + #~ msgid "" #~ "Plugin archive already available. Do you want to download the current " @@ -26725,4 +26679,14 @@ #~ msgstr "Разрешаване {0} конфликти в {1} обекти" +#~ msgid "Combine ways with different memberships?" +#~ msgstr "Обединяване на линии, влизащи в различни релации?" + +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "" +#~ "Избраните пътища имат различни участия в релации. Въпреки това искате ли " +#~ "да ги обеденим?" + #~ msgid "All the ways were empty" #~ msgstr "Всички линии бяха празни" @@ -26800,4 +26764,7 @@ #~ msgid "Delete and Download" #~ msgstr "Изтриване и Зареждане" + +#~ msgid "Combine Anyway" +#~ msgstr "Комбиниране въпреки всичко" #~ msgid "Merge Anyway" @@ -26950,4 +26917,12 @@ #~ msgstr "Липсва примитив." +#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +#~ msgstr "" +#~ "Началото на съобщението за грешка \"{0}\" не отговаря на очаквания шаблон " +#~ "\"{1}\"" + +#~ msgid "Purging 1 primitive" +#~ msgstr "Изчистване на 1 примитив" + #~ msgid "ways" #~ msgstr "линии" @@ -26968,4 +26943,7 @@ #~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" #~ msgstr "ВНИМАНИЕ: неуспех диалога да бъде винаги отгоре: Грешката бе: {0}" + +#~ msgid "removing reference from way {0}" +#~ msgstr "премахване на справка от път {0}" #~ msgid "parameter '{0}' must not be null" Index: /applications/editors/josm/i18n/po/cs.po =================================================================== --- /applications/editors/josm/i18n/po/cs.po (revision 17945) +++ /applications/editors/josm/i18n/po/cs.po (revision 17946) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 16:38+0200\n" -"PO-Revision-Date: 2009-09-27 08:46+0000\n" -"Last-Translator: Jezevec \n" +"POT-Creation-Date: 2009-10-02 22:03+0200\n" +"PO-Revision-Date: 2009-09-28 18:23+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-09-28 14:33+0000\n" +"X-Launchpad-Export-Date: 2009-10-02 19:25+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -47,5 +47,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -90,9 +90,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -147,5 +147,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 @@ -330,5 +330,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -340,12 +340,12 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -367,5 +367,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 @@ -456,9 +456,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -493,6 +493,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -622,22 +622,22 @@ msgstr "Stahování otevřených sad změn..." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 msgid "Combine Way" msgstr "Spojit cesty" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine several ways into one." msgstr "Spojit více cest do jedné" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Change directions?" msgstr "Změnit směr ?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 msgid "Reverse and Combine" msgstr "Otočit a zkombinovat" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -647,5 +647,5 @@ "orientaci?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -653,10 +653,10 @@ msgstr "Nemohu spojit cesty (Nemohou být spojeny do jednoho řetězce bodů)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Kombinovat {0} cesty" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Prosím zvolte minimálně dvě cesty ke spojení" @@ -702,5 +702,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -768,5 +768,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333 msgid "OK" @@ -851,8 +851,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -888,5 +888,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 @@ -960,5 +960,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1048,22 +1048,22 @@ msgstr "Sloučit aktuální vrstvu do jiné vrstvy" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 msgid "Merge Nodes" msgstr "Spojit uzly" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge nodes into the oldest one." msgstr "Spoj uzly do nejstaršího" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Please select at least two nodes to merge." msgstr "Zvolte minimálně dva uzly ke spojení" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "Nemohu spojit uzly: Smazala by se tak cesta, která je stále používána." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261 #, java-format msgid "Merge {0} nodes" @@ -1240,5 +1240,5 @@ msgstr "Použít popisky objektu ve schránce na všechny zvolené objekty." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106 #, java-format msgid "Pasting {0} tag" @@ -1248,5 +1248,5 @@ msgstr[2] "Vkládám {0} tagů" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107 #, java-format msgid "to {0} primitive" @@ -1895,7 +1895,6 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 -#, fuzzy msgid "No data found in this area." -msgstr "Nenalezena žádná data na zařízení." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2167,55 +2166,55 @@ msgstr "Nelze hledat jelikož nejsou nahrána žádná data." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a filter string." msgstr "Prosím zadejte řetězec filtru" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a search string." msgstr "Zadjte hledaný řetězec." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 msgid "replace selection" msgstr "nahradit označené" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "add to selection" msgstr "přidat k výběru" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75 msgid "remove from selection" msgstr "odebrat z výběru" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76 msgid "find in selection" msgstr "Najít ve výběru" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 msgid "case sensitive" msgstr "velikost písmen rozhoduje" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "regular expression" msgstr "regulární výraz" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "" "Baker Street - 'Baker' a 'Street' v jakémkoliv klíči nebo jménu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "" "\"Baker Street\" - 'Baker Street' v jakémkoliv klíči nebo jménu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' kdekoliv ve jménu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - klíč 'type' s hodnotou přesně 'route'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2225,50 +2224,50 @@ "*=value, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - neobsahuje 'Bak' ve jménu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "foot: - key=foot set to any value." msgstr "foot: - klíč 'foot' nastavený na jakoukoliv hodnotu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "Special targets:" msgstr "Speciální cíle:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "" "type: - type of the object (node, way, relation)" msgstr "type: - typ objektu (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "user:... - all objects changed by user" msgstr "user:... - všechny objekty změněné uživatelem" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - objekt s daným ID (0 pro nové objekty)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - objekt s daným počtem uzlů" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "modified - all changed objects" msgstr "modified - všechny změněné objekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "selected - all selected objects" msgstr "selected - všechny vybrané objekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "incomplete - all incomplete objects" msgstr "incomplete - všechny nekompletní objekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 msgid "untagged - all untagged objects" msgstr "untagged - všechny objekty bez tagů" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 msgid "" "child expr - all children of objects matching the expression" @@ -2276,5 +2275,5 @@ "child výraz - všechny podobjekty objektů odpovídajících výrazu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "" "parent expr - all parents of objects matching the expression" @@ -2282,18 +2281,18 @@ "parent výraz - všechny rodiče objektů odpovídajících výrazu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "Use | or OR to combine with logical or" msgstr "Použijte | nebo OR ke kombinaci s logickým \"nebo\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" "Použijte \" jako uvozovky (například pokud klíč obsahuje dvojtečku)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "Use ( and ) to group expressions" msgstr "Použijte ( a ) k seskupení výrazů" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2303,51 +2302,51 @@ msgstr "Filtrovat" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Hledat" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Submit filter" msgstr "Přidat filtr" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Start Search" msgstr "Začít hledání" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 #, java-format msgid "No match found for ''{0}''" msgstr "Nebyly nalezeny záznamy pro \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Nic nebylo přidáno výběrem hledáním \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Nic nebylo odstraněno výběrem hledáním \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, java-format -msgid "Nothing find in selection by searching for ''{0}''" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254 +#, fuzzy, java-format +msgid "Nothing found in selection by searching for ''{0}''" msgstr "Nebyly nalezeny pro záznamy ''{0}'' při hledání ve výběru" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264 #, java-format msgid "Found {0} matches" msgstr "Nalezeno {0} odpovídajích výrazů" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 msgid "RX" msgstr "RX" @@ -2618,8 +2617,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 -#, fuzzy, java-format +#, java-format msgid "" "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" -msgstr "Nelze zrušit příkaz ''{0}'' protože vrstva ''{1}'' již není dostupná" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 @@ -2671,5 +2670,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 msgid "Delete from relation" msgstr "Odstranit z relace" @@ -2727,12 +2726,12 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 -#, fuzzy, java-format +#, java-format msgid "Purged object ''{0}''" -msgstr "Přesunout objekty {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 -#, fuzzy, java-format +#, java-format msgid "Purged {0} objects" -msgstr "Změnit {0} objekt" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 @@ -2746,7 +2745,7 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 -#, fuzzy, java-format +#, java-format msgid "Removing reference from relation {0}" -msgstr "odstraňování reference z cesty {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 @@ -3110,14 +3109,14 @@ msgstr "Varování: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "očekáváno id >= 0. Nalezeno {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307 msgid "A primitive with ID = 0 can't be invisible." msgstr "objekt s id=0 nemůže být neviditelný" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3125,5 +3124,5 @@ msgstr "očekáváno id > 0. Nalezeno {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3483,7 +3482,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 #, java-format @@ -3527,7 +3524,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 -#, fuzzy msgid "Not Found" -msgstr "Nepřipojeno" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 @@ -3841,9 +3837,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289 msgid "(no object)" msgstr "(žádný objekt)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416 msgid "User:" msgstr "" @@ -4327,5 +4323,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "smazáno" @@ -4428,5 +4424,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4473,6 +4469,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 @@ -4486,6 +4482,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4543,34 +4539,34 @@ msgstr "Cizí datová sada neobsahuje tag s klíčem {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115 msgid "Conflicts when combining primitives" msgstr "Konflikty při slučování objektů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121 #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" msgstr "Konflikty při slučování cest - zkombinovaná cesta je ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" msgstr "Konflikty při slučování uzlů - zkombinovaný uzel je ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257 msgid "No conflicts to resolve" msgstr "Žádné konflikty k vyřešení" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "Zrušit řešení konfliktů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "Aplikovat vyřešené konflikty" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 @@ -4588,23 +4584,24 @@ msgstr "všechny" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66 msgid "Choose a value" msgstr "Vyberte hodnotu" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 -msgid "Please decided which values to keep" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68 +#, fuzzy +msgid "Please decide which values to keep" msgstr "Rozhodněte, které hodnoty ponechat" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73 #, java-format msgid "Value ''{0}'' is going to be applied for key ''{1}''" msgstr "Hodnota ''{0}'' bude použita pro klíč ''{1}''" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79 #, java-format msgid "The key ''{0}'' and all its values are going to be removed" msgstr "Klíč ''{0}'' a všechny jeho hodnoty budou odstraněny" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84 #, java-format msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" @@ -4648,7 +4645,28 @@ msgstr "Konflikt ve vložených tazích" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "Paste ..." +msgstr "Vložit ..." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "From ..." +msgstr "Z ..." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "To ..." +msgstr "Do ..." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:444 +#, java-format +msgid "{0} tag" +msgid_plural "{0} tags" +msgstr[0] "{0} tag" +msgstr[1] "{0} tagy" +msgstr[2] "{0} tagů" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 #, java-format @@ -4659,7 +4677,5 @@ msgstr[2] "{0} cest" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format @@ -4670,27 +4686,4 @@ msgstr[2] "{0} relací" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "Paste ..." -msgstr "Vložit ..." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "From ..." -msgstr "Z ..." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "To ..." -msgstr "Do ..." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425 -#, java-format -msgid "{0} tag" -msgid_plural "{0} tags" -msgstr[0] "{0} tag" -msgstr[1] "{0} tagy" -msgstr[2] "{0} tagů" - #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 #, java-format @@ -4758,4 +4751,13 @@ msgstr "Rozhodnutí" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42 +msgid "Please select the values to keep for the following tags." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 +#, fuzzy +msgid "Show tags with conflicts only" +msgstr "Body(s konflikty)" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -4773,5 +4775,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 @@ -4866,5 +4868,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -5020,6 +5022,6 @@ msgstr "Informace o vrstvě" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323 #, java-format msgid "This will change up to {0} object." @@ -5029,22 +5031,22 @@ msgstr[2] "Toto změní až {0} objektů." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149 msgid "An empty value deletes the key." msgstr "Prázdná hodnota smaže klíč" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347 msgid "Change values?" msgstr "Změnit hodnoty ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264 #, java-format msgid "Change properties of up to {0} object" @@ -5054,69 +5056,69 @@ msgstr[2] "Změnit vlastnosti až {0} objektů." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 msgid "Please select a key" msgstr "Prosím zvolte klíč" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335 msgid "Please select a value" msgstr "Vyberte prosím hodnotu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447 msgid "Please select the objects you want to change properties for." msgstr "Vyberte objekty, u kterých chcete změnit vlastnosti." +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "Vlastnosti/Členství" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 msgid "Properties for selected objects." msgstr "Vlastnosti pro zvolené objekty" #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 msgid "Member Of" msgstr "Člen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576 msgid "Add Properties" msgstr "Přidat vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 msgid "Add a new key/value pair to all objects" msgstr "Přidat nový pár klíč/hodnota ke všem objektům" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Edit Properties" msgstr "Upravit vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 msgid "Edit the value of the selected key for all objects" msgstr "Změnit hodnotu zvoleného klíče pro všechny objekty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Vlastnosti: {0} / Členství: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799 msgid "Properties / Memberships" msgstr "Vlastnosti / Členství" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Change relation" msgstr "Změnit relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Opravdu smazat výběr z relace {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860 msgid "Delete the selected key in all objects" msgstr "Smaže zvolený klíč ve všech objektech" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862 msgid "Delete Properties" msgstr "Smazat vlastnosti" @@ -5158,7 +5160,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 -#, fuzzy msgid "Set the current selection to the list of selected relations" -msgstr "Upravit vybranou relaci" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5199,9 +5200,9 @@ msgstr "Výběr: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307 msgid "Undock the panel" msgstr "Vytrhnout panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5210,5 +5211,5 @@ "nástrojů." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332 msgid "Click to minimize/maximize the panel content" msgstr "Minimalizovat nebo maximalizovat obsah panelu" @@ -6645,5 +6646,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 #: build/trans_presets.java:67 build/trans_presets.java:103 #: build/trans_presets.java:143 build/trans_presets.java:180 @@ -7021,7 +7022,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -#, fuzzy msgid "Save/Upload and Exit" -msgstr "Uložit a ukončit" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 @@ -7032,7 +7032,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -#, fuzzy msgid "Save/Upload and Delete" -msgstr "Uložit a smazat" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 @@ -7253,5 +7252,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7606,10 +7605,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 -#, fuzzy, java-format +#, java-format msgid "There was {0} conflict detected." msgid_plural "There were {0} conflicts detected." -msgstr[0] "Došlo k {0} konfliktům během importu." -msgstr[1] "Došlo k {0} konfliktům během importu." -msgstr[2] "Došlo k {0} konfliktům během importu." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 @@ -7623,10 +7621,8 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 -#, fuzzy msgid "Conflicts detected" -msgstr "Detekován konflikt" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 @@ -7960,5 +7956,5 @@ msgstr "Kalibrace nahrávání zvuku" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Barva" @@ -8938,5 +8934,5 @@ msgstr "Parsování souboru \"{0}\" selhalo" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313 msgid "Parse error: invalid document structure for GPX document." msgstr "Chyba parsování: Chybná struktura GPX dokumentu" @@ -9121,19 +9117,19 @@ msgstr "OK - další pokus." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 #, java-format msgid "Starting retry {0} of {1}." msgstr "Zahajuji pokus {0} z {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9611,7 +9607,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' must not be null" -msgstr "parametr ''{0}'' nesmí být null" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 @@ -10344,69 +10340,73 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911 +msgid "Starting and ending numbers must be the same for alphabetic addresses" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943 msgid "Starting address number must be less than ending address number" msgstr "" @@ -20060,24 +20060,20 @@ #. item "Man Made/Tower" text "Name" #: build/trans_presets.java:2296 -#, fuzzy msgid "Tower type" -msgstr "Typ trasy" +msgstr "" #. item "Man Made/Tower" combo "Tower type" #: build/trans_presets.java:2296 -#, fuzzy msgid "communication" -msgstr "spojení" +msgstr "" #: build/trans_presets.java:2296 -#, fuzzy msgid "observation" -msgstr "Nadmořská výška" +msgstr "" #. #: build/trans_presets.java:2298 -#, fuzzy msgid "Height (meters)" -msgstr "Max. výška (metrů)" +msgstr "" #. item "Man Made/Tower" text "Operator" @@ -20137,7 +20133,6 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "oil" -msgstr "fosilní paliva" +msgstr "" #: build/trans_presets.java:2330 build/trans_presets.java:2372 @@ -20146,27 +20141,22 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "sewage" -msgstr "použití" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "heat" -msgstr "vřesoviště" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "any substance" -msgstr "A Podle vzdálenosti" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "underwater" -msgstr "voda" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "overground" -msgstr "podzemní" +msgstr "" #: build/trans_presets.java:2333 @@ -20311,17 +20301,14 @@ #. item "Man Made/Power Tower" combo "Type" #: build/trans_presets.java:2398 -#, fuzzy msgid "tower" -msgstr "Věž" +msgstr "" #: build/trans_presets.java:2398 -#, fuzzy msgid "pole" -msgstr "Role" +msgstr "" #: build/trans_presets.java:2399 -#, fuzzy msgid "Tower reference" -msgstr "Číslo vedení" +msgstr "" #. item "Man Made/Power Tower" text "Tower reference" @@ -20339,18 +20326,15 @@ #. item "Man Made/Power Line" label "Edit Power Line" #: build/trans_presets.java:2405 -#, fuzzy msgid "Line type" -msgstr "Typ sjezdovky" +msgstr "" #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2405 -#, fuzzy msgid "line" -msgstr "Stoupání" +msgstr "" #: build/trans_presets.java:2405 -#, fuzzy msgid "minor_line" -msgstr "Dálnice - nájezd" +msgstr "" #. item "Man Made/Power Line" text "Line reference" @@ -20361,7 +20345,6 @@ #. item "Man Made/Power Line" text "Voltage" #: build/trans_presets.java:2409 -#, fuzzy msgid "Amount of Cables" -msgstr "Počet drátů tvořících vodič" +msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" @@ -20372,22 +20355,18 @@ #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" #: build/trans_presets.java:2410 -#, fuzzy msgid "single" -msgstr "Úhel" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "double" -msgstr "Hry s koulemi (např. pétanque)" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "triple" -msgstr "Schůdky přes ohrazení" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "quad" -msgstr "kvakerské" +msgstr "" #: build/trans_presets.java:2413 @@ -26282,9 +26261,84 @@ msgstr "Český UHUL:ORTOFOTO" +#~ msgid "Email" +#~ msgstr "E-mail" + +#~ msgid "No data imported." +#~ msgstr "Nic nebylo importováno" + +#~ msgid "Data Layer" +#~ msgstr "Vrstva dat" + +#~ msgid "unnamed" +#~ msgstr "nepojmenováno" + +#~ msgid "Unknown file extension." +#~ msgstr "Neznámá přípona souboru." + +#~ msgid "Change" +#~ msgstr "Změnit" + +#~ msgid "Delete {1} {0}" +#~ msgstr "Smazat {1} {0}" + +#~ msgid "Rotate" +#~ msgstr "Otočit" + +#~ msgid "Move" +#~ msgstr "Přesunout" + +#~ msgid "false" +#~ msgstr "nepravda" + +#~ msgid "true" +#~ msgstr "pravda" + +#~ msgid "different" +#~ msgstr "různé" + +#~ msgid "position" +#~ msgstr "pozice" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "their version:" +#~ msgstr "verze na serveru:" + +#~ msgid "resolved version:" +#~ msgstr "finální verze:" + +#~ msgid "my version:" +#~ msgstr "moje verze:" + +#~ msgid "Date" +#~ msgstr "Datum" + +#~ msgid "Object" +#~ msgstr "Objekt" + +#~ msgid "Revert" +#~ msgstr "Vrátit zpět" + +#~ msgid "Unsaved Changes" +#~ msgstr "Neuložené změny" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "Můžete použít kolečko myši nebo Ctrl+Šipky ke zvětšení či posunu" + +#~ msgid "Cannot connect to server." +#~ msgstr "Nemohu se připojit na server." + +#~ msgid "There were conflicts during import." +#~ msgstr "Vznikly konflikty během importu" + +#~ msgid "Error parsing server response." +#~ msgstr "Chyba parsování odezvy serveru" + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Kontaktuji OSM server..." + #~ msgid "Combine ways with different memberships?" #~ msgstr "Spojit cesty patřící do jiné relace?" - -#~ msgid "Combine Anyway" -#~ msgstr "Přesto zkombinovat" #~ msgid "" @@ -26292,91 +26346,4 @@ #~ "to combine them?" #~ msgstr "Vybrané cesty patří do jiné relace. Opravdu je chcete spojit?" - -#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -#~ msgstr "Chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\"" - -#~ msgid "Purging 1 primitive" -#~ msgstr "Odstraňuji 1 prvek" - -#~ msgid "Empty member in relation." -#~ msgstr "Prázdný prvek v relaci." - -#~ msgid "Email" -#~ msgstr "E-mail" - -#~ msgid "No data imported." -#~ msgstr "Nic nebylo importováno" - -#~ msgid "Data Layer" -#~ msgstr "Vrstva dat" - -#~ msgid "unnamed" -#~ msgstr "nepojmenováno" - -#~ msgid "Unknown file extension." -#~ msgstr "Neznámá přípona souboru." - -#~ msgid "Change" -#~ msgstr "Změnit" - -#~ msgid "Delete {1} {0}" -#~ msgstr "Smazat {1} {0}" - -#~ msgid "Rotate" -#~ msgstr "Otočit" - -#~ msgid "Move" -#~ msgstr "Přesunout" - -#~ msgid "false" -#~ msgstr "nepravda" - -#~ msgid "true" -#~ msgstr "pravda" - -#~ msgid "different" -#~ msgstr "různé" - -#~ msgid "position" -#~ msgstr "pozice" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "their version:" -#~ msgstr "verze na serveru:" - -#~ msgid "resolved version:" -#~ msgstr "finální verze:" - -#~ msgid "my version:" -#~ msgstr "moje verze:" - -#~ msgid "Date" -#~ msgstr "Datum" - -#~ msgid "Object" -#~ msgstr "Objekt" - -#~ msgid "Revert" -#~ msgstr "Vrátit zpět" - -#~ msgid "Unsaved Changes" -#~ msgstr "Neuložené změny" - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "Můžete použít kolečko myši nebo Ctrl+Šipky ke zvětšení či posunu" - -#~ msgid "Cannot connect to server." -#~ msgstr "Nemohu se připojit na server." - -#~ msgid "There were conflicts during import." -#~ msgstr "Vznikly konflikty během importu" - -#~ msgid "Error parsing server response." -#~ msgstr "Chyba parsování odezvy serveru" - -#~ msgid "Contacting the OSM server..." -#~ msgstr "Kontaktuji OSM server..." #~ msgid "All the ways were empty" @@ -26576,4 +26543,7 @@ #~ msgstr "Základní" +#~ msgid "Empty member in relation." +#~ msgstr "Prázdný prvek v relaci." + #~ msgid "" #~ "The selected nodes have differing relation memberships. Do you still " @@ -26671,4 +26641,7 @@ #~ "URL.
Nepoužívejte stejné heslo, které používáte někde jinde." + +#~ msgid "Combine Anyway" +#~ msgstr "Přesto zkombinovat" #~ msgid "" @@ -26828,4 +26801,7 @@ #~ msgstr "Chybějící prvek" +#~ msgid "Purging 1 primitive" +#~ msgstr "Odstraňuji 1 prvek" + #~ msgid "Remove relation member {0} {1}" #~ msgstr "Odstranit člena relace {0} {1}" @@ -26842,4 +26818,7 @@ #~ msgid "Failed to load history from the server. Details:
{0}" #~ msgstr "Selhalo nahrávání historie ze serveru. Detaily:
{0}" + +#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +#~ msgstr "Chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\"" #~ msgid "Version number missing from OSM data" Index: /applications/editors/josm/i18n/po/da.po =================================================================== --- /applications/editors/josm/i18n/po/da.po (revision 17945) +++ /applications/editors/josm/i18n/po/da.po (revision 17946) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 16:38+0200\n" -"PO-Revision-Date: 2009-09-22 18:31+0000\n" +"POT-Creation-Date: 2009-10-02 22:03+0200\n" +"PO-Revision-Date: 2009-09-28 17:35+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Danish \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-28 14:34+0000\n" +"X-Launchpad-Export-Date: 2009-10-02 19:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -47,5 +47,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -90,9 +90,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -147,5 +147,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 @@ -328,5 +328,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -338,12 +338,12 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -365,5 +365,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 @@ -454,9 +454,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -491,6 +491,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -620,22 +620,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 msgid "Combine Way" msgstr "Sammensæt vej" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine several ways into one." msgstr "Sammensæt adskillige veje til én" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Change directions?" msgstr "Skift retninger?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 msgid "Reverse and Combine" msgstr "Vend om og sammensæt" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -645,5 +645,5 @@ "nogle af dem om?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -653,10 +653,10 @@ "af punkter)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Sammensæt {0} veje" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Vælg mindst to veje at sammensætte." @@ -703,5 +703,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -769,5 +769,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333 msgid "OK" @@ -852,8 +852,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -889,5 +889,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 @@ -959,5 +959,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1047,18 +1047,18 @@ msgstr "Flet det nuværende lag sammen med et andet lag" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 msgid "Merge Nodes" msgstr "Foren punkter" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge nodes into the oldest one." msgstr "Foren punkter til den ældste." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Please select at least two nodes to merge." msgstr "Vælg mindst to punkter, der skal forenes." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -1066,5 +1066,5 @@ "er i brug." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261 #, java-format msgid "Merge {0} nodes" @@ -1241,5 +1241,5 @@ msgstr "Tilføj tags i udklipsholderen til alle valgte elementer." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106 #, java-format msgid "Pasting {0} tag" @@ -1248,5 +1248,5 @@ msgstr[1] "Indsætter {0} tags" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107 #, java-format msgid "to {0} primitive" @@ -1874,7 +1874,6 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 -#, fuzzy msgid "No data found in this area." -msgstr "Intet data fundet på enheden." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2136,53 +2135,53 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a search string." msgstr "Indtast en søgetekst." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 msgid "replace selection" msgstr "erstat valgte" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "add to selection" msgstr "føj til valgte" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75 msgid "remove from selection" msgstr "fjern fra valgte" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 msgid "case sensitive" msgstr "versalfølsom" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "regular expression" msgstr "regulært udtryk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "Baker Street - 'Baker' og 'Street' i enhver nøgle eller navn." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"Baker Street\" - 'Baker Street' i enhver nøgle eller navn." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' hvor som helst i navnet." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "type=route - key 'type' with value exactly 'route'." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2190,73 +2189,73 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - intet 'Bak' i navnet." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "foot: - key=foot set to any value." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "Special targets:" msgstr "Specielle mål:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "" "type: - type of the object (node, way, relation)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "user:... - all objects changed by user" msgstr "user:... - alle objekter rettet af bruger" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "id:... - object with given ID (0 for new objects)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "nodes:... - object with given number of nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "modified - all changed objects" msgstr "modified - alle ændrede objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "selected - all selected objects" msgstr "selected - alle valgte objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "incomplete - all incomplete objects" msgstr "incomplete - alle ufuldstændige objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 msgid "untagged - all untagged objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "Use | or OR to combine with logical or" msgstr "" "Brug | eller OR to for at forbinde med et logisk \"eller\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "Brug \" for at angive operatorer (fx hvis key indeholder : )" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "Use ( and ) to group expressions" msgstr "Brug ( og ) for at gruppere udtryk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2266,51 +2265,51 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Søg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Start Search" msgstr "Start søgning" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 #, java-format msgid "No match found for ''{0}''" msgstr "Intet resultat for \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Intet tilføjet til det valgte ved søgning efter \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Intet fjernet fra det valgte ved søgning efter \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, java-format -msgid "Nothing find in selection by searching for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254 +#, fuzzy, java-format +msgid "Nothing found in selection by searching for ''{0}''" +msgstr "Intet tilføjet til det valgte ved søgning efter \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264 #, java-format msgid "Found {0} matches" msgstr "Fandt {0} resultater" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CS" msgstr "Versalfølsom" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CI" msgstr "Ikke-versalfølsom" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 msgid "RX" msgstr "Regulært udtryk" @@ -2625,5 +2624,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 msgid "Delete from relation" msgstr "Slet fra relation" @@ -2677,12 +2676,12 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 -#, fuzzy, java-format +#, java-format msgid "Purged object ''{0}''" -msgstr "Flyt objekterne {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 -#, fuzzy, java-format +#, java-format msgid "Purged {0} objects" -msgstr "Ret {0} objekt" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 @@ -2694,7 +2693,7 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 -#, fuzzy, java-format +#, java-format msgid "Removing reference from relation {0}" -msgstr "Fjernede element fra relationer" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 @@ -3057,14 +3056,14 @@ msgstr "Advarsel: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3072,5 +3071,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3418,7 +3417,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 #, java-format @@ -3460,7 +3457,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 -#, fuzzy msgid "Not Found" -msgstr "Ikke forbundet" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 @@ -3773,9 +3769,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289 msgid "(no object)" msgstr "(intet objekt)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416 msgid "User:" msgstr "" @@ -4242,5 +4238,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "slettet" @@ -4341,5 +4337,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4386,6 +4382,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 @@ -4399,6 +4395,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4456,34 +4452,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115 msgid "Conflicts when combining primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121 #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257 msgid "No conflicts to resolve" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 @@ -4501,23 +4497,23 @@ msgstr "alle" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66 msgid "Choose a value" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 -msgid "Please decided which values to keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68 +msgid "Please decide which values to keep" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73 #, java-format msgid "Value ''{0}'' is going to be applied for key ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79 #, java-format msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84 #, java-format msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" @@ -4561,7 +4557,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "Paste ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "From ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "To ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:444 +#, java-format +msgid "{0} tag" +msgid_plural "{0} tags" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 #, java-format @@ -4571,7 +4587,5 @@ msgstr[1] "{0} veje" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format @@ -4581,26 +4595,4 @@ msgstr[1] "{0} relationer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "Paste ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "From ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "To ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425 -#, java-format -msgid "{0} tag" -msgid_plural "{0} tags" -msgstr[0] "" -msgstr[1] "" - #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 #, java-format @@ -4667,4 +4659,13 @@ msgid "Decision" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42 +msgid "Please select the values to keep for the following tags." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 +#, fuzzy +msgid "Show tags with conflicts only" +msgstr "Punkter (med konflikter)" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4683,5 +4684,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 @@ -4776,5 +4777,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -4930,6 +4931,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323 #, java-format msgid "This will change up to {0} object." @@ -4938,22 +4939,22 @@ msgstr[1] "Dette vil ændre på op til {0} objekter." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149 msgid "An empty value deletes the key." msgstr "En tom værdi vil slette nøglen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347 msgid "Change values?" msgstr "Ret værdier?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264 #, java-format msgid "Change properties of up to {0} object" @@ -4962,69 +4963,69 @@ msgstr[1] "Ret egenskaber for op til {0} objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 msgid "Please select a key" msgstr "Vælg venligst en nøgle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335 msgid "Please select a value" msgstr "Vælg venligst en værdi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447 msgid "Please select the objects you want to change properties for." msgstr "Vælg de objekter, du vil rette egenskaber for." +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "Egenskaber/medlemsskaber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 msgid "Properties for selected objects." msgstr "Egenskaber for valgte objekter." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 msgid "Member Of" msgstr "Medlem af" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576 msgid "Add Properties" msgstr "Tilføj egenskaber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 msgid "Add a new key/value pair to all objects" msgstr "Tilføj et nyt nøgle/værdi-sæt til alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Edit Properties" msgstr "Rediger egenskaber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 msgid "Edit the value of the selected key for all objects" msgstr "Ret værdien for den valgte nøgle for alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Egenskaber: {0} / Medlemskaber: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799 msgid "Properties / Memberships" msgstr "Egenskaber / Medlemskaber" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Change relation" msgstr "Skift relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Slet virkelig det valgte fra relation {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860 msgid "Delete the selected key in all objects" msgstr "Fjern den valgte nøgle i alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862 msgid "Delete Properties" msgstr "Fjern egenskaber" @@ -5066,7 +5067,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 -#, fuzzy msgid "Set the current selection to the list of selected relations" -msgstr "Det nuværende valgte kan ikke bruges til opdeling" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5107,14 +5107,14 @@ msgstr "Valgt: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307 msgid "Undock the panel" msgstr "Frigør panelet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "Luk panelet. Du kan genåbne det med knapperne i venstre menubar." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332 msgid "Click to minimize/maximize the panel content" msgstr "Klik for at minimere/maksimere panelet" @@ -6536,5 +6536,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 #: build/trans_presets.java:67 build/trans_presets.java:103 #: build/trans_presets.java:143 build/trans_presets.java:180 @@ -6912,7 +6912,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -#, fuzzy msgid "Save/Upload and Exit" -msgstr "Gem og afslut" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 @@ -6921,7 +6920,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -#, fuzzy msgid "Save/Upload and Delete" -msgstr "Opdatering afbrudt" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 @@ -7135,5 +7133,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7484,9 +7482,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 -#, fuzzy, java-format +#, java-format msgid "There was {0} conflict detected." msgid_plural "There were {0} conflicts detected." -msgstr[0] "Der var {0} konflikter under import." -msgstr[1] "Der var {0} konflikter under import." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 @@ -7502,7 +7500,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 -#, fuzzy msgid "Conflicts detected" -msgstr "Der er opdaget en konflikt" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 @@ -7833,5 +7830,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Farve" @@ -8818,5 +8815,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313 msgid "Parse error: invalid document structure for GPX document." msgstr "Fejl ved fortolkning: ulovlig datastruktur for gpx-dokument" @@ -8995,19 +8992,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9472,7 +9469,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' must not be null" -msgstr "parameteren \"{0}\" må ikke være en null-værdi" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 @@ -10194,69 +10191,73 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911 +msgid "Starting and ending numbers must be the same for alphabetic addresses" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943 msgid "Starting address number must be less than ending address number" msgstr "" @@ -19816,24 +19817,20 @@ #. item "Man Made/Tower" text "Name" #: build/trans_presets.java:2296 -#, fuzzy msgid "Tower type" -msgstr "Tårn" +msgstr "" #. item "Man Made/Tower" combo "Tower type" #: build/trans_presets.java:2296 -#, fuzzy msgid "communication" -msgstr "forbindelse" +msgstr "" #: build/trans_presets.java:2296 -#, fuzzy msgid "observation" -msgstr "Højde" +msgstr "" #. #: build/trans_presets.java:2298 -#, fuzzy msgid "Height (meters)" -msgstr "Maks. højde (meter)" +msgstr "" #. item "Man Made/Tower" text "Operator" @@ -19893,7 +19890,6 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "oil" -msgstr "fossil" +msgstr "" #: build/trans_presets.java:2330 build/trans_presets.java:2372 @@ -19902,12 +19898,10 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "sewage" -msgstr "brug" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "heat" -msgstr "hede" +msgstr "" #: build/trans_presets.java:2330 @@ -19916,12 +19910,10 @@ #: build/trans_presets.java:2331 -#, fuzzy msgid "underwater" -msgstr "vand" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "overground" -msgstr "jord" +msgstr "" #: build/trans_presets.java:2333 @@ -20066,17 +20058,14 @@ #. item "Man Made/Power Tower" combo "Type" #: build/trans_presets.java:2398 -#, fuzzy msgid "tower" -msgstr "Tårn" +msgstr "" #: build/trans_presets.java:2398 -#, fuzzy msgid "pole" -msgstr "Rolle" +msgstr "" #: build/trans_presets.java:2399 -#, fuzzy msgid "Tower reference" -msgstr "Indstillinger" +msgstr "" #. item "Man Made/Power Tower" text "Tower reference" @@ -20094,18 +20083,15 @@ #. item "Man Made/Power Line" label "Edit Power Line" #: build/trans_presets.java:2405 -#, fuzzy msgid "Line type" -msgstr "type" +msgstr "" #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2405 -#, fuzzy msgid "line" -msgstr "Rørledning" +msgstr "" #: build/trans_presets.java:2405 -#, fuzzy msgid "minor_line" -msgstr "motorvejsforbindelse" +msgstr "" #. item "Man Made/Power Line" text "Line reference" @@ -20116,7 +20102,6 @@ #. item "Man Made/Power Line" text "Voltage" #: build/trans_presets.java:2409 -#, fuzzy msgid "Amount of Cables" -msgstr "Antal kabler" +msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" @@ -20127,22 +20112,18 @@ #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" #: build/trans_presets.java:2410 -#, fuzzy msgid "single" -msgstr "Vinkel" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "double" -msgstr "Petanque" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "triple" -msgstr "Stente" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "quad" -msgstr "kvæker" +msgstr "" #: build/trans_presets.java:2413 @@ -26037,9 +26018,138 @@ msgstr "" +#~ msgid "Move" +#~ msgstr "Flyt" + +#~ msgid "No data imported." +#~ msgstr "Intet data importeret." + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "" +#~ "Udvidelsen kunne ikke fjernes. Informér venligst folkene, du hentede JOSM " +#~ "fra, om problemet." + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "Serveren returnerede en intern fejl. Prøv med et mindre område eller prøv " +#~ "igen om kort tid." + +#~ msgid "Found element in non-way." +#~ msgstr "Fandt -element i en ikke-vej" + +#~ msgid "Unknown version" +#~ msgstr "Ukendt version" + +#~ msgid " has zero ref" +#~ msgstr " har nul ref" + +#~ msgid "Aborting..." +#~ msgstr "Afbryder..." + +#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" +#~ msgstr "Overførsel er afbrudt grundet en fejl (venter i fem sekunder)" + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "Udvidelse kræver en JOSM-opdatering: {0}." + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "" +#~ "Du kan bruge musen eller Ctrl+piletaster/./ for at zoome og panorere." + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Kontakter OSM-serveren..." + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Tags (tom værdi fjerner tag)" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Tilføj alle valgte objekter som medlemmer" + +#~ msgid "Error parsing server response." +#~ msgstr "Fejl i fortolkning af server-svar." + +#~ msgid "There were conflicts during import." +#~ msgstr "Der var konflikter ved import." + +#~ msgid "Revert" +#~ msgstr "Tilbagefør" + +#~ msgid "Cannot connect to server." +#~ msgstr "Kan ikke forbinde til serveren." + +#~ msgid "Date" +#~ msgstr "Dato" + +#~ msgid "Object" +#~ msgstr "Objekt" + +#~ msgid "Resolve Conflicts" +#~ msgstr "Udred konflikter" + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Login-navn (e-mail) til OSM-kontoen." + +#~ msgid "OSM username (email)" +#~ msgstr "OSM-brugernavn (e-mail)" + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Fejl ved sletning af udvidelsesfil: {0}" + +#~ msgid "Plugin already exists" +#~ msgstr "Udvidelsen findes allerede" + +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "" +#~ "{0} udvidelse blev succesfuldt opdateret. Genstart venligst JOSM." +#~ msgstr[1] "" +#~ "{0} udvidelser blev succesfuldt opdateret. Genstart venligst JOSM." + +#~ msgid "their version:" +#~ msgstr "deres udgave:" + +#~ msgid "resolved version:" +#~ msgstr "udredet udgave:" + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} objekt har konflikter:" +#~ msgstr[1] "{0} objekter har konflikter:" + +#~ msgid "my version:" +#~ msgstr "min udgave:" + +#~ msgid "Change" +#~ msgstr "Skift" + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Kunne ikke hente udvidelsen {0} fra {1}" + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Løs {0} konflikter i {1} objekter" + +#~ msgid "Delete {1} {0}" +#~ msgstr "Slet {1} {0}" + +#~ msgid "position" +#~ msgstr "position" + +#~ msgid "different" +#~ msgstr "anderledes" + +#~ msgid "false" +#~ msgstr "falsk" + +#~ msgid "true" +#~ msgstr "sand" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + #~ msgid "Combine ways with different memberships?" #~ msgstr "Sammensæt veje med forskellige tilhørsforhold?" - -#~ msgid "Combine Anyway" -#~ msgstr "Sammensæt alligevel" #~ msgid "" @@ -26049,142 +26159,4 @@ #~ "De valgte veje hører til forskellige relationer. Vil du stadigvæk " #~ "sammensætte dem?" - -#~ msgid "Purging 1 primitive" -#~ msgstr "Fjerner 1 primitiv" - -#~ msgid "Empty member in relation." -#~ msgstr "Tomt medlem i relation." - -#~ msgid "Move" -#~ msgstr "Flyt" - -#~ msgid "No data imported." -#~ msgstr "Intet data importeret." - -#~ msgid "" -#~ "The plugin could not be removed. Please tell the people you got JOSM from " -#~ "about the problem." -#~ msgstr "" -#~ "Udvidelsen kunne ikke fjernes. Informér venligst folkene, du hentede JOSM " -#~ "fra, om problemet." - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "Serveren returnerede en intern fejl. Prøv med et mindre område eller prøv " -#~ "igen om kort tid." - -#~ msgid "Found element in non-way." -#~ msgstr "Fandt -element i en ikke-vej" - -#~ msgid "Unknown version" -#~ msgstr "Ukendt version" - -#~ msgid " has zero ref" -#~ msgstr " har nul ref" - -#~ msgid "Aborting..." -#~ msgstr "Afbryder..." - -#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" -#~ msgstr "Overførsel er afbrudt grundet en fejl (venter i fem sekunder)" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "Udvidelse kræver en JOSM-opdatering: {0}." - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "" -#~ "Du kan bruge musen eller Ctrl+piletaster/./ for at zoome og panorere." - -#~ msgid "Contacting the OSM server..." -#~ msgstr "Kontakter OSM-serveren..." - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Tags (tom værdi fjerner tag)" - -#~ msgid "Add all currently selected objects as members" -#~ msgstr "Tilføj alle valgte objekter som medlemmer" - -#~ msgid "Error parsing server response." -#~ msgstr "Fejl i fortolkning af server-svar." - -#~ msgid "There were conflicts during import." -#~ msgstr "Der var konflikter ved import." - -#~ msgid "Revert" -#~ msgstr "Tilbagefør" - -#~ msgid "Cannot connect to server." -#~ msgstr "Kan ikke forbinde til serveren." - -#~ msgid "Date" -#~ msgstr "Dato" - -#~ msgid "Object" -#~ msgstr "Objekt" - -#~ msgid "Resolve Conflicts" -#~ msgstr "Udred konflikter" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Login-navn (e-mail) til OSM-kontoen." - -#~ msgid "OSM username (email)" -#~ msgstr "OSM-brugernavn (e-mail)" - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Fejl ved sletning af udvidelsesfil: {0}" - -#~ msgid "Plugin already exists" -#~ msgstr "Udvidelsen findes allerede" - -#~ msgid "{0} Plugin successfully updated. Please restart JOSM." -#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -#~ msgstr[0] "" -#~ "{0} udvidelse blev succesfuldt opdateret. Genstart venligst JOSM." -#~ msgstr[1] "" -#~ "{0} udvidelser blev succesfuldt opdateret. Genstart venligst JOSM." - -#~ msgid "their version:" -#~ msgstr "deres udgave:" - -#~ msgid "resolved version:" -#~ msgstr "udredet udgave:" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} objekt har konflikter:" -#~ msgstr[1] "{0} objekter har konflikter:" - -#~ msgid "my version:" -#~ msgstr "min udgave:" - -#~ msgid "Change" -#~ msgstr "Skift" - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Kunne ikke hente udvidelsen {0} fra {1}" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Løs {0} konflikter i {1} objekter" - -#~ msgid "Delete {1} {0}" -#~ msgstr "Slet {1} {0}" - -#~ msgid "position" -#~ msgstr "position" - -#~ msgid "different" -#~ msgstr "anderledes" - -#~ msgid "false" -#~ msgstr "falsk" - -#~ msgid "true" -#~ msgstr "sand" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" #~ msgid "All the ways were empty" @@ -26291,4 +26263,7 @@ #~ msgid "Sorry, doesn't work with anonymous users" #~ msgstr "Beklager, virker ikke med anonyme brugere" + +#~ msgid "Empty member in relation." +#~ msgstr "Tomt medlem i relation." #~ msgid "User" @@ -26361,4 +26336,7 @@ #~ msgid "Delete and Download" #~ msgstr "Slet og hent" + +#~ msgid "Combine Anyway" +#~ msgstr "Sammensæt alligevel" #~ msgid "Unknown file extension." @@ -26553,4 +26531,7 @@ #~ msgstr "Der er valgt for meget" +#~ msgid "Purging 1 primitive" +#~ msgstr "Fjerner 1 primitiv" + #~ msgid "nodes" #~ msgstr "punkter" Index: /applications/editors/josm/i18n/po/de.po =================================================================== --- /applications/editors/josm/i18n/po/de.po (revision 17945) +++ /applications/editors/josm/i18n/po/de.po (revision 17946) @@ -9,7 +9,7 @@ "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 16:38+0200\n" -"PO-Revision-Date: 2009-09-28 11:23+0000\n" -"Last-Translator: vsandre \n" +"POT-Creation-Date: 2009-10-02 22:03+0200\n" +"PO-Revision-Date: 2009-10-02 22:03+0200\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Deutsch\n" "MIME-Version: 1.0\n" @@ -17,6 +17,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-28 14:33+0000\n" -"X-Generator: Launchpad (build Unknown)\n" +"X-Launchpad-Export-Date: 2009-10-02 19:25+0000\n" +"X-Generator: KBabel 1.11.4\n" #: ../core/src/org/openstreetmap/josm/Main.java:190 @@ -50,5 +50,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -93,9 +93,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -128,6 +128,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -150,5 +150,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 @@ -342,5 +342,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -352,12 +352,12 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -379,5 +379,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 @@ -468,9 +468,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -505,6 +505,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -634,22 +634,22 @@ msgstr "Offene Änderungssätze herunterladen..." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 msgid "Combine Way" msgstr "Weg verbinden" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine several ways into one." msgstr "Mehrere Wege zu einem verbinden." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Change directions?" msgstr "Richtungen ändern?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 msgid "Reverse and Combine" msgstr "Drehen und Verbinden" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -659,5 +659,5 @@ "Möchten Sie, dass einige Richtungen gedreht werden?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -667,10 +667,10 @@ "Reihenfolge gebracht werden)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "{0} Wege verbinden" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Bitte wählen Sie mindestens zwei Wege zum Verbinden." @@ -717,5 +717,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -783,5 +783,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333 msgid "OK" @@ -866,8 +866,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -903,5 +903,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 @@ -974,5 +974,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1062,18 +1062,18 @@ msgstr "Aktuelle Ebene mit einer anderen zusammenführen" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 msgid "Merge Nodes" msgstr "Knotenpunkte vereinigen" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge nodes into the oldest one." msgstr "Mehrere Knotenpunkte zum ältesten vereinigen." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Please select at least two nodes to merge." msgstr "Bitte mindestens zwei Knotenpunkte zum Vereinigen wählen." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -1081,5 +1081,5 @@ "gelöscht werden." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261 #, java-format msgid "Merge {0} nodes" @@ -1260,5 +1260,5 @@ msgstr "Merkmale aus der Zwischenablage allen ausgewählten Elementen zuweisen." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106 #, java-format msgid "Pasting {0} tag" @@ -1267,5 +1267,5 @@ msgstr[1] "{0} Merkmale einfügen" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107 #, java-format msgid "to {0} primitive" @@ -1821,4 +1821,6 @@ "primitive and retrying to upload." msgstr "" +"WARNUNG: das Objekt ''{0}'' ist auf dem Server bereits gelöscht. Überspringe " +"dieses Objekt und fahre mit dem Hochladen fort." #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1931,7 +1933,6 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 -#, fuzzy msgid "No data found in this area." -msgstr "Keine Daten im Gerät gefunden." +msgstr "In diesem Gebiet wurden keine Daten gefunden." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2208,37 +2209,37 @@ msgstr "Es kann nicht gesucht werden, da keine Daten geladen sind." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a filter string." msgstr "Bitte einen Filterbegriff eingeben:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a search string." msgstr "Bitte einen Suchbegriff eingeben." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 msgid "replace selection" msgstr "Auswahl ersetzen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "add to selection" msgstr "zur Auswahl hinzufügen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75 msgid "remove from selection" msgstr "aus der Auswahl entfernen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76 msgid "find in selection" msgstr "in der Auswahl suchen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 msgid "case sensitive" msgstr "Groß-/Kleinschreibung beachten" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "regular expression" msgstr "Regulärer Ausdruck" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "" @@ -2246,18 +2247,18 @@ "Namen." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "" "\"Berliner Straße\" - 'Berliner Straße' in einem Schlüssel oder Namen." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Ber - 'Ber' irgendwo im Namen." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - Schlüssel 'type' mit exakt dem Wert 'route'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2267,17 +2268,17 @@ "type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Ber - kein 'Ber' im Namen." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "foot: - key=foot set to any value." msgstr "foot: - Schlüssel=foot mit beliebigem Wert." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "Special targets:" msgstr "Spezialsuchen:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "" "type: - type of the object (node, way, relation)" @@ -2285,33 +2286,33 @@ "type: - Typ des Objektes (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "user:... - all objects changed by user" msgstr "user:... - Alle von diesem Nutzer geänderten Objekte" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - Objekte mit der angegebenen ID (0 für neue Objekte)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - Objekte mit gegebener Knotenanzahl" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "modified - all changed objects" msgstr "modified - Alle geänderten Objekte" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "selected - all selected objects" msgstr "selected - Alle ausgewählten Objekte" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "incomplete - all incomplete objects" msgstr "incomplete - Alle unvollständigen Objekte" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 msgid "untagged - all untagged objects" msgstr "untagged - Alle Objekte ohne Merkmale" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 msgid "" "child expr - all children of objects matching the expression" @@ -2320,5 +2321,5 @@ "Ausdrucks" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "" "parent expr - all parents of objects matching the expression" @@ -2327,19 +2328,19 @@ "Ausdrucks" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "Use | or OR to combine with logical or" msgstr "" "Nutzung von | oder OR zum Kombinieren mittels logischem Oder." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" "Nutzung von \" zum Zusammenfassen (z.B. falls ein Schlüssel : enthält)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "Use ( and ) to group expressions" msgstr "Nutzung von ( und ) zum Gruppieren von Ausdrücken." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2349,52 +2350,52 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Suche" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Submit filter" msgstr "Filter bestätigen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Start Search" msgstr "Suche starten" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 #, java-format msgid "No match found for ''{0}''" msgstr "Nichts gefunden für Suche ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Nichts zur Auswahl hinzugefügt durch Suche nach ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Nichts aus der Auswahl entfernt durch Suche ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, java-format -msgid "Nothing find in selection by searching for ''{0}''" -msgstr "" -"Bei der Suche nach \"{0}\" konnte nichts in der Auswahl gefunden werden." - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254 +#, java-format +msgid "Nothing found in selection by searching for ''{0}''" +msgstr "" +"Bei der Suche nach \"{0}\" konnte in der Auswahl nichts gefunden werden." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264 #, java-format msgid "Found {0} matches" msgstr "{0} Treffer gefunden" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 msgid "RX" msgstr "RX" @@ -2666,4 +2667,6 @@ "primitive ''{1}''." msgstr "" +"WARNUNG: Ebene ''{0}'' existiert nicht mehr. Der Konflikt für das Objekt " +"''{1}'' kann nicht entfernt werden." #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70 @@ -2674,10 +2677,10 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 -#, fuzzy, java-format +#, java-format msgid "" "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" -"Kommando \"{0}\" kann nicht rückgängig gemacht werden, da die Ebene \"{1}\" " -"nicht mehr existiert." +"Das Kommando ''{0}'' kann nicht rückgängig gemacht werden, weil die Ebene " +"''{1}'' nicht mehr vorhanden ist." #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 @@ -2725,5 +2728,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 msgid "Delete from relation" msgstr "Aus der Relation entfernen" @@ -2781,12 +2784,12 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 -#, fuzzy, java-format +#, java-format msgid "Purged object ''{0}''" -msgstr "Objekte {0} verschieben" +msgstr "Das Objekt ''{0}'' wurde entfernt" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 -#, fuzzy, java-format +#, java-format msgid "Purged {0} objects" -msgstr "Ändere {0} Objekt" +msgstr "{0} Objekte wurden entfernt" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 @@ -2800,7 +2803,7 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 -#, fuzzy, java-format +#, java-format msgid "Removing reference from relation {0}" -msgstr "Entferne Referenz aus Relation {0}" +msgstr "Entferne einen Verweis der Relation {0}" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 @@ -3186,14 +3189,14 @@ msgstr "Warnung: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "ID >= 0 erwartet, jedoch {0} erhalten." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307 msgid "A primitive with ID = 0 can't be invisible." msgstr "Ein Objekt mit ID=0 darf nicht unsichtbar sein" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3201,5 +3204,5 @@ msgstr "ID >= 0 erwartet, jedoch {0} erhalten." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3565,7 +3568,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 #, java-format @@ -3607,7 +3608,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 -#, fuzzy msgid "Not Found" -msgstr "Nicht verbunden" +msgstr "Nicht gefunden" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 @@ -3930,9 +3930,9 @@ "halten, um mit der Maus aus der Liste zu wählen.
" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289 msgid "(no object)" msgstr "(kein Objekt)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416 msgid "User:" msgstr "Nutzer:" @@ -4319,4 +4319,6 @@ "adjustment." msgstr "" +"Anpassbare Komponente {0} ist noch nicht registriert. Sie kann nicht am " +"synchronen Anpassen teilnehmen." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 @@ -4324,5 +4326,5 @@ #, java-format msgid "Adjustable {0} not registered yet." -msgstr "" +msgstr "Anpassbare Komponente {0} ist noch nicht registriert." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27 @@ -4430,5 +4432,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "gelöscht" @@ -4534,5 +4536,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4581,6 +4583,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 @@ -4594,6 +4596,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4651,34 +4653,34 @@ msgstr "Server-Daten beinhalten keine Merkmale mit dem Schlüssel {0}." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115 msgid "Conflicts when combining primitives" msgstr "Konflikte beim Verbinden der Objekte" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121 #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" msgstr "Konflikte beim Verbinden der Wege. Verbundener Weg ist \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" msgstr "Konflikte beim Zusammenführen der Knoten. Neuer Knoten ist \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257 msgid "No conflicts to resolve" msgstr "Es sind keine Konflikte zu lösen." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "Konfliktlösung abbrechen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "Übernehme gelöste Konflikte" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 @@ -4696,23 +4698,23 @@ msgstr "alle" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66 msgid "Choose a value" msgstr "Wert wählen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 -msgid "Please decided which values to keep" -msgstr "Bitte entscheide, welche Werte behalten werden sollen." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68 +msgid "Please decide which values to keep" +msgstr "Bitte entscheiden Sie, welche Werte behalten werden sollen." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73 #, java-format msgid "Value ''{0}'' is going to be applied for key ''{1}''" msgstr "Der Wert \"{0}\" wird auf den Schlüssel \"{1}\" angewandt" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79 #, java-format msgid "The key ''{0}'' and all its values are going to be removed" msgstr "Der Schlüssel \"{0}\" und alle dazugehörigen Werte werden entfernt" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84 #, java-format msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" @@ -4759,7 +4761,27 @@ msgstr "Konflikte in eingefügten Tags" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "Paste ..." +msgstr "Einfügen..." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "From ..." +msgstr "Von..." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "To ..." +msgstr "Nach..." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:444 +#, java-format +msgid "{0} tag" +msgid_plural "{0} tags" +msgstr[0] "{0} Merkmal" +msgstr[1] "{0} Merkmale" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 #, java-format @@ -4769,7 +4791,5 @@ msgstr[1] "{0} Wege" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format @@ -4778,26 +4798,4 @@ msgstr[0] "{0} Relation" msgstr[1] "{0} Relationen" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "Paste ..." -msgstr "Einfügen..." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "From ..." -msgstr "Von..." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "To ..." -msgstr "Nach..." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425 -#, java-format -msgid "{0} tag" -msgid_plural "{0} tags" -msgstr[0] "{0} Merkmal" -msgstr[1] "{0} Merkmale" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 @@ -4868,4 +4866,14 @@ msgstr "Entscheidung" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42 +msgid "Please select the values to keep for the following tags." +msgstr "" +"Bitte wählen Sie die Werte, welche für folgende Merkmale behalten " +"werden sollen." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 +msgid "Show tags with conflicts only" +msgstr "Nur Merkmale mit Konflikten anzeigen" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -4883,5 +4891,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 @@ -4982,5 +4990,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -5138,6 +5146,6 @@ msgstr "Ebeneninformation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323 #, java-format msgid "This will change up to {0} object." @@ -5146,22 +5154,22 @@ msgstr[1] "Damit werden maximal {0} Objekte geändert." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149 msgid "An empty value deletes the key." msgstr "Ein leerer Wert löscht den Schlüssel." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347 msgid "Change values?" msgstr "Werte ändern?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264 #, java-format msgid "Change properties of up to {0} object" @@ -5170,69 +5178,69 @@ msgstr[1] "Ändere Eigenschaften für bis zu {0} Objekte" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 msgid "Please select a key" msgstr "Bitte wählen Sie einen Schlüssel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335 msgid "Please select a value" msgstr "Bitte wählen Sie einen Wert" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447 msgid "Please select the objects you want to change properties for." msgstr "Bitte wählen Sie die Objekte, deren Eigenschaften Sie ändern wollen." +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "Eigenschaften/Mitgliedschaften" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 msgid "Properties for selected objects." msgstr "Eigenschaften der ausgewählten Objekte." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 msgid "Member Of" msgstr "Element von" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576 msgid "Add Properties" msgstr "Eigenschaften hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 msgid "Add a new key/value pair to all objects" msgstr "Neues Paar aus Schlüssel und Wert zu allen Objekten hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Edit Properties" msgstr "Eigenschaften bearbeiten" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 msgid "Edit the value of the selected key for all objects" msgstr "Den Wert des Schlüssels für alle Objekte bearbeiten" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Eigenschaften: {0} / Mitgliedschaften: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799 msgid "Properties / Memberships" msgstr "Eigenschaften / Mitgliedschaften" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Change relation" msgstr "Relation ändern" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Auswahl wirklich aus Relation {0} entfernen?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860 msgid "Delete the selected key in all objects" msgstr "Den gewählten Schlüssel von allen Objekten entfernen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862 msgid "Delete Properties" msgstr "Eigenschaften entfernen" @@ -5276,7 +5284,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 -#, fuzzy msgid "Set the current selection to the list of selected relations" -msgstr "Die ausgewählte Relation bearbeiten" +msgstr "Ersetze die aktuelle Auswahl durch die selektierten Relationen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5317,9 +5324,9 @@ msgstr "Auswahl: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307 msgid "Undock the panel" msgstr "Ansicht separat darstellen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5328,5 +5335,5 @@ "Werkzeugleiste." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332 msgid "Click to minimize/maximize the panel content" msgstr "Klicken Sie zum Minimieren oder Maximieren der Ansicht" @@ -6024,4 +6031,6 @@ "Failed to set reference. Reference ID {0} does not match history ID {1}." msgstr "" +"Setzen eines Referenzobjekts ist fehlgeschlagen. Die ID {0} des " +"Referenzobjekts stimmt nicht mit der ID {1} der Objektgeschichte überein." #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185 @@ -6798,5 +6807,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 #: build/trans_presets.java:67 build/trans_presets.java:103 #: build/trans_presets.java:143 build/trans_presets.java:180 @@ -7202,7 +7211,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -#, fuzzy msgid "Save/Upload and Exit" -msgstr "Speichern und Beenden" +msgstr "Speichern/Hochladen und Beenden" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 @@ -7213,7 +7221,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -#, fuzzy msgid "Save/Upload and Delete" -msgstr "Speichern und Löschen" +msgstr "Speichern/Hochladen und Löschen" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 @@ -7229,11 +7236,10 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481 -#, fuzzy msgid "" "An upload and/or save operation of one layer with modifications
was " "cancelled or has failed." msgstr "" -"Ein Hochlade- und/oder Speichervorgang einer Ebene mit " -"Modifikationen
wurde abgebrochen oder ist fehlgeschlagen." +"Speichern und/oder Hochladen einer Ebene mit veränderten " +"Daten
wurde abgebrochen oder ist fehlgeschlagen." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491 @@ -7435,8 +7441,8 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 #, java-format msgid "Changeset ID > 0 expected. Got {0}." -msgstr "" +msgstr "ID > 0 für den Änderungssatz erwartet. Wert {0} erhalten." #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106 @@ -7790,9 +7796,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 -#, fuzzy, java-format +#, java-format msgid "There was {0} conflict detected." msgid_plural "There were {0} conflicts detected." -msgstr[0] "Es traten {0} Konflikte während des Imports auf." -msgstr[1] "Es traten {0} Konflikte während des Imports auf." +msgstr[0] "{0} Konflikt wurde entdeckt." +msgstr[1] "{0} Konflikte wurden entdeckt." #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 @@ -7805,10 +7811,13 @@ "on the server." msgstr[0] "" +"{0} Objekt wurde aus den lokalen Daten entfernt, weil es auf dem Server " +"bereits gelöscht ist." msgstr[1] "" +"{0} Objekte wurden aus den lokalen Daten entfernt, weil sie auf dem Server " +"bereits gelöscht sind." #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 -#, fuzzy msgid "Conflicts detected" -msgstr "Konflikt festgestellt" +msgstr "Konflikte gefunden" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 @@ -8165,5 +8174,5 @@ msgstr "Kalibrierung der Tonaufzeichnung" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Farbe" @@ -9173,5 +9182,5 @@ msgstr "Fehler beim Einlesen von Datei \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313 msgid "Parse error: invalid document structure for GPX document." msgstr "Fehler: ungültige Dokumentenstruktur in GPX-Dokument" @@ -9356,23 +9365,27 @@ msgstr "OK - erneuter Versuch." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 #, java-format msgid "Starting retry {0} of {1}." msgstr "Starte Wiederholung {0} von {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 msgid "Current changeset is null. Can't upload data." msgstr "" "Aktueller Änderungssatz ist leer. Daten konnten nicht hochgeladen werden." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" - -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 +"ID > 0 für den aktuellen Änderungssatz erwartet. Der aktuelle Wert der ID " +"ist {0}." + +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." msgstr "" +"Offenen Änderungssatz erwartet, aber geschlossenen Änderungssatz mit ID {0} " +"erhalten." #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87 @@ -9416,5 +9429,5 @@ #, java-format msgid "Illegal value for attribute ''{0}''. Got ''{1}''." -msgstr "" +msgstr "Ungültiger Wert ''{1}'' für das Attribut ''{0}''." #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81 @@ -9429,4 +9442,5 @@ msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''." msgstr "" +"Ungültiger Wahrheitswert für das Attribut ''{0}''. Erhielt den Wert ''{1}''." #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 @@ -9435,4 +9449,5 @@ msgid "Missing mandatory attribute ''{0}'' of XML element {1}." msgstr "" +"Notwendiges Attribut ''{0}'' für das XML-Element {1} ist nicht vorhanden." #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 @@ -9622,8 +9637,10 @@ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." msgstr "" +"Notwendiges Attribut des XML-Elements ''bounds'' fehlt. Erhielt " +"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 msgid "Found XML element not as direct child of element ." -msgstr "" +msgstr "Das XML-Element ist kein unmittelbares Kindelement von ." #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 @@ -9732,4 +9749,6 @@ "Way with external ID ''{0}'' includes missing node with external ID ''{1}''." msgstr "" +"Der Weg mit der externen ID ''{0}'' enthält einen nicht vorhandenen Knoten " +"mit externer ID ''{1}''." #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431 @@ -9739,4 +9758,6 @@ "missing in the loaded data and is therefore incomplete too." msgstr "" +"Der Weg mit der ID {0} wird als unvollständig markiert, weil mindestens " +"einer seiner {1} Knoten in den geladenen Daten fehlt." #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479 @@ -9749,11 +9770,11 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490 -#, fuzzy, java-format +#, java-format msgid "" "Relation with external id ''{0}'' refers to a missing primitive with " "external id ''{1}''." msgstr "" -"Unbekannter Typ ''{0}'' für ein Relationselement in der Relation mit " -"externer ID ''{1}''" +"Die Relation mit externer ID ''{0}'' verweist auf ein fehlendes Objekt mit " +"externer ID ''{1}''." #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531 @@ -9832,5 +9853,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48 msgid "XML tag is missing." -msgstr "" +msgstr "Das XML-Element fehlt." #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53 @@ -9840,5 +9861,5 @@ #, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''." -msgstr "" +msgstr "Das Attribut ''{0}'' des XML-Elements ''{1}'' fehlt." #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -9876,7 +9897,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' must not be null" -msgstr "Parameter \"{0}\" darf nicht NULL sein" +msgstr "Parameter ''{0}'' darf nicht null sein" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 @@ -10320,4 +10341,8 @@ "check the servers address ''{1}'' for typos." msgstr "" +"Der OSM-Server ''{0}'' kennt ein Objekt nicht, das Sie lesen, verändern oder " +"löschen wollten.
Es existiert entweder nicht auf dem Server oder Sie " +"benutzen eine ungültige URL,
um auf den Server zuzugreifen.
Bitte " +"überprüfen Sie die Server-Adresse ''{0}'' sorgfältig." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:209 @@ -10667,29 +10692,29 @@ msgstr "{0} zusätzliche Hausnummern-Knoten werden verküpft" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381 msgid "City:" msgstr "Stadt:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382 msgid "State:" msgstr "Bundesland/-staat:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383 msgid "Post Code:" msgstr "Postleitzahl:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384 msgid "Country:" msgstr "Land:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385 msgid "Full Address:" msgstr "Vollständige Adresse:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420 msgid "Optional Information:" msgstr "Optionale Adressinformationen:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600 msgid "Please select a street to associate with address interpolation way" msgstr "" @@ -10697,5 +10722,5 @@ "verknüpft werden soll" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613 msgid "Please select address interpolation way for this street" msgstr "" @@ -10703,37 +10728,41 @@ "verknüpft werden soll" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719 msgid "Expected odd numbers for addresses" msgstr "Ungerade Hausnummern erwartet" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 msgid "Expected even numbers for addresses" msgstr "Gerade Hausnummern erwartet" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 msgid "Country code must be 2 letters" msgstr "Ländercode muss aus 2 Buchstaben bestehen" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878 msgid "Please enter valid number for starting and ending address" msgstr "Bitte eine gültige Nummer für die Start und Ende eingeben" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896 msgid "Alphabetic address must end with a letter" msgstr "Alphabetische Adressen müssen mit einem Buchstaben aufhören" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911 +msgid "Starting and ending numbers must be the same for alphabetic addresses" +msgstr "Start- und Endnummer müssen für alphabetische Adressen identisch sein" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917 msgid "Starting address letter must be less than ending address letter" msgstr "Der Startbuchstabe muss im Alphabet vor dem Endbuchstaben liegen." -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933 msgid "Please enter valid number for starting address" msgstr "Bitte eine gültige Nummer für die Startnummer eingeben" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936 msgid "Please enter valid number for ending address" msgstr "Bitte eine gültige Nummer für die Endnummer eingeben" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943 msgid "Starting address number must be less than ending address number" msgstr "Die Startnummer muss kleiner als die Endnummer sein." @@ -12427,6 +12456,6 @@ msgid "Please select 4 or 5 ways to assign no left turns." msgstr "" -"Bitte wähle 4 oder 5 Wege aus, damit Links-Abbiege-Verbote bestimmt werden " -"können." +"Bitte wählen Sie 4 oder 5 Wege aus, damit Links-Abbiege-Verbote bestimmt " +"werden können." #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61 @@ -16505,5 +16534,5 @@ #: build/trans_presets.java:751 msgid "Motorway Junction" -msgstr "Autobahnkreuz" +msgstr "Anschlussstelle" #. item @@ -16511,5 +16540,5 @@ #: build/trans_presets.java:753 msgid "Edit Motorway Junction" -msgstr "Autobahnkreuz bearbeiten" +msgstr "Anschlussstelle bearbeiten" #. item "Waypoints/Motorway Junction" text "Name" @@ -20495,24 +20524,20 @@ #. item "Man Made/Tower" text "Name" #: build/trans_presets.java:2296 -#, fuzzy msgid "Tower type" -msgstr "Routentyp" +msgstr "Art des Turms" #. item "Man Made/Tower" combo "Tower type" #: build/trans_presets.java:2296 -#, fuzzy msgid "communication" -msgstr "Verbindung" +msgstr "Kommunikation" #: build/trans_presets.java:2296 -#, fuzzy msgid "observation" -msgstr "Höhe" +msgstr "Beobachtung" #. #: build/trans_presets.java:2298 -#, fuzzy msgid "Height (meters)" -msgstr "Max. Höhe (Meter)" +msgstr "Höhe (in Meter)" #. item "Man Made/Tower" text "Operator" @@ -20572,7 +20597,6 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "oil" -msgstr "Fossil" +msgstr "Öl" #: build/trans_presets.java:2330 build/trans_presets.java:2372 @@ -20581,27 +20605,22 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "sewage" -msgstr "Verwendung" +msgstr "Abwasser" #: build/trans_presets.java:2330 -#, fuzzy msgid "heat" -msgstr "Heide" +msgstr "Wärme" #: build/trans_presets.java:2330 -#, fuzzy msgid "any substance" -msgstr "A Nach Entfernung" +msgstr "Beliebige Substanz" #: build/trans_presets.java:2331 -#, fuzzy msgid "underwater" -msgstr "Wasser" +msgstr "Unter Wasser" #: build/trans_presets.java:2331 -#, fuzzy msgid "overground" -msgstr "Tiefgarage" +msgstr "oberirdisch" #: build/trans_presets.java:2333 @@ -20746,17 +20765,14 @@ #. item "Man Made/Power Tower" combo "Type" #: build/trans_presets.java:2398 -#, fuzzy msgid "tower" msgstr "Turm" #: build/trans_presets.java:2398 -#, fuzzy msgid "pole" -msgstr "Rolle" +msgstr "Mast" #: build/trans_presets.java:2399 -#, fuzzy msgid "Tower reference" -msgstr "Liniennummer" +msgstr "Identifikation des Turms" #. item "Man Made/Power Tower" text "Tower reference" @@ -20774,18 +20790,15 @@ #. item "Man Made/Power Line" label "Edit Power Line" #: build/trans_presets.java:2405 -#, fuzzy msgid "Line type" -msgstr "Pistentyp" +msgstr "Art der Stromleitung" #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2405 -#, fuzzy msgid "line" -msgstr "Steigung" +msgstr "Freileitung (Starkstrom)" #: build/trans_presets.java:2405 -#, fuzzy msgid "minor_line" -msgstr "Autobahnanschluß" +msgstr "Freitleitung (Schwachstrom)" #. item "Man Made/Power Line" text "Line reference" @@ -20796,33 +20809,28 @@ #. item "Man Made/Power Line" text "Voltage" #: build/trans_presets.java:2409 -#, fuzzy msgid "Amount of Cables" -msgstr "Leitungsanzahl" +msgstr "Anzahl Leitungen" #. item "Man Made/Power Line" text "Amount of Cables" #: build/trans_presets.java:2410 msgid "Number of wires (better: conductors) per power cable" -msgstr "" +msgstr "Anzahl der Adern (besser: Leiter) je Stromkabel" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" #: build/trans_presets.java:2410 -#, fuzzy msgid "single" -msgstr "Winkel" +msgstr "einzeln" #: build/trans_presets.java:2410 -#, fuzzy msgid "double" -msgstr "Boule" +msgstr "doppelt" #: build/trans_presets.java:2410 -#, fuzzy msgid "triple" -msgstr "Zauntreppe" +msgstr "dreifach" #: build/trans_presets.java:2410 -#, fuzzy msgid "quad" -msgstr "Quäker" +msgstr "vierfach" #: build/trans_presets.java:2413 @@ -26716,376 +26724,2 @@ msgid "Czech UHUL:ORTOFOTO" msgstr "Tschechien UHUL:ORTOFOTO" - -#~ msgid "Combine ways with different memberships?" -#~ msgstr "Wege mit unterschiedlicher Mitgliedschaft verbinden?" - -#~ msgid "Combine Anyway" -#~ msgstr "Trotzdem verbinden" - -#~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want " -#~ "to combine them?" -#~ msgstr "" -#~ "Die ausgewählten Wege sind Elemente unterschiedlicher Relationen. Sollen " -#~ "sie wirklich verbunden werden?" - -#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -#~ msgstr "" -#~ "Fehler-Kopfzeile \"{0}\" entspricht nicht dem erwarteten Muster \"{1}\"" - -#~ msgid "Purging 1 primitive" -#~ msgstr "1 Objekt entfernen" - -#~ msgid "removing reference from way {0}" -#~ msgstr "Entferne Referenz aus Weg {0}" - -#~ msgid "Empty member in relation." -#~ msgstr "Leeres Element in der Relation." - -#~ msgid "No data imported." -#~ msgstr "Keine Daten importiert." - -#~ msgid "Unsaved Changes" -#~ msgstr "Ungespeicherte Änderungen" - -#~ msgid "All the ways were empty" -#~ msgstr "Alle Wege sind leer" - -#~ msgid "Merge nodes with different memberships?" -#~ msgstr "Knotenpunkte mit unterschiedlicher Mitgliedschaft vereinen?" - -#~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this " -#~ "as a bug." -#~ msgstr "" -#~ "Interner Fehler: Bitte melden Sie den Fehler: \"cannot check conditions " -#~ "for no layer.\"" - -#~ msgid "No document open so nothing to save." -#~ msgstr "Kein Dokument geöffnet, deshalb nichts zu speichern." - -#~ msgid "Found element in non-way." -#~ msgstr "Ein Element in einem Nicht-Weg gefunden." - -#~ msgid " has zero ref" -#~ msgstr " hat Null ref" - -#~ msgid "Please select ways with almost right angles to orthogonalize." -#~ msgstr "" -#~ "Bitte Wege mit nahezu rechten Winkeln zum rechtwinklig machen auswählen." - -#~ msgid "Copy Default" -#~ msgstr "Standard kopieren" - -#~ msgid "map" -#~ msgstr "Karte" - -#~ msgid "citymap" -#~ msgstr "Stadtplan" - -#~ msgid "hikingmap" -#~ msgstr "Wanderkarte" - -#~ msgid "bicyclemap" -#~ msgstr "Fahrradkarte" - -#~ msgid "board" -#~ msgstr "Infotafel" - -#~ msgid "Unknown version" -#~ msgstr "Unbekannte Version" - -#~ msgid "Delete {1} {0}" -#~ msgstr "{1} {0} löschen" - -#~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still " -#~ "want to merge them?" -#~ msgstr "" -#~ "Die gewählten Punkte gehören unterschiedlichen Relationen an. Sollen Sie " -#~ "wirklich vereint werden?" - -#~ msgid "Found element in non-relation." -#~ msgstr "-Schlüssel bei einer Nicht-Relation gefunden." - -#~ msgid "Ill-formed node id" -#~ msgstr "Falsch formatierte Knoten-ID" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "Kann Einstellungsverzeichnis nicht laden: {0}" - -#~ msgid "User" -#~ msgstr "Nutzer" - -#~ msgid "Show Author Panel" -#~ msgstr "Autorenpanel anzeigen" - -#~ msgid "Open User Page" -#~ msgstr "Nutzerseite öffnen" - -#~ msgid "Open User Page in browser" -#~ msgstr "Nutzerseite im Browser öffnen" - -#~ msgid "Select User's Data" -#~ msgstr "Nutzerdaten auswählen" - -#~ msgid "Replaces Selection with Users data" -#~ msgstr "Ersetze Auswahl mit Nutzerdaten" - -#~ msgid "Please select some data" -#~ msgstr "Bitte wählen Sie einige Daten" - -#~ msgid "Please choose a user using the author panel" -#~ msgstr "Bitten verwenden Sie das Autorenpanel um einen Nutzer zu wählen" - -#~ msgid "Sorry, doesn't work with anonymous users" -#~ msgstr "Dies funktioniert nicht mit anonymen Nutzern" - -#~ msgid "Authors: {0}" -#~ msgstr "Autoren: {0}" - -#~ msgid "Public" -#~ msgstr "Öffentlich" - -#~ msgid "Selected makes your trace public in openstreetmap.org" -#~ msgstr "" -#~ "Wird dies gewählt, werden Ihre Spuren bei openstreetmap.org öffentlich" - -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Montagetabelle wählen" - -#~ msgid "Hint: Some changes came from uploading new data to the server." -#~ msgstr "" -#~ "Hinweis: Einige Änderungen sind durch das Hochladen der Daten entstanden." - -#~ msgid "Merge Anyway" -#~ msgstr "Trotzdem vereinen" - -#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." -#~ msgstr "" -#~ "EXPERIMENTELLE FUNKTION. Speichern Sie Ihre Arbeit und kontrollieren Sie " -#~ "vorm Hochladen alles." - -#~ msgid "Continue anyway" -#~ msgstr "Trotzdem fortfahren" - -#~ msgid "Edit Information Office" -#~ msgstr "Informationsbüro bearbeiten" - -#~ msgid "Map Type" -#~ msgstr "Kartentyp" - -#~ msgid "Board Type" -#~ msgstr "Tafeltyp" - -#~ msgid "" -#~ "Tools to work with authors/users. Selects map data that belongs to " -#~ "selected user, opens browser showing selected author profile page." -#~ msgstr "" -#~ "Ein Werkzeug, um mit Autoren oder Nutzern zu arbeiten. Auswählen von " -#~ "Kartendaten, welche der Nutzer bearbeitet hat oder Öffnen des Browsers " -#~ "mit Nutzerprofilen." - -#~ msgid "Version number missing from OSM data" -#~ msgstr "Fehlende Versionsnummer in OSM-Daten" - -#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -#~ msgstr "" -#~ "Unerwarteter Wert \"{2}\" des \"type\"-Attributs von Element {0} der " -#~ "Relation {1}" - -#~ msgid "parameter '{0}' must not be null" -#~ msgstr "Parameter \"{0}\" darf nicht NULL sein." - -#~ msgid "Adjust the position of the WMS layer (raster images only)" -#~ msgstr "Position des WMS-Layers justieren (nur Rasterbilder)" - -#~ msgid "nodes" -#~ msgstr "Knotenpunkte" - -#~ msgid "ways" -#~ msgstr "Wege" - -#~ msgid "relations" -#~ msgstr "Relationen" - -#~ msgid "changesets" -#~ msgstr "Änderungsätze" - -#~ msgid "Failed to load history from the server. Details:
{0}" -#~ msgstr "" -#~ "Das Laden der Historie vom Server ist fehlgeschlagen. Details:
" -#~ "{0}" - -#~ msgid "Remove relation member {0} {1}" -#~ msgstr "Relationselement {0} {1} entfernen" - -#~ msgid "" -#~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: " -#~ "{0}" -#~ msgstr "" -#~ "Sicherheitsausnahme für setAlwaysOnTop() abgefangen. Wird ignoriert. Die " -#~ "Ausnahme war: {0}" - -#~ msgid "INFO: entering compatibilty mode for JOSM with Main.ds" -#~ msgstr "INFO: Gehe in den Kompatibilitätsmodus von JOSM mit Main.ds" - -#~ msgid "" -#~ "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()" -#~ msgstr "" -#~ "INFO: Gehe in den Kompatibilitätsmodus von JOSM mit Main.getCurrentDataSet" -#~ "()" - -#~ msgid "" -#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " -#~ "found." -#~ msgstr "" -#~ "Unerwartete Version von JOSM. Weder Main.ds noch Main.getCurrentDataSet() " -#~ "gefunden." - -#~ msgid "Do you really want to delete layer ''{0}''?" -#~ msgstr "Wollen Sie die Ebene ''{0}'' wirklich löschen?" - -#~ msgid "Deleting layer {0} of {1}" -#~ msgstr "Lösche Ebene {0} von {1}" - -#~ msgid "Delete all" -#~ msgstr "Alle löschen" - -#~ msgid "" -#~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?" -#~ msgstr "" -#~ "In Ebene ''{0}'' gibt es ungespeicherte Änderungen. Ebene trotzdem " -#~ "löschen?" - -#~ msgid "" -#~ "Failed to close changeset {0}, will be closed by server after timeout. " -#~ "Exception was: {1}" -#~ msgstr "" -#~ "Das changeset {0} konnte nicht geschlossen werden. Es wird nach dem " -#~ "timeout durch den Server geschlossen. Die Fehlermeldung war: {1}" - -#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}" -#~ msgstr "" -#~ "Warnung: Dialog konnte nicht in den Vordergrund gebracht werden. " -#~ "Fehlermeldung ist: {0}" - -#~ msgid "" -#~ "Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. " -#~ "Exception: {0}" -#~ msgstr "" -#~ "Warnung: Dialog für das Auflösen von Konflikten konnte nicht in den " -#~ "Vordergrund gebracht werden. Fehlermeldung ist: {0}" - -#~ msgid "" -#~ "Warning: failed to bring extended dialog always on top. Exception: {0}" -#~ msgstr "" -#~ "Warnung: Dialog konnte nicht in den Vordergrund gebracht werden. " -#~ "Fehlermeldung ist: {0}" - -#~ msgid "Warning: failed to put dialog always on top. Exception was: {0}" -#~ msgstr "" -#~ "Warnung: Dialog konnte nicht in den Vordergrund gebracht werden. " -#~ "Fehlermeldung ist: {0}" - -#~ msgid "" -#~ "Warning: failed to put properties dialog always on top. Exception was: {0}" -#~ msgstr "" -#~ "Warnung: Dialog für das Editieren von Eigenschaften konnte nicht in den " -#~ "Vordergrund gebracht werden. Fehlermeldung ist: {0}" - -#~ msgid "" -#~ "Warning: failed to put ''please wait dialog'' always on top. Exception " -#~ "was: {0}" -#~ msgstr "" -#~ "Warnung: \"Bitte-Warten\"-Dialog konnte nicht in den Vordergrund gebracht " -#~ "werden. Fehlermeldung ist: {0}" - -#~ msgid "" -#~ "Warning: failed to put toggle dialog always on top. Exception was: {0}" -#~ msgstr "" -#~ "Warnung: Dialog konnte nicht in den Vordergrund gebracht werden. " -#~ "Fehlermeldung ist: {0}" - -#~ msgid "" -#~ "Warning: failed to put history browser always on top. Exception was: {0}" -#~ msgstr "" -#~ "Warnung: Dialog für die Geschichte von Elementen konnte nicht in den " -#~ "Vordergrund gebracht werden. Fehlermeldung ist: {0}" - -#~ msgid "No currently open changeset. Opening a new changeset..." -#~ msgstr "Kein geöffnetes Changeset vorhanden. Öffne neues Changeset..." - -#~ msgid "Reusing existing changeset {0}" -#~ msgstr "Changeset {0} wiederverwenden" - -#~ msgid "Close current changeset" -#~ msgstr "Aktuellen Änderungssatz schließen" - -#~ msgid "Use a new changeset and close it" -#~ msgstr "Neuen Änderungssatz erstellen und danach schließen" - -#~ msgid "" -#~ "There are unsaved changes in {0} layer. Discard the changes and continue?" -#~ msgid_plural "" -#~ "There are unsaved changes in {0} layers. Discard the changes and continue?" -#~ msgstr[0] "" -#~ "{0} Ebene enthält ungespeicherte Änderungen. Diese Änderungen verwerfen " -#~ "und fortfahren?" -#~ msgstr[1] "" -#~ "{0} Ebenen enthalten ungespeicherte Änderungen. Diese Änderungen " -#~ "verwerfen und fortfahren?" - -#~ msgid "There is currently no changeset open." -#~ msgstr "Es gibt momentan keinen offenen Änderungssatz." - -#~ msgid "" -#~ "Select to upload to the existing changeset {0} and to close the changeset " -#~ "after this upload" -#~ msgstr "" -#~ "Auswählen, um in den vorhandenen Änderungssatz {0} hochzuladen und den " -#~ "Änderungssatz dann zu schließen" - -#~ msgid "Use the existing changeset {0} and leave it open" -#~ msgstr "Vorhandenen Änderungssatz {0} verwenden und geöffnet lassen" - -#~ msgid "Changeset {0} is unchanged. Skipping update." -#~ msgstr "Änderungssatz {0} ist unverändert. Aktualisierung überspringen." - -#~ msgid "" -#~ "Failed to update changeset. Either there is no current changeset or the " -#~ "id of the current changeset is 0" -#~ msgstr "" -#~ "Aktualisierung des Änderungssatzes fehlgeschlagen. Entweder es existiert " -#~ "kein vorhandener Änderungssatz oder die ID des aktuellen Änderungssatzes " -#~ "ist 0." - -#~ msgid "" -#~ "Select to upload to the existing changeset {0} and to leave the changeset " -#~ "open for further uploads" -#~ msgstr "" -#~ "Auswählen, um in den vorhandenen Änderungssatz {0} hochzuladen und den " -#~ "Änderungssatz für weiteres Hochladen geöffnet zu lassen" - -#~ msgid "Use the existing changeset {0} and close it after upload" -#~ msgstr "" -#~ "Vorhandenen Änderungssatz {0} verwenden und nach dem Hochladen schließen" - -#~ msgid "" -#~ "Select to upload the data using a new changeset and to leave the " -#~ "changeset open after the upload" -#~ msgstr "" -#~ "Auswählen, um in einen neuen Änderungssatz hochzuladen und den " -#~ "Änderungssatz für weiteres Hochladen geöffnet zu lassen" - -#~ msgid "unsupported value ''{0}'' or parameter ''{1}''" -#~ msgstr "Nicht unterstützter Wert \"{0}\" oder Parameter \"{1}\"." - -#~ msgid "paramete''{0}'' must not be null" -#~ msgstr "Parameter \"{0}\" darf nucht Null sein." - -#~ msgid "not yet decided" -#~ msgstr "Noch ohne Lösung" - -#~ msgid "Missing mandatory attribute ''{0}''" -#~ msgstr "Fehlendes obligatorisches Attribut \"{0}\"" Index: /applications/editors/josm/i18n/po/el.po =================================================================== --- /applications/editors/josm/i18n/po/el.po (revision 17945) +++ /applications/editors/josm/i18n/po/el.po (revision 17946) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 16:38+0200\n" +"POT-Creation-Date: 2009-10-02 22:03+0200\n" "PO-Revision-Date: 2009-09-22 14:35+0000\n" "Last-Translator: logictheo \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-28 14:34+0000\n" +"X-Launchpad-Export-Date: 2009-10-02 19:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -47,5 +47,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -90,9 +90,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -147,5 +147,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 @@ -328,5 +328,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -338,12 +338,12 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -365,5 +365,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 @@ -452,9 +452,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -489,6 +489,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -618,22 +618,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 msgid "Combine Way" msgstr "Σύνδεση Δρόμου" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine several ways into one." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Change directions?" msgstr "Αλλαγή κατευθήνσεων;" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 msgid "Reverse and Combine" msgstr "Αντισροφή και Συνδυασμός" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -641,5 +641,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -647,10 +647,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Ένωσε {0} δρόμους" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "" @@ -695,5 +695,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -762,5 +762,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333 msgid "OK" @@ -845,8 +845,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -882,5 +882,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 @@ -952,5 +952,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1039,22 +1039,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 msgid "Merge Nodes" msgstr "Συγχώνευση Κόμβων" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge nodes into the oldest one." msgstr "Συγχώνευση κόμβων στον παλαιότερο." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Please select at least two nodes to merge." msgstr "Παρακαλώ επιλέξτε τουλάχιστον δύο κόμβους για συγχώνευση." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261 #, java-format msgid "Merge {0} nodes" @@ -1233,5 +1233,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106 #, java-format msgid "Pasting {0} tag" @@ -1240,5 +1240,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107 #, java-format msgid "to {0} primitive" @@ -1866,7 +1866,6 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 -#, fuzzy msgid "No data found in this area." -msgstr "Δεν βρέθηκαν δεδομένα στη συσκευή." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2129,55 +2128,55 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a search string." msgstr "Παρακαλώ εισάγετε κείμενο αναζήτησης." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 msgid "replace selection" msgstr "αντικατάσταση επιλογής" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "add to selection" msgstr "προσθήκη στην επιλογή" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75 msgid "remove from selection" msgstr "αφαίρεση από την επιλογή" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 msgid "case sensitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "regular expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "" "Baker Street - 'Baker' και 'Street' σε οποιοδήποτε κλειδί ή όνομα." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "" "\"Baker Street\" - 'Baker Street' σε οποιοδήποτε κλειδί ή όνομα." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' οπουδήποτε στο όνομα." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "type=route - key 'type' with value exactly 'route'." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2185,72 +2184,72 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - χωρίς 'Bak' στο όνομα." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "foot: - key=foot set to any value." msgstr "foot: - κλειδί=foot ορισμένο με οποιαδήποτε τιμή." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "Special targets:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "" "type: - type of the object (node, way, relation)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "user:... - all objects changed by user" msgstr "user:... - όλα τα αντικείμενα που αλλάχθηκαν από τον χρήστη" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "id:... - object with given ID (0 for new objects)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "nodes:... - object with given number of nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "modified - all changed objects" msgstr "modified - όλα τα αλλαγμένα αντικείμενα" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "selected - all selected objects" msgstr "selected - όλα τα επιλεγμένα αντικείμενα" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "incomplete - all incomplete objects" msgstr "incomplete - όλα τα ημιτελή αντικείμενα" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 msgid "untagged - all untagged objects" msgstr "untagged - όλα τα αντικείμενα χωρίς ετικέτες" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "Use | or OR to combine with logical or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2260,51 +2259,51 @@ msgstr "Φίλτρο" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Αναζήτηση" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Start Search" msgstr "Έναρξη αναζήτησης" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 #, java-format msgid "No match found for ''{0}''" msgstr "Δεν βρέθηκε αποτέλεσμα για ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Τίποτα δεν προστέθηκε στην επιλογή ψάχνοντας για \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Τίποτα δεν αφαιρέθηκε από την επιλογή ψάχνοντας για \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, java-format -msgid "Nothing find in selection by searching for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254 +#, fuzzy, java-format +msgid "Nothing found in selection by searching for ''{0}''" +msgstr "Τίποτα δεν προστέθηκε στην επιλογή ψάχνοντας για \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264 #, java-format msgid "Found {0} matches" msgstr "Βρέθηκαν {0} αποτελέσματα" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 msgid "RX" msgstr "RX" @@ -2614,5 +2613,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 msgid "Delete from relation" msgstr "Διαγραφή από σχέση" @@ -2666,12 +2665,12 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 -#, fuzzy, java-format +#, java-format msgid "Purged object ''{0}''" -msgstr "Μετακίνηση αντικειμένων {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 -#, fuzzy, java-format +#, java-format msgid "Purged {0} objects" -msgstr "Αλλαγή {0} αντικειμένου" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 @@ -2683,7 +2682,7 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 -#, fuzzy, java-format +#, java-format msgid "Removing reference from relation {0}" -msgstr "Αφαίρεση αναφοράς από την σχέση {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 @@ -3044,14 +3043,14 @@ msgstr "Προειδοποίηση: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3059,5 +3058,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3410,7 +3409,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 #, java-format @@ -3452,7 +3449,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 -#, fuzzy msgid "Not Found" -msgstr "Χωρίς σύνδεση" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 @@ -3764,9 +3760,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289 msgid "(no object)" msgstr "(κανένα αντικείμενο)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416 msgid "User:" msgstr "" @@ -4233,5 +4229,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "διαγράφηκε" @@ -4332,5 +4328,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4377,6 +4373,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 @@ -4390,6 +4386,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4447,34 +4443,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115 msgid "Conflicts when combining primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121 #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257 msgid "No conflicts to resolve" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 @@ -4492,23 +4488,23 @@ msgstr "όλα" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66 msgid "Choose a value" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 -msgid "Please decided which values to keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68 +msgid "Please decide which values to keep" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73 #, java-format msgid "Value ''{0}'' is going to be applied for key ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79 #, java-format msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84 #, java-format msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" @@ -4552,7 +4548,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "Paste ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "From ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "To ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:444 +#, java-format +msgid "{0} tag" +msgid_plural "{0} tags" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 #, java-format @@ -4562,7 +4578,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format @@ -4572,26 +4586,4 @@ msgstr[1] "{0} σχέσεις" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "Paste ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "From ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "To ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425 -#, java-format -msgid "{0} tag" -msgid_plural "{0} tags" -msgstr[0] "" -msgstr[1] "" - #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 #, java-format @@ -4658,4 +4650,13 @@ msgid "Decision" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42 +msgid "Please select the values to keep for the following tags." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 +#, fuzzy +msgid "Show tags with conflicts only" +msgstr "Διόρθωση συγκρούσεων ετικετών" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4674,5 +4675,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 @@ -4767,5 +4768,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -4921,6 +4922,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323 #, java-format msgid "This will change up to {0} object." @@ -4929,22 +4930,22 @@ msgstr[1] "Αυτό θα αλλάξει εώς {0} αντικείμενα." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149 msgid "An empty value deletes the key." msgstr "Κενή τιμή διαγράφει το κλειδί." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108 msgid "" msgstr "<διαφορετικά>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347 msgid "Change values?" msgstr "Αλλαγή τιμών;" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264 #, java-format msgid "Change properties of up to {0} object" @@ -4953,70 +4954,70 @@ msgstr[1] "Αλλαγή ιδιοτήτων εώς {0} αντικειμένων" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 msgid "Please select a key" msgstr "Παρακαλώ επιλέξτε κλειδί" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335 msgid "Please select a value" msgstr "Παρακαλώ επιλέξτε μια τιμή" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447 msgid "Please select the objects you want to change properties for." msgstr "" "Παρακαλώ επιλέξτε τα αντικείμενα των οποίων τις ιδιότητες θέλετε να αλλάξετε." +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "Ιδιότητες/Υπαγωγές" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 msgid "Properties for selected objects." msgstr "Ιδιότητες επιλεγμένων αντικειμένων." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 msgid "Member Of" msgstr "Μέλος του" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576 msgid "Add Properties" msgstr "Προσθήκη Ιδιοτήτων" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 msgid "Add a new key/value pair to all objects" msgstr "Προσθήκη νέου ζεύγους κλειδιού/τιμής σε όλα τα αντικείμενα" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Edit Properties" msgstr "Επεξεργασία Ιδιοτήτων" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 msgid "Edit the value of the selected key for all objects" msgstr "Επεξεργασία της τιμής του επιλεγμένου κλειδιού για όλα τα αντικείμενα" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Ιδιότητες: {0} / Υπαγωγές: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799 msgid "Properties / Memberships" msgstr "Ιδιότητες / Υπαγωγές" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Change relation" msgstr "Αλλαγή σχέσης" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Σίγουρα επιθυμήτε την διαγραφή της επιλογής από την σχέση {0};" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860 msgid "Delete the selected key in all objects" msgstr "Διαγραφή του επιλεγμένου κλειδιού από όλα τα αντικείμενα" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862 msgid "Delete Properties" msgstr "Διαγραφή Ιδιοτήτων" @@ -5058,7 +5059,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 -#, fuzzy msgid "Set the current selection to the list of selected relations" -msgstr "Η τρέχουσα επιλογή δεν μπορεί να χρησιμοποιηθεί για διαίρεση." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5099,9 +5099,9 @@ msgstr "Επιλογή: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307 msgid "Undock the panel" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5110,5 +5110,5 @@ "αριστερή εργαλειοθήκη." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332 msgid "Click to minimize/maximize the panel content" msgstr "" @@ -6532,5 +6532,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 #: build/trans_presets.java:67 build/trans_presets.java:103 #: build/trans_presets.java:143 build/trans_presets.java:180 @@ -6908,7 +6908,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -#, fuzzy msgid "Save/Upload and Exit" -msgstr "Αποθήκευση και Έξοδος" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 @@ -6917,7 +6916,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -#, fuzzy msgid "Save/Upload and Delete" -msgstr "Ακυρώθηκε η αποστολή" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 @@ -7131,5 +7129,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7480,9 +7478,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 -#, fuzzy, java-format +#, java-format msgid "There was {0} conflict detected." msgid_plural "There were {0} conflicts detected." -msgstr[0] "Υπήρξαν {0} συγκρούσεις κατά την εισαγωγή." -msgstr[1] "Υπήρξαν {0} συγκρούσεις κατά την εισαγωγή." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 @@ -7498,7 +7496,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 -#, fuzzy msgid "Conflicts detected" -msgstr "Συγκρούσεις" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 @@ -7833,5 +7830,5 @@ msgstr "Βαθμονόμηση καταγραφέα ήχου" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Χρώμα" @@ -8807,5 +8804,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313 msgid "Parse error: invalid document structure for GPX document." msgstr "" @@ -8984,19 +8981,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10190,69 +10187,73 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911 +msgid "Starting and ending numbers must be the same for alphabetic addresses" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943 msgid "Starting address number must be less than ending address number" msgstr "" @@ -19796,24 +19797,20 @@ #. item "Man Made/Tower" text "Name" #: build/trans_presets.java:2296 -#, fuzzy msgid "Tower type" -msgstr "Τύπος Διαδρομής" +msgstr "" #. item "Man Made/Tower" combo "Tower type" #: build/trans_presets.java:2296 -#, fuzzy msgid "communication" -msgstr "σύνδεση" +msgstr "" #: build/trans_presets.java:2296 -#, fuzzy msgid "observation" -msgstr "Υψόμετρο" +msgstr "" #. #: build/trans_presets.java:2298 -#, fuzzy msgid "Height (meters)" -msgstr "Μέγιστο Ύψος (μέτρα)" +msgstr "" #. item "Man Made/Tower" text "Operator" @@ -19873,7 +19870,6 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "oil" -msgstr "Τουαλέτες" +msgstr "" #: build/trans_presets.java:2330 build/trans_presets.java:2372 @@ -19882,27 +19878,22 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "sewage" -msgstr "χρήση" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "heat" -msgstr "υγεία" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "any substance" -msgstr "Α κατά Απόσταση" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "underwater" -msgstr "νερό" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "overground" -msgstr "υπόγειο" +msgstr "" #: build/trans_presets.java:2333 @@ -20047,17 +20038,14 @@ #. item "Man Made/Power Tower" combo "Type" #: build/trans_presets.java:2398 -#, fuzzy msgid "tower" -msgstr "Πύργος" +msgstr "" #: build/trans_presets.java:2398 -#, fuzzy msgid "pole" -msgstr "Ρόλος" +msgstr "" #: build/trans_presets.java:2399 -#, fuzzy msgid "Tower reference" -msgstr "Προτιμήσεις" +msgstr "" #. item "Man Made/Power Tower" text "Tower reference" @@ -20075,13 +20063,11 @@ #. item "Man Made/Power Line" label "Edit Power Line" #: build/trans_presets.java:2405 -#, fuzzy msgid "Line type" -msgstr "Είδος Διάβασης" +msgstr "" #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2405 -#, fuzzy msgid "line" -msgstr "Αγωγός" +msgstr "" #: build/trans_presets.java:2405 @@ -20096,7 +20082,6 @@ #. item "Man Made/Power Line" text "Voltage" #: build/trans_presets.java:2409 -#, fuzzy msgid "Amount of Cables" -msgstr "Ποσότητα Αγωγών" +msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" @@ -20107,22 +20092,18 @@ #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" #: build/trans_presets.java:2410 -#, fuzzy msgid "single" -msgstr "Γωνία" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "double" -msgstr "Ρόλος" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "triple" -msgstr "<πολλαπλές>" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "quad" -msgstr "λατομείο" +msgstr "" #: build/trans_presets.java:2413 @@ -26017,10 +25998,4 @@ msgstr "" -#~ msgid "Combine Anyway" -#~ msgstr "Επιβεβαίωση συνδυασμού" - -#~ msgid "Empty member in relation." -#~ msgstr "Άδειο μέλος στη σχέση." - #~ msgid "" #~ "The plugin could not be removed. Please tell the people you got JOSM from " @@ -26055,4 +26030,7 @@ #~ msgid "Aborting..." #~ msgstr "Διακοπή..." + +#~ msgid "Empty member in relation." +#~ msgstr "Άδειο μέλος στη σχέση." #~ msgid "Rotate" @@ -26293,4 +26271,7 @@ #~ msgstr "Όλοι οι δρόμοι ήταν άδειοι" +#~ msgid "Combine Anyway" +#~ msgstr "Επιβεβαίωση συνδυασμού" + #~ msgid "Merge Anyway" #~ msgstr "Επιβεβαίωση συγχώνευσης" Index: /applications/editors/josm/i18n/po/en_GB.po =================================================================== --- /applications/editors/josm/i18n/po/en_GB.po (revision 17945) +++ /applications/editors/josm/i18n/po/en_GB.po (revision 17946) @@ -10,5 +10,5 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 16:38+0200\n" +"POT-Creation-Date: 2009-10-02 22:03+0200\n" "PO-Revision-Date: 2009-09-22 15:18+0000\n" "Last-Translator: Bruce Cowan \n" @@ -18,5 +18,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-28 14:34+0000\n" +"X-Launchpad-Export-Date: 2009-10-02 19:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -49,5 +49,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -92,9 +92,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -127,6 +127,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -149,5 +149,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 @@ -336,5 +336,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -346,12 +346,12 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -373,5 +373,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 @@ -462,9 +462,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -499,6 +499,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -628,22 +628,22 @@ msgstr "Downloading open changesets ..." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 msgid "Combine Way" msgstr "Combine Way" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine several ways into one." msgstr "Combine several ways into one." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Change directions?" msgstr "Change directions?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 msgid "Reverse and Combine" msgstr "Reverse and Combine" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -653,5 +653,5 @@ "reverse some of them?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -661,10 +661,10 @@ "nodes)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Combine {0} ways" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Please select at least two ways to combine." @@ -711,5 +711,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -777,5 +777,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333 msgid "OK" @@ -860,8 +860,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -897,5 +897,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 @@ -967,5 +967,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1055,22 +1055,22 @@ msgstr "Merge the current layer into another layer" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 msgid "Merge Nodes" msgstr "Merge Nodes" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge nodes into the oldest one." msgstr "Merge nodes into the oldest one." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Please select at least two nodes to merge." msgstr "Please select at least two nodes to merge." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "Cannot merge nodes: Would have to delete a way that is still used." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261 #, java-format msgid "Merge {0} nodes" @@ -1250,5 +1250,5 @@ msgstr "Apply tags of contents of paste buffer to all selected items." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106 #, java-format msgid "Pasting {0} tag" @@ -1257,5 +1257,5 @@ msgstr[1] "Pasting {0} tags" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107 #, java-format msgid "to {0} primitive" @@ -1906,7 +1906,6 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 -#, fuzzy msgid "No data found in this area." -msgstr "No data found on device." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2178,53 +2177,53 @@ msgstr "Can't search because there is no loaded data." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a filter string." msgstr "Please enter a filter string." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a search string." msgstr "Please enter a search string." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 msgid "replace selection" msgstr "replace selection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "add to selection" msgstr "add to selection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75 msgid "remove from selection" msgstr "remove from selection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76 msgid "find in selection" msgstr "find in selection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 msgid "case sensitive" msgstr "case sensitive" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "regular expression" msgstr "regular expression" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "Baker Street - 'Baker' and 'Street' in any key or name." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"Baker Street\" - 'Baker Street' in any key or name." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' anywhere in the name." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - key 'type' with value exactly 'route'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2234,17 +2233,17 @@ "type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - not 'Bak' in the name." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "foot: - key=foot set to any value." msgstr "foot: - key=foot set to any value." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "Special targets:" msgstr "Special targets:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "" "type: - type of the object (node, way, relation)" @@ -2252,33 +2251,33 @@ "type: - type of the object (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "user:... - all objects changed by user" msgstr "user:... - all objects changed by user" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - object with given ID (0 for new objects)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - object with given number of nodes" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "modified - all changed objects" msgstr "modified - all changed objects" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "selected - all selected objects" msgstr "selected - all selected objects" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "incomplete - all incomplete objects" msgstr "incomplete - all incomplete objects" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 msgid "untagged - all untagged objects" msgstr "untagged - all untagged objects" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 msgid "" "child expr - all children of objects matching the expression" @@ -2286,5 +2285,5 @@ "child expr - all children of objects matching the expression" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "" "parent expr - all parents of objects matching the expression" @@ -2292,17 +2291,17 @@ "parent expr - all parents of objects matching the expression" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "Use | or OR to combine with logical or" msgstr "Use | or OR to combine with logical or" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "Use \" to quote operators (e.g. if key contains :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "Use ( and ) to group expressions" msgstr "Use ( and ) to group expressions" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2312,51 +2311,51 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Search" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Submit filter" msgstr "Submit filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Start Search" msgstr "Start Search" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 #, java-format msgid "No match found for ''{0}''" msgstr "No match found for ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Nothing added to selection by searching for ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Nothing removed from selection by searching for ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, java-format -msgid "Nothing find in selection by searching for ''{0}''" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254 +#, fuzzy, java-format +msgid "Nothing found in selection by searching for ''{0}''" msgstr "Nothing find in selection by searching for ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264 #, java-format msgid "Found {0} matches" msgstr "Found {0} matches" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 msgid "RX" msgstr "RX" @@ -2628,9 +2627,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 -#, fuzzy, java-format +#, java-format msgid "" "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" -"Can't undo command ''{0}'' because layer ''{1}'' is not present any more" #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 @@ -2678,5 +2676,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 msgid "Delete from relation" msgstr "Delete from relation" @@ -2734,12 +2732,12 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 -#, fuzzy, java-format +#, java-format msgid "Purged object ''{0}''" -msgstr "Move objects {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 -#, fuzzy, java-format +#, java-format msgid "Purged {0} objects" -msgstr "Change {0} object" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 @@ -2753,7 +2751,7 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 -#, fuzzy, java-format +#, java-format msgid "Removing reference from relation {0}" -msgstr "removing reference from relation {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 @@ -3136,14 +3134,14 @@ msgstr "Warning: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "expected id >= 0. Got {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307 msgid "A primitive with ID = 0 can't be invisible." msgstr "a primitive with id=0 can't be invisible" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3151,5 +3149,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3508,7 +3506,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 #, java-format @@ -3550,7 +3546,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 -#, fuzzy msgid "Not Found" -msgstr "Not connected" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 @@ -3869,9 +3864,9 @@ "this list with the mouse.
" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289 msgid "(no object)" msgstr "(no object)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416 msgid "User:" msgstr "User:" @@ -4362,5 +4357,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "deleted" @@ -4466,5 +4461,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4511,6 +4506,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 @@ -4524,6 +4519,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4581,34 +4576,34 @@ msgstr "Their dataset does not include a tag with key {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115 msgid "Conflicts when combining primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121 #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" msgstr "Conflicts when combining ways - combined way is ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" msgstr "Conflicts when merging nodes - merged node is ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257 msgid "No conflicts to resolve" msgstr "No conflicts to resolve" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "Cancel conflict resolution" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "Apply resolved conflicts" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 @@ -4626,23 +4621,24 @@ msgstr "all" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66 msgid "Choose a value" msgstr "Choose a value" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 -msgid "Please decided which values to keep" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68 +#, fuzzy +msgid "Please decide which values to keep" msgstr "Please decided which values to keep" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73 #, java-format msgid "Value ''{0}'' is going to be applied for key ''{1}''" msgstr "Value ''{0}'' is going to be applied for key ''{1}''" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79 #, java-format msgid "The key ''{0}'' and all its values are going to be removed" msgstr "The key ''{0}'' and all its values are going to be removed" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84 #, java-format msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" @@ -4686,7 +4682,27 @@ msgstr "Conflicts in pasted tags" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "Paste ..." +msgstr "Paste ..." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "From ..." +msgstr "From ..." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "To ..." +msgstr "To ..." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:444 +#, java-format +msgid "{0} tag" +msgid_plural "{0} tags" +msgstr[0] "{0} tag" +msgstr[1] "{0} tags" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 #, java-format @@ -4696,7 +4712,5 @@ msgstr[1] "{0} ways" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format @@ -4705,26 +4719,4 @@ msgstr[0] "{0} relation" msgstr[1] "{0} relations" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "Paste ..." -msgstr "Paste ..." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "From ..." -msgstr "From ..." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "To ..." -msgstr "To ..." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425 -#, java-format -msgid "{0} tag" -msgid_plural "{0} tags" -msgstr[0] "{0} tag" -msgstr[1] "{0} tags" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 @@ -4793,4 +4785,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42 +msgid "Please select the values to keep for the following tags." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 +#, fuzzy +msgid "Show tags with conflicts only" +msgstr "Nodes(with conflicts)" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -4808,5 +4809,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 @@ -4905,5 +4906,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -5059,6 +5060,6 @@ msgstr "Information about layer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323 #, java-format msgid "This will change up to {0} object." @@ -5067,22 +5068,22 @@ msgstr[1] "This will change up to {0} objects." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149 msgid "An empty value deletes the key." msgstr "An empty value deletes the key." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347 msgid "Change values?" msgstr "Change values?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264 #, java-format msgid "Change properties of up to {0} object" @@ -5091,69 +5092,69 @@ msgstr[1] "Change properties of up to {0} objects" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 msgid "Please select a key" msgstr "Please select a key" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335 msgid "Please select a value" msgstr "Please select a value" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447 msgid "Please select the objects you want to change properties for." msgstr "Please select the objects you want to change properties for." +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "Properties/Memberships" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 msgid "Properties for selected objects." msgstr "Properties for selected objects." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 msgid "Member Of" msgstr "Member Of" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576 msgid "Add Properties" msgstr "Add Properties" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 msgid "Add a new key/value pair to all objects" msgstr "Add a new key/value pair to all objects" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Edit Properties" msgstr "Edit Properties" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 msgid "Edit the value of the selected key for all objects" msgstr "Edit the value of the selected key for all objects" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Properties: {0} / Memberships: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799 msgid "Properties / Memberships" msgstr "Properties / Memberships" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Change relation" msgstr "Change relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Really delete selection from relation {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860 msgid "Delete the selected key in all objects" msgstr "Delete the selected key in all objects" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862 msgid "Delete Properties" msgstr "Delete Properties" @@ -5195,7 +5196,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 -#, fuzzy msgid "Set the current selection to the list of selected relations" -msgstr "Edit the currently selected relation" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5236,9 +5236,9 @@ msgstr "Selection: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307 msgid "Undock the panel" msgstr "Undock the panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5246,5 +5246,5 @@ "Close this panel. You can reopen it with the buttons in the left toolbar." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332 msgid "Click to minimize/maximize the panel content" msgstr "Click to minimise/maximise the panel content" @@ -6694,5 +6694,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 #: build/trans_presets.java:67 build/trans_presets.java:103 #: build/trans_presets.java:143 build/trans_presets.java:180 @@ -7070,7 +7070,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -#, fuzzy msgid "Save/Upload and Exit" -msgstr "Save and Exit" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 @@ -7079,7 +7078,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -#, fuzzy msgid "Save/Upload and Delete" -msgstr "Upload cancelled" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 @@ -7295,5 +7293,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7647,9 +7645,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 -#, fuzzy, java-format +#, java-format msgid "There was {0} conflict detected." msgid_plural "There were {0} conflicts detected." -msgstr[0] "There were {0} conflicts during import." -msgstr[1] "There were {0} conflicts during import." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 @@ -7665,7 +7663,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 -#, fuzzy msgid "Conflicts detected" -msgstr "Conflict detected" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 @@ -8013,5 +8010,5 @@ msgstr "Voice recorder calibration" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Colour" @@ -9017,5 +9014,5 @@ msgstr "Parsing file \"{0}\" failed" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313 msgid "Parse error: invalid document structure for GPX document." msgstr "Parse error: invalid document structure for gpx document" @@ -9199,19 +9196,19 @@ msgstr "OK - trying again." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 #, java-format msgid "Starting retry {0} of {1}." msgstr "Starting retry {0} of {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9686,7 +9683,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' must not be null" -msgstr "parameter ''{0}'' must not be null" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 @@ -10429,69 +10426,73 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911 +msgid "Starting and ending numbers must be the same for alphabetic addresses" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943 msgid "Starting address number must be less than ending address number" msgstr "" @@ -20160,24 +20161,20 @@ #. item "Man Made/Tower" text "Name" #: build/trans_presets.java:2296 -#, fuzzy msgid "Tower type" -msgstr "Route type" +msgstr "" #. item "Man Made/Tower" combo "Tower type" #: build/trans_presets.java:2296 -#, fuzzy msgid "communication" -msgstr "connection" +msgstr "" #: build/trans_presets.java:2296 -#, fuzzy msgid "observation" -msgstr "Elevation" +msgstr "" #. #: build/trans_presets.java:2298 -#, fuzzy msgid "Height (meters)" -msgstr "Max. Height (metres)" +msgstr "" #. item "Man Made/Tower" text "Operator" @@ -20237,7 +20234,6 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "oil" -msgstr "fossil" +msgstr "" #: build/trans_presets.java:2330 build/trans_presets.java:2372 @@ -20246,27 +20242,22 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "sewage" -msgstr "usage" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "heat" -msgstr "heath" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "any substance" -msgstr "A By Distance" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "underwater" -msgstr "water" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "overground" -msgstr "underground" +msgstr "" #: build/trans_presets.java:2333 @@ -20411,17 +20402,14 @@ #. item "Man Made/Power Tower" combo "Type" #: build/trans_presets.java:2398 -#, fuzzy msgid "tower" -msgstr "Tower" +msgstr "" #: build/trans_presets.java:2398 -#, fuzzy msgid "pole" -msgstr "Role" +msgstr "" #: build/trans_presets.java:2399 -#, fuzzy msgid "Tower reference" -msgstr "Line reference" +msgstr "" #. item "Man Made/Power Tower" text "Tower reference" @@ -20439,18 +20427,15 @@ #. item "Man Made/Power Line" label "Edit Power Line" #: build/trans_presets.java:2405 -#, fuzzy msgid "Line type" -msgstr "Piste type" +msgstr "" #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2405 -#, fuzzy msgid "line" -msgstr "linked" +msgstr "" #: build/trans_presets.java:2405 -#, fuzzy msgid "minor_line" -msgstr "motorway_link" +msgstr "" #. item "Man Made/Power Line" text "Line reference" @@ -20461,7 +20446,6 @@ #. item "Man Made/Power Line" text "Voltage" #: build/trans_presets.java:2409 -#, fuzzy msgid "Amount of Cables" -msgstr "Amount of Wires" +msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" @@ -20472,22 +20456,18 @@ #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" #: build/trans_presets.java:2410 -#, fuzzy msgid "single" -msgstr "Angle" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "double" -msgstr "Boule" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "triple" -msgstr "Stile" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "quad" -msgstr "quaker" +msgstr "" #: build/trans_presets.java:2413 @@ -26382,9 +26362,190 @@ msgstr "" -#~ msgid "Combine ways with different memberships?" -#~ msgstr "Combine ways with different memberships?" - -#~ msgid "Combine Anyway" -#~ msgstr "Combine Anyway" +#~ msgid "Move" +#~ msgstr "Move" + +#~ msgid "Data Layer" +#~ msgstr "Data Layer" + +#~ msgid "No data imported." +#~ msgstr "No data imported." + +#~ msgid "No document open so nothing to save." +#~ msgstr "No document open so nothing to save." + +#~ msgid "Unknown file extension." +#~ msgstr "Unknown file extension." + +#~ msgid "Resolve Conflicts" +#~ msgstr "Resolve Conflicts" + +#~ msgid "Object" +#~ msgstr "Object" + +#~ msgid "There were conflicts during import." +#~ msgstr "There were conflicts during import." + +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "Hint: Some changes came from uploading new data to the server." + +#~ msgid "Unsaved Changes" +#~ msgstr "Unsaved Changes" + +#~ msgid "my version:" +#~ msgstr "my version:" + +#~ msgid "their version:" +#~ msgstr "their version:" + +#~ msgid "resolved version:" +#~ msgstr "resolved version:" + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Contacting the OSM server..." + +#~ msgid "Unknown version" +#~ msgstr "Unknown version" + +#~ msgid "Aborting..." +#~ msgstr "Aborting..." + +#~ msgid "position" +#~ msgstr "position" + +#~ msgid "different" +#~ msgstr "different" + +#~ msgid "true" +#~ msgstr "true" + +#~ msgid "false" +#~ msgstr "false" + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Resolve {0} conflicts in {1} objects" + +#~ msgid "Change" +#~ msgstr "Change" + +#~ msgid "unnamed" +#~ msgstr "unnamed" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "Cannot open preferences directory: {0}" + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} object has conflicts:" +#~ msgstr[1] "{0} objects have conflicts:" + +#~ msgid "Click Reload to refresh list" +#~ msgstr "Click Reload to refresh list" + +#~ msgid "Date" +#~ msgstr "Date" + +#~ msgid "Revert" +#~ msgstr "Revert" + +#~ msgid "" +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." +#~ msgstr "" +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." + +#~ msgid "Email" +#~ msgstr "E-Mail" + +#~ msgid "Navigation" +#~ msgstr "Navigation" + +#~ msgid "OSM username (email)" +#~ msgstr "OSM username (e-mail)" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." + +#~ msgid "Found element in non-way." +#~ msgstr "Found element in non-way." + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." + +#~ msgid " has zero ref" +#~ msgstr " has zero ref" + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "Plugin requires JOSM update: {0}." + +#~ msgid "Commit comment" +#~ msgstr "Commit comment" + +#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" +#~ msgstr "Transfer aborted due to error (will wait for 5 seconds):" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Tags (empty value deletes tag)" + +#~ msgid "Occupied By" +#~ msgstr "Occupied By" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Add all currently selected objects as members" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "Remove the member in the current table row from this relation" + +#~ msgid "Error parsing server response." +#~ msgstr "Error parsing server response." + +#~ msgid "Cannot connect to server." +#~ msgstr "Cannot connect to server." + +#~ msgid "Tagging preset sources" +#~ msgstr "Tagging preset sources" + +#~ msgid "Tagging preset source" +#~ msgstr "Tagging preset source" + +#~ msgid "Add a new tagging preset source to the list." +#~ msgstr "Add a new tagging preset source to the list." + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Add either site-josm.xml or Wiki Pages." + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Error deleting plugin file: {0}" + +#~ msgid "Plugin already exists" +#~ msgstr "Plugin already exists" + +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "{0} Plugin successfully updated. Please restart JOSM." +#~ msgstr[1] "{0} Plugins successfully updated. Please restart JOSM." + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Could not download plugin: {0} from {1}" + +#~ msgid "Rotate" +#~ msgstr "Rotate" + +#~ msgid "Delete {1} {0}" +#~ msgstr "Delete {1} {0}" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" #~ msgid "" @@ -26395,202 +26556,6 @@ #~ "to combine them?" -#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -#~ msgstr "Error header \"{0}\" does not match expected pattern \"{1}\"" - -#~ msgid "Purging 1 primitive" -#~ msgstr "Purging 1 primitive" - -#~ msgid "removing reference from way {0}" -#~ msgstr "removing reference from way {0}" - -#~ msgid "Empty member in relation." -#~ msgstr "Empty member in relation." - -#~ msgid "Move" -#~ msgstr "Move" - -#~ msgid "Data Layer" -#~ msgstr "Data Layer" - -#~ msgid "No data imported." -#~ msgstr "No data imported." - -#~ msgid "No document open so nothing to save." -#~ msgstr "No document open so nothing to save." - -#~ msgid "Unknown file extension." -#~ msgstr "Unknown file extension." - -#~ msgid "Resolve Conflicts" -#~ msgstr "Resolve Conflicts" - -#~ msgid "Object" -#~ msgstr "Object" - -#~ msgid "There were conflicts during import." -#~ msgstr "There were conflicts during import." - -#~ msgid "Hint: Some changes came from uploading new data to the server." -#~ msgstr "Hint: Some changes came from uploading new data to the server." - -#~ msgid "Unsaved Changes" -#~ msgstr "Unsaved Changes" - -#~ msgid "my version:" -#~ msgstr "my version:" - -#~ msgid "their version:" -#~ msgstr "their version:" - -#~ msgid "resolved version:" -#~ msgstr "resolved version:" - -#~ msgid "Contacting the OSM server..." -#~ msgstr "Contacting the OSM server..." - -#~ msgid "Unknown version" -#~ msgstr "Unknown version" - -#~ msgid "Aborting..." -#~ msgstr "Aborting..." - -#~ msgid "position" -#~ msgstr "position" - -#~ msgid "different" -#~ msgstr "different" - -#~ msgid "true" -#~ msgstr "true" - -#~ msgid "false" -#~ msgstr "false" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Resolve {0} conflicts in {1} objects" - -#~ msgid "Change" -#~ msgstr "Change" - -#~ msgid "unnamed" -#~ msgstr "unnamed" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "Cannot open preferences directory: {0}" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} object has conflicts:" -#~ msgstr[1] "{0} objects have conflicts:" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Click Reload to refresh list" - -#~ msgid "Date" -#~ msgstr "Date" - -#~ msgid "Revert" -#~ msgstr "Revert" - -#~ msgid "" -#~ "Revert the state of all currently selected objects to the version " -#~ "selected in the history list." -#~ msgstr "" -#~ "Revert the state of all currently selected objects to the version " -#~ "selected in the history list." - -#~ msgid "Email" -#~ msgstr "E-Mail" - -#~ msgid "Navigation" -#~ msgstr "Navigation" - -#~ msgid "OSM username (email)" -#~ msgstr "OSM username (e-mail)" - -#~ msgid "" -#~ "The plugin could not be removed. Please tell the people you got JOSM from " -#~ "about the problem." -#~ msgstr "" -#~ "The plugin could not be removed. Please tell the people you got JOSM from " -#~ "about the problem." - -#~ msgid "Found element in non-way." -#~ msgstr "Found element in non-way." - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." - -#~ msgid " has zero ref" -#~ msgstr " has zero ref" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "Plugin requires JOSM update: {0}." - -#~ msgid "Commit comment" -#~ msgstr "Commit comment" - -#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" -#~ msgstr "Transfer aborted due to error (will wait for 5 seconds):" - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Tags (empty value deletes tag)" - -#~ msgid "Occupied By" -#~ msgstr "Occupied By" - -#~ msgid "Add all currently selected objects as members" -#~ msgstr "Add all currently selected objects as members" - -#~ msgid "Remove the member in the current table row from this relation" -#~ msgstr "Remove the member in the current table row from this relation" - -#~ msgid "Error parsing server response." -#~ msgstr "Error parsing server response." - -#~ msgid "Cannot connect to server." -#~ msgstr "Cannot connect to server." - -#~ msgid "Tagging preset sources" -#~ msgstr "Tagging preset sources" - -#~ msgid "Tagging preset source" -#~ msgstr "Tagging preset source" - -#~ msgid "Add a new tagging preset source to the list." -#~ msgstr "Add a new tagging preset source to the list." - -#~ msgid "Add either site-josm.xml or Wiki Pages." -#~ msgstr "Add either site-josm.xml or Wiki Pages." - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Error deleting plugin file: {0}" - -#~ msgid "Plugin already exists" -#~ msgstr "Plugin already exists" - -#~ msgid "{0} Plugin successfully updated. Please restart JOSM." -#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -#~ msgstr[0] "{0} Plugin successfully updated. Please restart JOSM." -#~ msgstr[1] "{0} Plugins successfully updated. Please restart JOSM." - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Could not download plugin: {0} from {1}" - -#~ msgid "Rotate" -#~ msgstr "Rotate" - -#~ msgid "Delete {1} {0}" -#~ msgstr "Delete {1} {0}" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" +#~ msgid "Combine ways with different memberships?" +#~ msgstr "Combine ways with different memberships?" #~ msgid "All the ways were empty" @@ -26756,4 +26721,7 @@ #~ msgstr "Portcullis" +#~ msgid "Empty member in relation." +#~ msgstr "Empty member in relation." + #~ msgid "User" #~ msgstr "User" @@ -26862,4 +26830,7 @@ #~ msgid "Delete and Download" #~ msgstr "Delete and Download" + +#~ msgid "Combine Anyway" +#~ msgstr "Combine Anyway" #~ msgid "Merge Anyway" @@ -27076,4 +27047,7 @@ #~ msgstr "nodes" +#~ msgid "Purging 1 primitive" +#~ msgstr "Purging 1 primitive" + #~ msgid "ways" #~ msgstr "ways" @@ -27091,4 +27065,7 @@ #~ msgstr "Adjust the position of the WMS layer (raster images only)" +#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +#~ msgstr "Error header \"{0}\" does not match expected pattern \"{1}\"" + #~ msgid "Failed to initialize API. Please try again later." #~ msgstr "Failed to initialise API. Please try again later." @@ -27096,4 +27073,7 @@ #~ msgid "API initialization failed" #~ msgstr "API initialisation failed" + +#~ msgid "removing reference from way {0}" +#~ msgstr "removing reference from way {0}" #~ msgid "Failed to load history from the server. Details:
{0}" Index: /applications/editors/josm/i18n/po/es.po =================================================================== --- /applications/editors/josm/i18n/po/es.po (revision 17945) +++ /applications/editors/josm/i18n/po/es.po (revision 17946) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 16:38+0200\n" -"PO-Revision-Date: 2009-09-27 06:43+0000\n" +"POT-Creation-Date: 2009-10-02 22:03+0200\n" +"PO-Revision-Date: 2009-10-02 17:56+0000\n" "Last-Translator: Paco Molinero \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-09-28 14:33+0000\n" +"X-Launchpad-Export-Date: 2009-10-02 19:25+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -47,5 +47,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -90,9 +90,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -147,5 +147,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 @@ -337,5 +337,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -347,12 +347,12 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -374,5 +374,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 @@ -462,9 +462,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -499,6 +499,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -628,22 +628,22 @@ msgstr "Descargando conjunto de cambios abiertos..." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 msgid "Combine Way" msgstr "Combinar vía" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine several ways into one." msgstr "Combinar varias vías en una." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Change directions?" msgstr "¿Cambiar direcciones?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 msgid "Reverse and Combine" msgstr "Invertir y combinar" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -653,5 +653,5 @@ "alguna de ellas?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -661,10 +661,10 @@ "única de nodos)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Combinar {0} vías" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Por favor, selecciona al menos dos vías para combinar." @@ -711,5 +711,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -779,5 +779,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333 msgid "OK" @@ -863,8 +863,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -900,5 +900,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 @@ -970,5 +970,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1060,18 +1060,18 @@ msgstr "Unir la capar actual en otrar capa" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 msgid "Merge Nodes" msgstr "Unir nodos" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge nodes into the oldest one." msgstr "Unir nodos en el más antiguo." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Please select at least two nodes to merge." msgstr "Por favor seleccione por lo menos dos nodos para unir." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -1079,5 +1079,5 @@ "uso." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261 #, java-format msgid "Merge {0} nodes" @@ -1261,5 +1261,5 @@ "elementos seleccionados" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106 #, java-format msgid "Pasting {0} tag" @@ -1268,5 +1268,5 @@ msgstr[1] "Pegando {0} etiquetas" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107 #, java-format msgid "to {0} primitive" @@ -1925,7 +1925,6 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 -#, fuzzy msgid "No data found in this area." -msgstr "No se han encontrado datos en el dispositivo." +msgstr "No se han encontrado datos para este area." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2202,53 +2201,53 @@ msgstr "No se puede buscar porque no hay datos cargados." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a filter string." msgstr "Por favor, introduce una cadena de caracteres como filtro" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a search string." msgstr "Por favor, introduzca una cadena de búsqueda." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 msgid "replace selection" msgstr "reemplazar selección" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "add to selection" msgstr "añadir a la selección" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75 msgid "remove from selection" msgstr "eliminar de la selección" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76 msgid "find in selection" msgstr "encontrar en la selección" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 msgid "case sensitive" msgstr "distinguir mayúsculas" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "regular expression" msgstr "expresión regular" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "Calle Mayor - 'Calle' y 'Mayor' en cualquier clave o valor." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"Calle Mayor\" - 'Calle Mayor' en cualquier clave o nombre." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:May - 'May' en cualquier parte del nombre." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - clave 'type' con el valor exacto 'route'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2258,17 +2257,17 @@ "b>, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:May - sin 'May' en el nombre." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "foot: - key=foot set to any value." msgstr "foot: - cualquier valor presente en clave=foot" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "Special targets:" msgstr "Búsquedas especiales:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "" "type: - type of the object (node, way, relation)" @@ -2277,34 +2276,34 @@ "relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "user:... - all objects changed by user" msgstr "" "user:... - todos los objetos modificados por un determinado usuario" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - objecto con el ID indicado (0 para los objetos nuevos)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - objetos con un determinado número de nodos" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "modified - all changed objects" msgstr "modified - todos los objetos modificados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "selected - all selected objects" msgstr "selected - todos los objetos seleccionados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "incomplete - all incomplete objects" msgstr "incomplete - todos los objetos incompletos" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 msgid "untagged - all untagged objects" msgstr "untagged - todos los objetos sin etiquetar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 msgid "" "child expr - all children of objects matching the expression" @@ -2313,5 +2312,5 @@ "la expresión" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "" "parent expr - all parents of objects matching the expression" @@ -2320,5 +2319,5 @@ "cumplan la expresión" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "Use | or OR to combine with logical or" msgstr "" @@ -2326,14 +2325,14 @@ "lógico O (disyunción)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" "Usar \" para delimitar operadores (por ejemplo si la clave contiene :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "Use ( and ) to group expressions" msgstr "Usar ( y ) para agrupar expresiones" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2343,51 +2342,51 @@ msgstr "Filtrar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Buscar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Submit filter" msgstr "Enviar filtro" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Start Search" msgstr "Iniciar búsqueda" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 #, java-format msgid "No match found for ''{0}''" msgstr "No se encontraron coincidencias para \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "No se ha añadido nada a la selección al buscar \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "No se ha quitado nada de la selección al buscar \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, java-format -msgid "Nothing find in selection by searching for ''{0}''" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254 +#, fuzzy, java-format +msgid "Nothing found in selection by searching for ''{0}''" msgstr "No se ha encontrado nada en la selección búscando por ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264 #, java-format msgid "Found {0} matches" msgstr "Se han encontrado {0} coincidencias" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 msgid "RX" msgstr "RX" @@ -2669,10 +2668,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 -#, fuzzy, java-format +#, java-format msgid "" "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" -"No se puede deshacer la orden ''{0}'' porque la capa \"{1}'' ya no está " -"presente" #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 @@ -2720,5 +2717,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 msgid "Delete from relation" msgstr "Borrar de la relación" @@ -2776,12 +2773,12 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 -#, fuzzy, java-format +#, java-format msgid "Purged object ''{0}''" -msgstr "Mover objetos {0}" +msgstr "Eliminado objeto ''{0}''" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 -#, fuzzy, java-format +#, java-format msgid "Purged {0} objects" -msgstr "Modificar objeto {0}" +msgstr "{0} objetos eliminados" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 @@ -2795,7 +2792,7 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 -#, fuzzy, java-format +#, java-format msgid "Removing reference from relation {0}" -msgstr "eliminando referencia de la relación {0}" +msgstr "Eliminando referencia de la relación {0}" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 @@ -3182,14 +3179,14 @@ msgstr "Advertencia: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "Se esperaba un ID >=0. Obtenido {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307 msgid "A primitive with ID = 0 can't be invisible." msgstr "una proimitiva con id=0 no puede ser invisible" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3197,5 +3194,5 @@ msgstr "Se esperaba un ID >0. Obtenido {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3514,4 +3511,6 @@ msgid "Could not read bookmarks from
''{0}''
Error was: {1}" msgstr "" +"No se pueden leer los marcadores desde
''{0}''
El error fue: {1}" +"" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69 @@ -3555,7 +3554,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 #, java-format @@ -3597,7 +3594,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 -#, fuzzy msgid "Not Found" -msgstr "No conectado" +msgstr "No encontrado" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 @@ -3915,9 +3911,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289 msgid "(no object)" msgstr "(sin objeto)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416 msgid "User:" msgstr "Usuario:" @@ -4427,5 +4423,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "borrado" @@ -4526,5 +4522,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4574,6 +4570,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 @@ -4587,6 +4583,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4647,34 +4643,34 @@ msgstr "Su conjunto de datos no incluye una etiqueta con la clave {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115 msgid "Conflicts when combining primitives" msgstr "Conflictos al combinar primitivas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121 #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" msgstr "Conflictos al fusionar vías - La vía fusionada es ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" msgstr "Conflictos al fusionar nodos - El nodo fusionado es ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257 msgid "No conflicts to resolve" msgstr "Ningún conflicto que resolver" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "Cancelar resolución de conflicto" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "Aplicar la resolución de conflictos" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 @@ -4692,23 +4688,24 @@ msgstr "todos" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66 msgid "Choose a value" msgstr "Elija un valor" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 -msgid "Please decided which values to keep" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68 +#, fuzzy +msgid "Please decide which values to keep" msgstr "Por favor, decida que valor desea mantener" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73 #, java-format msgid "Value ''{0}'' is going to be applied for key ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79 #, java-format msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84 #, java-format msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" @@ -4752,7 +4749,27 @@ msgstr "Conflictos en la etiquetas pegadas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "Paste ..." +msgstr "Pegar ..." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "From ..." +msgstr "Desde ..." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "To ..." +msgstr "A ..." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:444 +#, java-format +msgid "{0} tag" +msgid_plural "{0} tags" +msgstr[0] "{0} etiqueta" +msgstr[1] "{0} etiquetas" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 #, java-format @@ -4762,7 +4779,5 @@ msgstr[1] "{0} vías" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format @@ -4771,26 +4786,4 @@ msgstr[0] "{0} relación" msgstr[1] "{0} relaciones" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "Paste ..." -msgstr "Pegar ..." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "From ..." -msgstr "Desde ..." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "To ..." -msgstr "A ..." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425 -#, java-format -msgid "{0} tag" -msgid_plural "{0} tags" -msgstr[0] "{0} etiqueta" -msgstr[1] "{0} etiquetas" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 @@ -4849,5 +4842,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33 msgid "Pos." -msgstr "" +msgstr "Pos." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51 @@ -4858,4 +4851,13 @@ msgid "Decision" msgstr "Decisión" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42 +msgid "Please select the values to keep for the following tags." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 +#, fuzzy +msgid "Show tags with conflicts only" +msgstr "Nodos (con conflictos)" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4874,5 +4876,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 @@ -4968,5 +4970,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -5123,6 +5125,6 @@ msgstr "Información de capa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323 #, java-format msgid "This will change up to {0} object." @@ -5131,22 +5133,22 @@ msgstr[1] "Esto cambiará {0} objetos." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149 msgid "An empty value deletes the key." msgstr "Un valor vacío elimina la clave." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347 msgid "Change values?" msgstr "¿Modificar valores?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264 #, java-format msgid "Change properties of up to {0} object" @@ -5155,70 +5157,70 @@ msgstr[1] "Cambiar las propiedades de hasta {0} objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 msgid "Please select a key" msgstr "Por favor, selecciona una etiqueta" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335 msgid "Please select a value" msgstr "Por favor, selecciona un valor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447 msgid "Please select the objects you want to change properties for." msgstr "" "Por favor, seleccione los objetos a los que desea cambiar las propiedades." +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "Propiedades/Relaciones" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 msgid "Properties for selected objects." msgstr "Propiedades de los objetos seleccionados." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 msgid "Member Of" msgstr "Miembro de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576 msgid "Add Properties" msgstr "Añadir propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 msgid "Add a new key/value pair to all objects" msgstr "Añadir una nueva pareja clave/valor para todos los objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Edit Properties" msgstr "Editar propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 msgid "Edit the value of the selected key for all objects" msgstr "Editar el valor de la clave seleccionada para todos los objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Propiedades: {0} / Miembros: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799 msgid "Properties / Memberships" msgstr "Propiedades / Miembros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Change relation" msgstr "Cambiar relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 #, java-format msgid "Really delete selection from relation {0}?" msgstr "¿Seguro de eliminar la selección de la relación {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860 msgid "Delete the selected key in all objects" msgstr "Borrar la clave seleccionada en todos los objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862 msgid "Delete Properties" msgstr "Eliminar propiedades" @@ -5260,7 +5262,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 -#, fuzzy msgid "Set the current selection to the list of selected relations" -msgstr "La selección actual no se puede usar para separar." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5301,9 +5302,9 @@ msgstr "Selección: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307 msgid "Undock the panel" msgstr "Desacoplar el panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5312,5 +5313,5 @@ "herramientas de la izquierda." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332 msgid "Click to minimize/maximize the panel content" msgstr "Haga click para minimizar/maximizar el contenido del panel" @@ -5526,10 +5527,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894 msgid "Sort the relation members" -msgstr "" +msgstr "Ordenar los miembros de la relación" #. putValue(NAME, tr("Sort")); #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897 msgid "Relation Editor: Sort" -msgstr "" +msgstr "Editor de relaciones: Ordenar" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909 @@ -5540,5 +5541,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912 msgid "Relation Editor: Move Up" -msgstr "" +msgstr "Editor de relaciones: Mover arriba" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 @@ -5549,5 +5550,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931 msgid "Relation Editor: Move Down" -msgstr "" +msgstr "Editor de relaciones: Mover abajo" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 @@ -5558,5 +5559,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Remove" -msgstr "" +msgstr "Editor de relaciones: Borrar" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 @@ -5581,5 +5582,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058 msgid "Conflict in data" -msgstr "" +msgstr "Conflicto en los datos" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 @@ -5636,9 +5637,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228 msgid "Yes, apply it" -msgstr "" +msgstr "Sí, aplícalo" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229 msgid "No, don't apply" -msgstr "" +msgstr "No, no lo apliques" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235 @@ -5935,15 +5936,15 @@ #, java-format msgid "History for node {0}" -msgstr "" +msgstr "Histórico del nodo {0}" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45 #, java-format msgid "History for way {0}" -msgstr "" +msgstr "Histórico de la vía {0}" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46 #, java-format msgid "History for relation {0}" -msgstr "" +msgstr "Histórico de la relación {0}" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111 @@ -6735,5 +6736,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 #: build/trans_presets.java:67 build/trans_presets.java:103 #: build/trans_presets.java:143 build/trans_presets.java:180 @@ -6896,5 +6897,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 msgid "Changeset info" -msgstr "" +msgstr "Información del conjunto de cambios" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119 @@ -6905,5 +6906,5 @@ #, java-format msgid "Show changeset {0}" -msgstr "" +msgstr "Mostrar conjunto de cambios {0}" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72 @@ -6918,13 +6919,13 @@ #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33 msgid "Changeset id:" -msgstr "" +msgstr "id del conjunto de cambios:" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36 msgid "Created at:" -msgstr "" +msgstr "Creado en:" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39 msgid "Changeset comment:" -msgstr "" +msgstr "Comentario del conjunto de cambios" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67 @@ -6967,5 +6968,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 msgid "Select filename" -msgstr "" +msgstr "Seleccione nombre de fichero" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 @@ -6977,5 +6978,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "No" -msgstr "" +msgstr "No" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47 @@ -7007,5 +7008,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:83 msgid "Please select a file" -msgstr "" +msgstr "Por favor, seleccione un archivo" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:86 @@ -7111,7 +7112,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -#, fuzzy msgid "Save/Upload and Exit" -msgstr "Guardar y salir" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 @@ -7121,7 +7121,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -#, fuzzy msgid "Save/Upload and Delete" -msgstr "Grabar y borrar" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 @@ -7209,10 +7208,10 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 msgid "Filename" -msgstr "" +msgstr "Nombre de archivo" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200 msgid "Upload" -msgstr "" +msgstr "Subir" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153 @@ -7338,5 +7337,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7547,6 +7546,6 @@ msgid "{0} track" msgid_plural "{0} tracks" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{0} traza" +msgstr[1] "{0} trazas" #. item "Relations/Route" text "Symbol description" @@ -7563,5 +7562,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 msgid "Length" -msgstr "" +msgstr "Longitud" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352 @@ -7650,5 +7649,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941 msgid "Download data" -msgstr "" +msgstr "Descargar datos" #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019 @@ -7692,9 +7691,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 -#, fuzzy, java-format +#, java-format msgid "There was {0} conflict detected." msgid_plural "There were {0} conflicts detected." -msgstr[0] "Existió {0} conflictos durante la importación." -msgstr[1] "Existió {0} conflictos durante la importación." +msgstr[0] "Se ha detectado {0} conflicto." +msgstr[1] "Se han detectado {0} conflictos." #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 @@ -7710,7 +7709,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 -#, fuzzy msgid "Conflicts detected" -msgstr "Conflicto detectado" +msgstr "Se han detectado conflictos" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 @@ -7748,6 +7746,6 @@ msgid "track" msgid_plural "tracks" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "traza" +msgstr[1] "trazas" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 @@ -8068,5 +8066,5 @@ msgstr "Calibración del grabador de voz" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Color" @@ -8497,5 +8495,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126 msgid "Enter URL" -msgstr "" +msgstr "Introduzca URL" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139 @@ -8875,5 +8873,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 msgid "Add a new tag" -msgstr "" +msgstr "Añadir una nueva etiqueta" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 @@ -9082,5 +9080,5 @@ msgstr "Análisis sintáctivo fallido del archivo \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313 msgid "Parse error: invalid document structure for GPX document." msgstr "" @@ -9252,5 +9250,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 msgid "Waiting 10 seconds ... " -msgstr "" +msgstr "Esperando 10 segundos... " #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 @@ -9263,19 +9261,19 @@ msgstr "OK - intentando de nuevo." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 #, java-format msgid "Starting retry {0} of {1}." msgstr "Reintentando {0} de {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9344,5 +9342,5 @@ #, java-format msgid "Unsupported version: {0}" -msgstr "" +msgstr "Versión no soportada: {0}" #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176 @@ -9753,7 +9751,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' must not be null" -msgstr "el parámetro ''{0}'' no debe ser nulo" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 @@ -10168,5 +10166,5 @@ #, java-format msgid "
Error message(untranslated): {0}" -msgstr "" +msgstr "
Mensaje de error (sin traducir): {0}" #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:182 @@ -10356,5 +10354,5 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135 msgid "Visibility" -msgstr "" +msgstr "Visibilidad" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136 @@ -10364,9 +10362,9 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140 msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" -msgstr "" +msgstr "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140 msgid "(What does that mean?)" -msgstr "" +msgstr "(¿Qué significa esto?)" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 @@ -10376,5 +10374,5 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:145 msgid "Tags (comma delimited)" -msgstr "" +msgstr "Etiquetas (separadas por comas)" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:146 @@ -10470,10 +10468,10 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91 msgid "Alphabetic" -msgstr "" +msgstr "Alfabético" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161 #, java-format msgid "Relation: {0}" -msgstr "" +msgstr "Relación: {0}" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173 @@ -10483,5 +10481,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184 msgid "Numbering Scheme:" -msgstr "" +msgstr "Esquema de numeración:" #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187 @@ -10498,69 +10496,73 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381 msgid "City:" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 +msgstr "Ciudad:" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382 msgid "State:" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 +msgstr "Estado/Provincia:" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383 msgid "Post Code:" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 +msgstr "Código postal:" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384 msgid "Country:" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 +msgstr "País:" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385 msgid "Full Address:" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 +msgstr "Dirección completa:" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 msgid "Country code must be 2 letters" -msgstr "" - -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 +msgstr "El código de país debe tener 2 letras" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911 +msgid "Starting and ending numbers must be the same for alphabetic addresses" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943 msgid "Starting address number must be less than ending address number" msgstr "" @@ -20289,24 +20291,20 @@ #. item "Man Made/Tower" text "Name" #: build/trans_presets.java:2296 -#, fuzzy msgid "Tower type" -msgstr "Tipo de ruta" +msgstr "" #. item "Man Made/Tower" combo "Tower type" #: build/trans_presets.java:2296 -#, fuzzy msgid "communication" -msgstr "Conexión" +msgstr "" #: build/trans_presets.java:2296 -#, fuzzy msgid "observation" -msgstr "Altitud" +msgstr "" #. #: build/trans_presets.java:2298 -#, fuzzy msgid "Height (meters)" -msgstr "Altura max. (en metros)" +msgstr "" #. item "Man Made/Tower" text "Operator" @@ -20366,7 +20364,6 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "oil" -msgstr "fósil" +msgstr "" #: build/trans_presets.java:2330 build/trans_presets.java:2372 @@ -20375,27 +20372,22 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "sewage" -msgstr "uso" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "heat" -msgstr "monte" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "any substance" -msgstr "A Por distancia" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "underwater" -msgstr "lámina de agua" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "overground" -msgstr "subterráneo" +msgstr "" #: build/trans_presets.java:2333 @@ -20540,17 +20532,14 @@ #. item "Man Made/Power Tower" combo "Type" #: build/trans_presets.java:2398 -#, fuzzy msgid "tower" -msgstr "Torre" +msgstr "" #: build/trans_presets.java:2398 -#, fuzzy msgid "pole" -msgstr "Función" +msgstr "" #: build/trans_presets.java:2399 -#, fuzzy msgid "Tower reference" -msgstr "Línea de referencia" +msgstr "" #. item "Man Made/Power Tower" text "Tower reference" @@ -20568,18 +20557,15 @@ #. item "Man Made/Power Line" label "Edit Power Line" #: build/trans_presets.java:2405 -#, fuzzy msgid "Line type" -msgstr "Tipo de pista de esquí" +msgstr "Tipo de línea" #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2405 -#, fuzzy msgid "line" -msgstr "enlazado" +msgstr "línea" #: build/trans_presets.java:2405 -#, fuzzy msgid "minor_line" -msgstr "Acceso a autopista" +msgstr "" #. item "Man Made/Power Line" text "Line reference" @@ -20590,7 +20576,6 @@ #. item "Man Made/Power Line" text "Voltage" #: build/trans_presets.java:2409 -#, fuzzy msgid "Amount of Cables" -msgstr "Número de cables" +msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" @@ -20601,22 +20586,18 @@ #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" #: build/trans_presets.java:2410 -#, fuzzy msgid "single" -msgstr "Ángulo" +msgstr "sencillo" #: build/trans_presets.java:2410 -#, fuzzy msgid "double" -msgstr "Boule" +msgstr "doble" #: build/trans_presets.java:2410 -#, fuzzy msgid "triple" -msgstr "Escalera de paso" +msgstr "triple" #: build/trans_presets.java:2410 -#, fuzzy msgid "quad" -msgstr "cuáquero" +msgstr "" #: build/trans_presets.java:2413 @@ -26518,30 +26499,4 @@ msgstr "" -#~ msgid "Combine ways with different memberships?" -#~ msgstr "¿Combinar vías con diferentes relaciones?" - -#~ msgid "Combine Anyway" -#~ msgstr "Combinar de todos modos" - -#~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want " -#~ "to combine them?" -#~ msgstr "" -#~ "Las vías seleccionadas tienen diferentes relaciones. ¿Aún quiere " -#~ "combinarlas?" - -#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -#~ msgstr "" -#~ "Error de cabecera \"{0}\" no coincide con el patrón esperado \"{1}\"" - -#~ msgid "Purging 1 primitive" -#~ msgstr "Purgando 1 primitiva" - -#~ msgid "removing reference from way {0}" -#~ msgstr "eliminando referencia de la vía {0}" - -#~ msgid "Empty member in relation." -#~ msgstr "Miembro vacío en la relación." - #~ msgid "Move" #~ msgstr "Mover" @@ -26780,4 +26735,14 @@ #~ msgid "Adjust the position of the WMS layer" #~ msgstr "Ajustar la posición de la capa WMS" + +#~ msgid "Combine ways with different memberships?" +#~ msgstr "¿Combinar vías con diferentes relaciones?" + +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "" +#~ "Las vías seleccionadas tienen diferentes relaciones. ¿Aún quiere " +#~ "combinarlas?" #~ msgid "Copy Default" @@ -26856,4 +26821,7 @@ #~ msgid "Sorry, doesn't work with anonymous users" #~ msgstr "Lo siento, no funciona con usuario anónimos" + +#~ msgid "Empty member in relation." +#~ msgstr "Miembro vacío en la relación." #~ msgid "" @@ -26920,4 +26888,7 @@ #~ msgid "Delete and Download" #~ msgstr "Eliminar y descargar" + +#~ msgid "Combine Anyway" +#~ msgstr "Combinar de todos modos" #~ msgid "Merge Anyway" @@ -27166,4 +27137,8 @@ #~ msgstr "Falta la primitiva" +#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +#~ msgstr "" +#~ "Error de cabecera \"{0}\" no coincide con el patrón esperado \"{1}\"" + #~ msgid "Apply partial resolutions" #~ msgstr "Aplicar resolución parcial" @@ -27202,4 +27177,7 @@ #~ "de {1} primitivos." +#~ msgid "Purging 1 primitive" +#~ msgstr "Purgando 1 primitiva" + #~ msgid "relations" #~ msgstr "relaciones" @@ -27242,4 +27220,7 @@ #~ msgid "Adjust the position of the WMS layer (raster images only)" #~ msgstr "Ajustar la posición de la capa WMS (sólo imágenes raster)" + +#~ msgid "removing reference from way {0}" +#~ msgstr "eliminando referencia de la vía {0}" #~ msgid "No data" Index: /applications/editors/josm/i18n/po/et.po =================================================================== --- /applications/editors/josm/i18n/po/et.po (revision 17945) +++ /applications/editors/josm/i18n/po/et.po (revision 17946) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 16:38+0200\n" -"PO-Revision-Date: 2009-09-22 18:09+0000\n" +"POT-Creation-Date: 2009-10-02 22:03+0200\n" +"PO-Revision-Date: 2009-09-28 17:29+0000\n" "Last-Translator: lyyser \n" "Language-Team: Estonian \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-28 14:33+0000\n" +"X-Launchpad-Export-Date: 2009-10-02 19:25+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -47,5 +47,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -90,9 +90,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -147,5 +147,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 @@ -328,5 +328,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -338,12 +338,12 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -365,5 +365,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 @@ -452,9 +452,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -489,6 +489,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -618,22 +618,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 msgid "Combine Way" msgstr "Sobita tee" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine several ways into one." msgstr "Sobita mitu teed üheks." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Change directions?" msgstr "Muuda suundi?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 msgid "Reverse and Combine" msgstr "Pööra ja sobita." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -643,5 +643,5 @@ "pöörata?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -649,10 +649,10 @@ msgstr "Ei saa teid ühendada. Ei saa liita üheks sõlmejadaks." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Ühenda {0} teed." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Palun vali vähemalt kaks teed, mida sobitada." @@ -697,5 +697,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -763,5 +763,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333 msgid "OK" @@ -846,8 +846,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -883,5 +883,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 @@ -953,5 +953,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1039,22 +1039,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 msgid "Merge Nodes" msgstr "Liida sõlmed." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge nodes into the oldest one." msgstr "Liida sõlmed vanimaks." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Please select at least two nodes to merge." msgstr "Palun vali vähemalt kaks sõlme mida liita." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "Ei saa sõlmi liita: tuleb kustutada tee, mis on endiselt kasutusel." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261 #, java-format msgid "Merge {0} nodes" @@ -1231,5 +1231,5 @@ msgstr "Lisa kõikidele valitud objektidele puhvris olevad sildid." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106 #, java-format msgid "Pasting {0} tag" @@ -1238,5 +1238,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107 #, java-format msgid "to {0} primitive" @@ -2124,53 +2124,53 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a search string." msgstr "Palun sisesta otsingu tekst" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 msgid "replace selection" msgstr "asenda valik" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "add to selection" msgstr "lisa valikusse" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75 msgid "remove from selection" msgstr "eemalda valikust" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 msgid "case sensitive" msgstr "tõstutundlik" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "regular expression" msgstr "regulaaravaldis" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "type=route - key 'type' with value exactly 'route'." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2178,72 +2178,72 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "-name:Bak - not 'Bak' in the name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "foot: - key=foot set to any value." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "Special targets:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "" "type: - type of the object (node, way, relation)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "user:... - all objects changed by user" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "id:... - object with given ID (0 for new objects)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "nodes:... - object with given number of nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "modified - all changed objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "selected - all selected objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "incomplete - all incomplete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 msgid "untagged - all untagged objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "Use | or OR to combine with logical or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2253,51 +2253,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Otsi" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Start Search" msgstr "Alusta otsingut" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 #, java-format msgid "No match found for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, java-format -msgid "Nothing find in selection by searching for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254 +#, java-format +msgid "Nothing found in selection by searching for ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264 #, java-format msgid "Found {0} matches" msgstr "Leitud {0} vastet" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 msgid "RX" msgstr "" @@ -2605,5 +2605,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 msgid "Delete from relation" msgstr "" @@ -2654,12 +2654,12 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 -#, fuzzy, java-format +#, java-format msgid "Purged object ''{0}''" -msgstr "Liiguta objektid {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 -#, fuzzy, java-format +#, java-format msgid "Purged {0} objects" -msgstr "Muuda {0} objekt" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 @@ -2671,7 +2671,7 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 -#, fuzzy, java-format +#, java-format msgid "Removing reference from relation {0}" -msgstr "Tõesti soovid kustutada valikut seosest {0}?" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 @@ -3032,14 +3032,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3047,5 +3047,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3393,7 +3393,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 #, java-format @@ -3746,9 +3744,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289 msgid "(no object)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416 msgid "User:" msgstr "" @@ -4212,5 +4210,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "" @@ -4311,5 +4309,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4356,6 +4354,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 @@ -4369,6 +4367,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4426,34 +4424,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115 msgid "Conflicts when combining primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121 #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257 msgid "No conflicts to resolve" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 @@ -4471,23 +4469,23 @@ msgstr "kõik" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66 msgid "Choose a value" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 -msgid "Please decided which values to keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68 +msgid "Please decide which values to keep" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73 #, java-format msgid "Value ''{0}'' is going to be applied for key ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79 #, java-format msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84 #, java-format msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" @@ -4531,7 +4529,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "Paste ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "From ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "To ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:444 +#, java-format +msgid "{0} tag" +msgid_plural "{0} tags" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 #, java-format @@ -4541,7 +4559,5 @@ msgstr[1] "{0} teed" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format @@ -4551,26 +4567,4 @@ msgstr[1] "{0} seosed" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "Paste ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "From ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "To ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425 -#, java-format -msgid "{0} tag" -msgid_plural "{0} tags" -msgstr[0] "" -msgstr[1] "" - #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 #, java-format @@ -4636,4 +4630,12 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 msgid "Decision" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42 +msgid "Please select the values to keep for the following tags." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 +msgid "Show tags with conflicts only" msgstr "" @@ -4653,5 +4655,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 @@ -4745,5 +4747,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -4899,6 +4901,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323 #, java-format msgid "This will change up to {0} object." @@ -4907,22 +4909,22 @@ msgstr[1] "See muudab kuni {0} objekti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149 msgid "An empty value deletes the key." msgstr "Tühi väärtus kustutab võtme." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347 msgid "Change values?" msgstr "Muuta väärtusi?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264 #, java-format msgid "Change properties of up to {0} object" @@ -4931,69 +4933,69 @@ msgstr[1] "Muuda kuni {0} objekti seadeid" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 msgid "Please select a key" msgstr "Palun vali võti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335 msgid "Please select a value" msgstr "Palun vali väärtus" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447 msgid "Please select the objects you want to change properties for." msgstr "Palun vali objektid mille seadeid soovid muuta." +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "Seaded/Liikmelisus" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 msgid "Properties for selected objects." msgstr "Valitud objektide seaded" #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 msgid "Member Of" msgstr "On liikmeks järgnevas" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576 msgid "Add Properties" msgstr "Lisa seaded" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 msgid "Add a new key/value pair to all objects" msgstr "Lisa uus võtme/väärtuse paar kõikidele objektidele" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Edit Properties" msgstr "Seadete muutmine" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 msgid "Edit the value of the selected key for all objects" msgstr "Muuda kõikide valitud objektide võtme väärtust" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Seaded: {0} / Liikmelisus: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799 msgid "Properties / Memberships" msgstr "Seaded / Liikmelisus" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Change relation" msgstr "Muuda seost" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Tõesti soovid kustutada valikut seosest {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860 msgid "Delete the selected key in all objects" msgstr "Kustuta valitud võti kõkides objektides" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862 msgid "Delete Properties" msgstr "Kustuda seadeid" @@ -5035,7 +5037,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 -#, fuzzy msgid "Set the current selection to the list of selected relations" -msgstr "Valik ei ole lahutamiseks sobiv." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5076,9 +5077,9 @@ msgstr "Valik: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307 msgid "Undock the panel" msgstr "Lase paneel vabaks" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5086,5 +5087,5 @@ "Sulge see paneel. Te saate selle uuesti avada nupust vasakul tööriistaribal." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332 msgid "Click to minimize/maximize the panel content" msgstr "Vajuta et minimeerida/maksimeerida paneeli sisu" @@ -6503,5 +6504,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 #: build/trans_presets.java:67 build/trans_presets.java:103 #: build/trans_presets.java:143 build/trans_presets.java:180 @@ -6879,7 +6880,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -#, fuzzy msgid "Save/Upload and Exit" -msgstr "Salvesta ja välju" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 @@ -7103,5 +7103,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7449,9 +7449,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 -#, fuzzy, java-format +#, java-format msgid "There was {0} conflict detected." msgid_plural "There were {0} conflicts detected." -msgstr[0] "Impordi ajal leidis aset {0} konflikti." -msgstr[1] "Impordi ajal leidis aset {0} konflikti." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 @@ -7467,7 +7467,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 -#, fuzzy msgid "Conflicts detected" -msgstr "Avastatud konflikt" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 @@ -7796,5 +7795,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Värv" @@ -8760,5 +8759,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313 msgid "Parse error: invalid document structure for GPX document." msgstr "Parse error: vigane gpx dokumendi struktuur" @@ -8937,19 +8936,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9411,7 +9410,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' must not be null" -msgstr "parameeter ''{0}'' ei tohi olla null" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 @@ -10121,69 +10120,73 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911 +msgid "Starting and ending numbers must be the same for alphabetic addresses" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943 msgid "Starting address number must be less than ending address number" msgstr "" @@ -19691,18 +19694,15 @@ #. item "Man Made/Tower" text "Name" #: build/trans_presets.java:2296 -#, fuzzy msgid "Tower type" -msgstr "teekonna tüüp" +msgstr "" #. item "Man Made/Tower" combo "Tower type" #: build/trans_presets.java:2296 -#, fuzzy msgid "communication" -msgstr "ühendus" +msgstr "" #: build/trans_presets.java:2296 -#, fuzzy msgid "observation" -msgstr "Elektrijaam" +msgstr "" #. @@ -19767,7 +19767,6 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "oil" -msgstr "fosiil" +msgstr "" #: build/trans_presets.java:2330 build/trans_presets.java:2372 @@ -19780,7 +19779,6 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "heat" -msgstr "nõmm" +msgstr "" #: build/trans_presets.java:2330 @@ -19789,12 +19787,10 @@ #: build/trans_presets.java:2331 -#, fuzzy msgid "underwater" -msgstr "Lasteaed" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "overground" -msgstr "taust" +msgstr "" #: build/trans_presets.java:2333 @@ -19939,17 +19935,14 @@ #. item "Man Made/Power Tower" combo "Type" #: build/trans_presets.java:2398 -#, fuzzy msgid "tower" -msgstr "Torn" +msgstr "" #: build/trans_presets.java:2398 -#, fuzzy msgid "pole" -msgstr "Roll" +msgstr "" #: build/trans_presets.java:2399 -#, fuzzy msgid "Tower reference" -msgstr "Eelistused" +msgstr "" #. item "Man Made/Power Tower" text "Tower reference" @@ -19967,13 +19960,11 @@ #. item "Man Made/Power Line" label "Edit Power Line" #: build/trans_presets.java:2405 -#, fuzzy msgid "Line type" -msgstr "teekonna tüüp" +msgstr "" #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2405 -#, fuzzy msgid "line" -msgstr "Torustik" +msgstr "" #: build/trans_presets.java:2405 @@ -19998,22 +19989,18 @@ #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" #: build/trans_presets.java:2410 -#, fuzzy msgid "single" -msgstr "tekst" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "double" -msgstr "Roll" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "triple" -msgstr "Fail" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "quad" -msgstr "kveeker" +msgstr "" #: build/trans_presets.java:2413 @@ -25908,16 +25895,4 @@ msgstr "" -#~ msgid "Combine ways with different memberships?" -#~ msgstr "Sobita erinevate kuuluvustega teed?" - -#~ msgid "Combine Anyway" -#~ msgstr "Sobita ikkagi." - -#~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want " -#~ "to combine them?" -#~ msgstr "" -#~ "Valitud teedel on erinevad kuuluvusseosed. Kas Sa oled sobitamises kindel?" - #~ msgid "Move" #~ msgstr "Liiguta" @@ -26035,4 +26010,16 @@ #~ msgstr "Mõned sõlmed on enam-vähem ühel joonel." +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "" +#~ "Valitud teedel on erinevad kuuluvusseosed. Kas Sa oled sobitamises kindel?" + +#~ msgid "Combine ways with different memberships?" +#~ msgstr "Sobita erinevate kuuluvustega teed?" + +#~ msgid "Combine Anyway" +#~ msgstr "Sobita ikkagi." + #~ msgid "All the ways were empty" #~ msgstr "Kõik teed olid tühjad." Index: /applications/editors/josm/i18n/po/fi.po =================================================================== --- /applications/editors/josm/i18n/po/fi.po (revision 17945) +++ /applications/editors/josm/i18n/po/fi.po (revision 17946) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 16:38+0200\n" -"PO-Revision-Date: 2009-09-26 04:55+0000\n" +"POT-Creation-Date: 2009-10-02 22:03+0200\n" +"PO-Revision-Date: 2009-09-28 22:57+0000\n" "Last-Translator: Teemu Koskinen \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-09-28 14:33+0000\n" +"X-Launchpad-Export-Date: 2009-10-02 19:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -47,5 +47,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -90,9 +90,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -147,5 +147,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 @@ -328,5 +328,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -338,12 +338,12 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -365,5 +365,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 @@ -452,9 +452,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -489,6 +489,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -618,22 +618,22 @@ msgstr "Ladataan avonaiset muutoskokoelmat..." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 msgid "Combine Way" msgstr "Yhdistä polkuja" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine several ways into one." msgstr "Yhdistää monta polkua yhdeksi." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Change directions?" msgstr "Vaihdetaanko suuntia?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 msgid "Reverse and Combine" msgstr "Käännä ja yhdistä" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -642,5 +642,5 @@ "Polkuja ei voi yhdistää nykyisessä suunnassa. Haluatko kääntää osan niistä?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -649,10 +649,10 @@ "Polkuja ei voitu yhdistää. (Niitä ei voitu yhdistää yhdeksi pistejonoksi)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Yhdistä {0} polkua" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Valitse ainakin kaksi yhdistettävää polkua." @@ -698,5 +698,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -764,5 +764,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333 msgid "OK" @@ -847,8 +847,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -884,5 +884,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 @@ -954,5 +954,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1040,22 +1040,22 @@ msgstr "Liitä nykyinen taso toiseen tasoon" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 msgid "Merge Nodes" msgstr "Yhdistä pisteet" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge nodes into the oldest one." msgstr "Yhdistää pisteet vanhimpaan." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Please select at least two nodes to merge." msgstr "Valitse vähintään kaksi yhdistettävää pistettä." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "Pisteitä ei voitu yhdistää. Käytössä oleva polku tulisi poistaa ensin." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261 #, java-format msgid "Merge {0} nodes" @@ -1233,5 +1233,5 @@ msgstr "Liitä valituille kohteille avain/arvo-parit leikepöydältä." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106 #, java-format msgid "Pasting {0} tag" @@ -1240,5 +1240,5 @@ msgstr[1] "Liitetään {0} tagia" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107 #, java-format msgid "to {0} primitive" @@ -2134,53 +2134,53 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a search string." msgstr "Anna hakusana." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 msgid "replace selection" msgstr "korvaa valinta" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "add to selection" msgstr "lisää valintaan" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75 msgid "remove from selection" msgstr "poista valinnasta" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 msgid "case sensitive" msgstr "kirjainkoko merkitsee" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "regular expression" msgstr "säännöllinen lauseke" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "type=route - key 'type' with value exactly 'route'." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2188,72 +2188,72 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "-name:Bak - not 'Bak' in the name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "foot: - key=foot set to any value." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "Special targets:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "" "type: - type of the object (node, way, relation)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "user:... - all objects changed by user" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "id:... - object with given ID (0 for new objects)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "nodes:... - object with given number of nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "modified - all changed objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "selected - all selected objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "incomplete - all incomplete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 msgid "untagged - all untagged objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "Use | or OR to combine with logical or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2263,51 +2263,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Etsi" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Start Search" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 #, java-format msgid "No match found for ''{0}''" msgstr "Hakusanalla \"{0}\" ei löytynyt mitään" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Valintaan ei lisätty mitään haulla \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Valinnasta ei poistettu mitään haulla \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, java-format -msgid "Nothing find in selection by searching for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254 +#, fuzzy, java-format +msgid "Nothing found in selection by searching for ''{0}''" +msgstr "Valintaan ei lisätty mitään haulla \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264 #, java-format msgid "Found {0} matches" msgstr "Löytyi {0} osumaa" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 msgid "RX" msgstr "" @@ -2620,5 +2620,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 msgid "Delete from relation" msgstr "Poista relaatiosta" @@ -2672,12 +2672,12 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 -#, fuzzy, java-format +#, java-format msgid "Purged object ''{0}''" -msgstr "Siirrä objektit {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 -#, fuzzy, java-format +#, java-format msgid "Purged {0} objects" -msgstr "Muuta {0} objekti" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 @@ -2689,7 +2689,7 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 -#, fuzzy, java-format +#, java-format msgid "Removing reference from relation {0}" -msgstr "Poistetaanko valinta relaatiosta {0}?" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 @@ -3052,14 +3052,14 @@ msgstr "Varoitus: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3067,5 +3067,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3414,7 +3414,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 #, java-format @@ -3456,7 +3454,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 -#, fuzzy msgid "Not Found" -msgstr "Tiedostoa ei löytynyt" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 @@ -3762,9 +3759,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289 msgid "(no object)" msgstr "(ei objektia)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416 msgid "User:" msgstr "" @@ -4228,5 +4225,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "poistettu" @@ -4327,5 +4324,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4372,6 +4369,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 @@ -4385,6 +4382,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4442,34 +4439,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115 msgid "Conflicts when combining primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121 #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257 msgid "No conflicts to resolve" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 @@ -4487,23 +4484,23 @@ msgstr "kaikki" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66 msgid "Choose a value" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 -msgid "Please decided which values to keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68 +msgid "Please decide which values to keep" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73 #, java-format msgid "Value ''{0}'' is going to be applied for key ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79 #, java-format msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84 #, java-format msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" @@ -4547,7 +4544,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "Paste ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "From ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "To ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:444 +#, java-format +msgid "{0} tag" +msgid_plural "{0} tags" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 #, java-format @@ -4557,7 +4574,5 @@ msgstr[1] "{0} polkua" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format @@ -4567,26 +4582,4 @@ msgstr[1] "{0} relaatiota" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "Paste ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "From ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "To ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425 -#, java-format -msgid "{0} tag" -msgid_plural "{0} tags" -msgstr[0] "" -msgstr[1] "" - #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 #, java-format @@ -4652,4 +4645,13 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 msgid "Decision" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42 +#, fuzzy +msgid "Please select the values to keep for the following tags." +msgstr "Ole hyvä ja valitse muutoskokoelmat jotka haluat sulkea" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 +msgid "Show tags with conflicts only" msgstr "" @@ -4670,5 +4672,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 @@ -4761,5 +4763,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -4915,6 +4917,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323 #, java-format msgid "This will change up to {0} object." @@ -4923,22 +4925,22 @@ msgstr[1] "Olet muuttamassa {0} kohdetta." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149 msgid "An empty value deletes the key." msgstr "Tyhjä arvo poistaa avaimen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347 msgid "Change values?" msgstr "Muutetaanko arvot?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264 #, java-format msgid "Change properties of up to {0} object" @@ -4947,69 +4949,69 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 msgid "Please select a key" msgstr "Valitse avain" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335 msgid "Please select a value" msgstr "Valitse arvo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447 msgid "Please select the objects you want to change properties for." msgstr "Valitse objektit, joiden ominaisuuksia haluat muokata." +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "Ominaisuudet/jäsenyydet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 msgid "Properties for selected objects." msgstr "Valittujen objektien ominaisuudet." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 msgid "Member Of" msgstr "Jäsenyydet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576 msgid "Add Properties" msgstr "Lisää ominaisuuksia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 msgid "Add a new key/value pair to all objects" msgstr "Lisää uusi arvo/avain-pari kaikkiin objekteihin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Edit Properties" msgstr "Muokkaa ominaisuuksia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 msgid "Edit the value of the selected key for all objects" msgstr "Muokkaa valitun avaimen arvoa kaikissa objekteissa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Ominaisuudet: {0} / Jäsenyydet: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799 msgid "Properties / Memberships" msgstr "Ominaisuudet / Jäsenyydet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Change relation" msgstr "Muuta relaatiota" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Poistetaanko valinta relaatiosta {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860 msgid "Delete the selected key in all objects" msgstr "Poista valittu avain kaikista objekteista" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862 msgid "Delete Properties" msgstr "Poista asetukset" @@ -5051,7 +5053,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 -#, fuzzy msgid "Set the current selection to the list of selected relations" -msgstr "Valintaa ei voida käyttää jakamiseen." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5092,9 +5093,9 @@ msgstr "Valinta: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307 msgid "Undock the panel" msgstr "Irroita paneeli" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5103,5 +5104,5 @@ "työkalupalkin napista." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332 msgid "Click to minimize/maximize the panel content" msgstr "Napsauta pienentääksesi/suurentaaksesi paneelin sisällön" @@ -6522,5 +6523,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 #: build/trans_presets.java:67 build/trans_presets.java:103 #: build/trans_presets.java:143 build/trans_presets.java:180 @@ -6743,10 +6744,10 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37 msgid "Closing changeset" -msgstr "Suljetaan muutoskokoelma" +msgstr "Muutoskokoelmaa suljetaan" #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77 #, java-format msgid "Closing changeset {0}" -msgstr "Suljetaan muutoskokoelma {0}" +msgstr "Muutoskokoelmaa {0} suljetaan" #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 @@ -6904,7 +6905,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -#, fuzzy msgid "Save/Upload and Exit" -msgstr "Tallenna ja poistu" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 @@ -6913,7 +6913,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -#, fuzzy msgid "Save/Upload and Delete" -msgstr "Lähetys peruttu" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 @@ -7129,5 +7128,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7475,9 +7474,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 -#, fuzzy, java-format +#, java-format msgid "There was {0} conflict detected." msgid_plural "There were {0} conflicts detected." -msgstr[0] "Tuonnin aikana oli {0} konfliktia." -msgstr[1] "Tuonnin aikana oli {0} konfliktia." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 @@ -7493,7 +7492,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 -#, fuzzy msgid "Conflicts detected" -msgstr "Ristiriidat" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 @@ -7822,5 +7820,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Väri" @@ -8810,5 +8808,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313 msgid "Parse error: invalid document structure for GPX document." msgstr "Virhe luettaessa gpx-tiedostoa: tiedoston rakenne virheellinen." @@ -8942,23 +8940,23 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 msgid "Creating changeset..." -msgstr "Luodaan muutoskokoelma..." +msgstr "Muutoskokoelmaa luodaan..." #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 #, java-format msgid "Successfully opened changeset {0}" -msgstr "Onnistuneesti avattiin muutoskokoelma {0}" +msgstr "Muutoskokoelma {0} avattiin onnistuneesti" #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 msgid "Updating changeset..." -msgstr "Päivitetään muutoskokoelma..." +msgstr "Muutoskokoelmaa päivitetään..." #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 #, java-format msgid "Updating changeset {0}..." -msgstr "Päivitetään muutoskokoelmaa {0}..." +msgstr "Muutoskokoelmaa {0} päivitetään..." #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 msgid "Closing changeset..." -msgstr "Suljetaan muutoskokoelma..." +msgstr "Muutoskokoelmaa suljetaan..." #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 @@ -8987,19 +8985,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9083,5 +9081,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215 msgid "Parsing list of changesets..." -msgstr "Käsitellään muutoskokoelmalistaa..." +msgstr "Muutoskokoelmalistaa käsitellään..." #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161 @@ -9383,10 +9381,10 @@ #, java-format msgid "Reading changeset {0} ..." -msgstr "Luetaan muutoskokoelmaa {0}..." +msgstr "Muutoskokoelmaa {0} luetaan..." #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91 #, java-format msgid "Downloading changeset {0} ..." -msgstr "Ladataan muutoskokoelmaa {0}..." +msgstr "Muutoskokoelmaa {0} ladataan..." #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35 @@ -9461,7 +9459,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' must not be null" -msgstr "parametri ''{0}'' ei saa olla tyhjä" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 @@ -10186,69 +10184,73 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911 +msgid "Starting and ending numbers must be the same for alphabetic addresses" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943 msgid "Starting address number must be less than ending address number" msgstr "" @@ -19814,24 +19816,20 @@ #. item "Man Made/Tower" text "Name" #: build/trans_presets.java:2296 -#, fuzzy msgid "Tower type" -msgstr "Torni" +msgstr "" #. item "Man Made/Tower" combo "Tower type" #: build/trans_presets.java:2296 -#, fuzzy msgid "communication" -msgstr "Liittymä" +msgstr "" #: build/trans_presets.java:2296 -#, fuzzy msgid "observation" -msgstr "Tiedot" +msgstr "" #. #: build/trans_presets.java:2298 -#, fuzzy msgid "Height (meters)" -msgstr "Enimmäispituus (metreinä)" +msgstr "" #. item "Man Made/Tower" text "Operator" @@ -19891,7 +19889,6 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "oil" -msgstr "fossiilinen polttoaine" +msgstr "" #: build/trans_presets.java:2330 build/trans_presets.java:2372 @@ -19900,12 +19897,10 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "sewage" -msgstr "käyttö" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "heat" -msgstr "nummi" +msgstr "" #: build/trans_presets.java:2330 @@ -19914,12 +19909,10 @@ #: build/trans_presets.java:2331 -#, fuzzy msgid "underwater" -msgstr "vesi" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "overground" -msgstr "maanalainen" +msgstr "" #: build/trans_presets.java:2333 @@ -20064,17 +20057,14 @@ #. item "Man Made/Power Tower" combo "Type" #: build/trans_presets.java:2398 -#, fuzzy msgid "tower" -msgstr "Torni" +msgstr "" #: build/trans_presets.java:2398 -#, fuzzy msgid "pole" -msgstr "Rooli" +msgstr "" #: build/trans_presets.java:2399 -#, fuzzy msgid "Tower reference" -msgstr "Asetukset" +msgstr "" #. item "Man Made/Power Tower" text "Tower reference" @@ -20092,18 +20082,15 @@ #. item "Man Made/Power Line" label "Edit Power Line" #: build/trans_presets.java:2405 -#, fuzzy msgid "Line type" -msgstr "tyyppi" +msgstr "" #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2405 -#, fuzzy msgid "line" -msgstr "Putki" +msgstr "" #: build/trans_presets.java:2405 -#, fuzzy msgid "minor_line" -msgstr "moottoritien_ramppi" +msgstr "" #. item "Man Made/Power Line" text "Line reference" @@ -20114,7 +20101,6 @@ #. item "Man Made/Power Line" text "Voltage" #: build/trans_presets.java:2409 -#, fuzzy msgid "Amount of Cables" -msgstr "Johtojen määrä" +msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" @@ -20125,22 +20111,18 @@ #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" #: build/trans_presets.java:2410 -#, fuzzy msgid "single" -msgstr "Kulma" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "double" -msgstr "Kuulapeli" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "triple" -msgstr "Tiedosto" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "quad" -msgstr "louhos" +msgstr "" #: build/trans_presets.java:2413 @@ -26035,9 +26017,91 @@ msgstr "" -#~ msgid "Combine ways with different memberships?" -#~ msgstr "Yhdistetäänkö polut, joilla on eriävät jäsenyydet?" - -#~ msgid "Combine Anyway" -#~ msgstr "Yhdistä silti" +#~ msgid "Unknown version" +#~ msgstr "Tuntematon versio" + +#~ msgid "Aborting..." +#~ msgstr "Keskeytetään..." + +#~ msgid "Unsaved Changes" +#~ msgstr "Tallentamattomia muutoksia" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Lisää valitut objektit jäseniksi" + +#~ msgid "Revert" +#~ msgstr "Palauta" + +#~ msgid "Date" +#~ msgstr "Päivämäärä" + +#~ msgid "Object" +#~ msgstr "Objekti" + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "OSM-tilin kirjautumisnimi (sähköpostiosoite)." + +#~ msgid "Email" +#~ msgstr "Sähköpostiosoite" + +#~ msgid "Unknown file extension." +#~ msgstr "Tuntematon tiedostopääte." + +#~ msgid "Error parsing server response." +#~ msgstr "Virhe palvelimen vastauksen käsittelyssä." + +#~ msgid "OSM username (email)" +#~ msgstr "OSM-käyttäjänimi (sähköpostiosoite)" + +#~ msgid "my version:" +#~ msgstr "minun versioni:" + +#~ msgid "their version:" +#~ msgstr "palvelimen versio:" + +#~ msgid "Change" +#~ msgstr "Muokkaa" + +#~ msgid "Delete {1} {0}" +#~ msgstr "Poista {1} {0}" + +#~ msgid "Move" +#~ msgstr "Siirrä" + +#~ msgid "position" +#~ msgstr "sijainti" + +#~ msgid "false" +#~ msgstr "epätosi" + +#~ msgid "true" +#~ msgstr "tosi" + +#~ msgid "different" +#~ msgstr "eri" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "unnamed" +#~ msgstr "nimetön" + +#~ msgid "Data Layer" +#~ msgstr "Datataso" + +#~ msgid "Import TCX file as GPS track" +#~ msgstr "Tuo TCX-tiedosto GPS-jälkenä" + +#~ msgid "Import TCX File..." +#~ msgstr "Tuo TCX-tiedosto..." + +#~ msgid "Validate" +#~ msgstr "Tarkista" + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" +#~ msgstr "" +#~ "Valituilla pisteillä on eriävät relaatiojäsenyydet. Haluatko silti " +#~ "yhdistää ne?" #~ msgid "" @@ -26048,92 +26112,4 @@ #~ "yhdistää ne?" -#~ msgid "Unknown version" -#~ msgstr "Tuntematon versio" - -#~ msgid "Aborting..." -#~ msgstr "Keskeytetään..." - -#~ msgid "Unsaved Changes" -#~ msgstr "Tallentamattomia muutoksia" - -#~ msgid "Add all currently selected objects as members" -#~ msgstr "Lisää valitut objektit jäseniksi" - -#~ msgid "Revert" -#~ msgstr "Palauta" - -#~ msgid "Date" -#~ msgstr "Päivämäärä" - -#~ msgid "Object" -#~ msgstr "Objekti" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "OSM-tilin kirjautumisnimi (sähköpostiosoite)." - -#~ msgid "Email" -#~ msgstr "Sähköpostiosoite" - -#~ msgid "Unknown file extension." -#~ msgstr "Tuntematon tiedostopääte." - -#~ msgid "Error parsing server response." -#~ msgstr "Virhe palvelimen vastauksen käsittelyssä." - -#~ msgid "OSM username (email)" -#~ msgstr "OSM-käyttäjänimi (sähköpostiosoite)" - -#~ msgid "my version:" -#~ msgstr "minun versioni:" - -#~ msgid "their version:" -#~ msgstr "palvelimen versio:" - -#~ msgid "Change" -#~ msgstr "Muokkaa" - -#~ msgid "Delete {1} {0}" -#~ msgstr "Poista {1} {0}" - -#~ msgid "Move" -#~ msgstr "Siirrä" - -#~ msgid "position" -#~ msgstr "sijainti" - -#~ msgid "false" -#~ msgstr "epätosi" - -#~ msgid "true" -#~ msgstr "tosi" - -#~ msgid "different" -#~ msgstr "eri" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "unnamed" -#~ msgstr "nimetön" - -#~ msgid "Data Layer" -#~ msgstr "Datataso" - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "Tuo TCX-tiedosto GPS-jälkenä" - -#~ msgid "Import TCX File..." -#~ msgstr "Tuo TCX-tiedosto..." - -#~ msgid "Validate" -#~ msgstr "Tarkista" - -#~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still " -#~ "want to merge them?" -#~ msgstr "" -#~ "Valituilla pisteillä on eriävät relaatiojäsenyydet. Haluatko silti " -#~ "yhdistää ne?" - #~ msgid "All the ways were empty" #~ msgstr "Kaikki polut olivat tyhjiä" @@ -26199,4 +26175,7 @@ #~ msgid "Could not download plugin: {0} from {1}" #~ msgstr "Liitännäistä ei voitu ladata: {0} kohteesta {1}" + +#~ msgid "Combine ways with different memberships?" +#~ msgstr "Yhdistetäänkö polut, joilla on eriävät jäsenyydet?" #~ msgid "" @@ -26362,4 +26341,7 @@ #~ msgstr "Yhdistä silti" +#~ msgid "Combine Anyway" +#~ msgstr "Yhdistä silti" + #~ msgid "" #~ "Please select at least one node, way or relation. Only already uploaded " Index: /applications/editors/josm/i18n/po/fr.po =================================================================== --- /applications/editors/josm/i18n/po/fr.po (revision 17945) +++ /applications/editors/josm/i18n/po/fr.po (revision 17946) @@ -6,6 +6,6 @@ "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 16:38+0200\n" -"PO-Revision-Date: 2009-09-25 17:27+0000\n" +"POT-Creation-Date: 2009-10-02 22:03+0200\n" +"PO-Revision-Date: 2009-10-01 20:06+0000\n" "Last-Translator: François Blondel \n" "Language-Team: Fr <>\n" @@ -14,5 +14,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2009-09-28 14:33+0000\n" +"X-Launchpad-Export-Date: 2009-10-02 19:24+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Language: French\n" @@ -46,5 +46,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -89,9 +89,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -124,6 +124,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -146,5 +146,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 @@ -338,5 +338,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -348,12 +348,12 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -375,5 +375,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 @@ -464,9 +464,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -501,6 +501,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -630,22 +630,22 @@ msgstr "Téléchargement des ensembles de changements ouverts" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 msgid "Combine Way" msgstr "Fusionner des chemins" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine several ways into one." msgstr "Fusionner plusieurs chemins en un seul." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Change directions?" msgstr "Changer les directions ?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 msgid "Reverse and Combine" msgstr "Inverser et fusionner" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -655,5 +655,5 @@ "la même direction. En retourner certaines ?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -663,10 +663,10 @@ "une seule chaîne de nœuds)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Fusionner {0} voies" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Veuillez sélectionner au moins deux chemins à fusionner." @@ -713,5 +713,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -779,5 +779,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333 msgid "OK" @@ -864,8 +864,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -901,5 +901,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 @@ -971,5 +971,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1060,18 +1060,18 @@ msgstr "Fusionne le calque courant avec un autre calque" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 msgid "Merge Nodes" msgstr "Fusionner les nœuds" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge nodes into the oldest one." msgstr "Fusionner les nœuds sur le plus ancien" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Please select at least two nodes to merge." msgstr "Veuillez sélectionner au moins deux nœuds à fusionner." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -1079,5 +1079,5 @@ "encore utilisé" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261 #, java-format msgid "Merge {0} nodes" @@ -1261,5 +1261,5 @@ "Appliquer les attributs de la mémoire tampon aux éléments sélectionnés." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106 #, java-format msgid "Pasting {0} tag" @@ -1268,5 +1268,5 @@ msgstr[1] "Collage des tags {0}" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107 #, java-format msgid "to {0} primitive" @@ -1925,7 +1925,6 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 -#, fuzzy msgid "No data found in this area." -msgstr "Pas de données sur le périphérique" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2207,55 +2206,55 @@ msgstr "Impossible de rechercher car il n’y a pas de données chargées." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a filter string." msgstr "Veuillez entrer une chaine de caractère comme filtre." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a search string." msgstr "Entrer le texte à rechercher." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 msgid "replace selection" msgstr "remplacer la sélection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "add to selection" msgstr "ajouter à la sélection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75 msgid "remove from selection" msgstr "supprimer de la sélection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76 msgid "find in selection" msgstr "trouver dans une selection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 msgid "case sensitive" msgstr "respecter la casse" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "regular expression" msgstr "expression régulière" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "" "Baker Street - 'Baker' et 'Street' dans n'importe quelle clé ou nom." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "" "\"Baker Street\" - 'Baker Street' dans n'importe quelle clé ou nom." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' n'importe où dans le nom." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - clé 'type' avec la valeur exacte 'route'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2265,17 +2264,17 @@ "*=valeur, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - pas 'Bak' dans le nom." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "foot: - key=foot set to any value." msgstr "foot: - key=foot avec n'importe quelle valeur." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "Special targets:" msgstr "Options spéciales :" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "" "type: - type of the object (node, way, relation)" @@ -2283,33 +2282,33 @@ "type: - type de l'objet (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "user:... - all objects changed by user" msgstr "user:... - tous les objets modifiés par l'utilisateur" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "id:... - object with given ID (0 for new objects)" msgstr "id :... - objet avec l'ID indiqué (0 pour les nouveaux objets)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - objet avec le nombre de nœuds spécifié" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "modified - all changed objects" msgstr "modified - tous les objets modifiés" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "selected - all selected objects" msgstr "selected - tous les objets sélectionnés" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "incomplete - all incomplete objects" msgstr "incomplete - tous les objets incomplets" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 msgid "untagged - all untagged objects" msgstr "untagged - tous les objets non étiquetés" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 msgid "" "child expr - all children of objects matching the expression" @@ -2318,5 +2317,5 @@ "l'expression" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "" "parent expr - all parents of objects matching the expression" @@ -2325,18 +2324,18 @@ "l'expression" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "Use | or OR to combine with logical or" msgstr "Utilisez | ou OR pour combiner avec le OU logique" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" "Utilisez \" pour citer des opérateurs (i.e. si la clé contient :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "Use ( and ) to group expressions" msgstr "Utilisez ( et ) pour grouper des expressions" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2346,51 +2345,51 @@ msgstr "Filtrez" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Chercher" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Start Search" msgstr "Commencer la recherche" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 #, java-format msgid "No match found for ''{0}''" msgstr "Aucun résultat trouvé pour \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Rien n’a été ajouté à la sélection en recherchant \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Rien n’a été enlevé à la sélection en recherchant \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, java-format -msgid "Nothing find in selection by searching for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254 +#, fuzzy, java-format +msgid "Nothing found in selection by searching for ''{0}''" +msgstr "Rien n’a été ajouté à la sélection en recherchant \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264 #, java-format msgid "Found {0} matches" msgstr "{0} résultats trouvés" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 msgid "RX" msgstr "RX" @@ -2668,10 +2667,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 -#, fuzzy, java-format +#, java-format msgid "" "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" -"Impossible d’annuler la commande \"{0}\" car le calque \"{1}\" n’est plus " -"présent." #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 @@ -2719,5 +2716,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 msgid "Delete from relation" msgstr "Supprimer de la relation" @@ -2775,12 +2772,12 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 -#, fuzzy, java-format +#, java-format msgid "Purged object ''{0}''" -msgstr "Déplacer des objets {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 -#, fuzzy, java-format +#, java-format msgid "Purged {0} objects" -msgstr "Changer {0} objet." +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 @@ -2794,7 +2791,7 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 -#, fuzzy, java-format +#, java-format msgid "Removing reference from relation {0}" -msgstr "suppression de la référence de la relation {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 @@ -3166,14 +3163,14 @@ msgstr "Attention : {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3181,5 +3178,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3540,7 +3537,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 #, java-format @@ -3582,7 +3577,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 -#, fuzzy msgid "Not Found" -msgstr "Pas connecté" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 @@ -3902,9 +3896,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289 msgid "(no object)" msgstr "(aucun objet)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416 msgid "User:" msgstr "Utilisateur :" @@ -4405,5 +4399,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "supprimé" @@ -4506,5 +4500,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4554,6 +4548,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 @@ -4567,6 +4561,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4624,34 +4618,34 @@ msgstr "Leur jeu de données n’inclue pas d’étiquette avec la clé {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115 msgid "Conflicts when combining primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121 #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257 msgid "No conflicts to resolve" msgstr "Pas de conflits à résoudre." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "Annuler la résolution des conflits" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "Appliquer les conflits résolus." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 @@ -4669,23 +4663,24 @@ msgstr "all" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66 msgid "Choose a value" msgstr "Choisir une valeur" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 -msgid "Please decided which values to keep" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68 +#, fuzzy +msgid "Please decide which values to keep" msgstr "Choisissez les valeurs à conserver" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73 #, java-format msgid "Value ''{0}'' is going to be applied for key ''{1}''" msgstr "La valeur ''{0}'' va être appliquée à la clé ''{1}''" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79 #, java-format msgid "The key ''{0}'' and all its values are going to be removed" msgstr "La clé \"{0}\" et toutes ses valeurs vont être supprimées." -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84 #, java-format msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" @@ -4729,7 +4724,27 @@ msgstr "Conflits entre des attributs collés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "Paste ..." +msgstr "Coller…" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "From ..." +msgstr "De…" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "To ..." +msgstr "Pour…" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:444 +#, java-format +msgid "{0} tag" +msgid_plural "{0} tags" +msgstr[0] "{0} attribut" +msgstr[1] "{0} attributs" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 #, java-format @@ -4739,7 +4754,5 @@ msgstr[1] "{0} voies" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format @@ -4748,26 +4761,4 @@ msgstr[0] "{0} relation" msgstr[1] "{0} relations" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "Paste ..." -msgstr "Coller…" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "From ..." -msgstr "De…" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "To ..." -msgstr "Pour…" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425 -#, java-format -msgid "{0} tag" -msgid_plural "{0} tags" -msgstr[0] "{0} attribut" -msgstr[1] "{0} attributs" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 @@ -4836,4 +4827,16 @@ msgstr "Décision" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42 +#, fuzzy +msgid "Please select the values to keep for the following tags." +msgstr "" +"Veuillez sélectionner l'ensemble de changement que vous voulez fermer" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 +#, fuzzy +msgid "Show tags with conflicts only" +msgstr "Nœuds (avec conflits)" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -4851,5 +4854,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 @@ -4946,5 +4949,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -5100,6 +5103,6 @@ msgstr "Informations à propos du calque." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323 #, java-format msgid "This will change up to {0} object." @@ -5108,22 +5111,22 @@ msgstr[1] "Cela modifiera {0} objets maximum." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149 msgid "An empty value deletes the key." msgstr "Une valeur vide supprime la clé." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347 msgid "Change values?" msgstr "Changer les valeurs ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264 #, java-format msgid "Change properties of up to {0} object" @@ -5132,70 +5135,70 @@ msgstr[1] "Modifier les propriétés de {0} objets maximum." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 msgid "Please select a key" msgstr "Veuillez sélectionner une clé" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335 msgid "Please select a value" msgstr "Veuillez sélectionner une valeur" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447 msgid "Please select the objects you want to change properties for." msgstr "" "Veuillez sélectionner les objets dont vous voulez changer les propriétés." +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "Propriétés/Appartenances" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 msgid "Properties for selected objects." msgstr "Propriétés des objets sélectionnés." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 msgid "Member Of" msgstr "Membre de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576 msgid "Add Properties" msgstr "Ajouter des Propriétés" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 msgid "Add a new key/value pair to all objects" msgstr "Ajouter une nouvelle paire clé/valeur à tous les objets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Edit Properties" msgstr "Éditer les propriétés" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 msgid "Edit the value of the selected key for all objects" msgstr "Éditer la valeur de la clé selectionnée pour tous les objets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Propriétés : {0} / Appartenances : {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799 msgid "Properties / Memberships" msgstr "Propriétés / Appartenances" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Change relation" msgstr "Changer la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Supprimer vraiment la sélection de la relation {0} ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860 msgid "Delete the selected key in all objects" msgstr "Supprimer la clé sélectionnée de tous les objets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862 msgid "Delete Properties" msgstr "Supprimer les propriétés" @@ -5239,7 +5242,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 -#, fuzzy msgid "Set the current selection to the list of selected relations" -msgstr "éditer la relation sélectionnée" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5280,9 +5282,9 @@ msgstr "Sélection : {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307 msgid "Undock the panel" msgstr "Détacher le panneau" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5291,5 +5293,5 @@ "d'outils de gauche." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332 msgid "Click to minimize/maximize the panel content" msgstr "Cliquer pour minimiser/maximiser le contenu du panneau" @@ -6736,5 +6738,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 #: build/trans_presets.java:67 build/trans_presets.java:103 #: build/trans_presets.java:143 build/trans_presets.java:180 @@ -7127,7 +7129,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -#, fuzzy msgid "Save/Upload and Exit" -msgstr "Enregistrer et quitter" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 @@ -7137,7 +7138,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -#, fuzzy msgid "Save/Upload and Delete" -msgstr "Sauvegarder et supprimer." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 @@ -7153,11 +7153,8 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481 -#, fuzzy msgid "" "An upload and/or save operation of one layer with modifications
was " "cancelled or has failed." msgstr "" -"Une opération d'envoi et/ou de sauvegarde d'un calque avec des " -"modifications
a été annulé ou a échoué." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491 @@ -7361,5 +7358,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7718,9 +7715,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 -#, fuzzy, java-format +#, java-format msgid "There was {0} conflict detected." msgid_plural "There were {0} conflicts detected." -msgstr[0] "Il y a eu {0} conflits durant l'import." -msgstr[1] "Il y a eu {0} conflits durant l'import." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 @@ -7736,7 +7733,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 -#, fuzzy msgid "Conflicts detected" -msgstr "Conflit détecté" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 @@ -8098,5 +8094,5 @@ msgstr "Calibration de l’enregistrement de la voix" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Couleur" @@ -9117,5 +9113,5 @@ msgstr "Échec de l’analyse du fichier \"{0}\"" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313 msgid "Parse error: invalid document structure for GPX document." msgstr "" @@ -9306,19 +9302,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9801,7 +9797,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' must not be null" -msgstr "le paramètre \"{0}\" ne doit pas être vide" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 @@ -10551,69 +10547,73 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911 +msgid "Starting and ending numbers must be the same for alphabetic addresses" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943 msgid "Starting address number must be less than ending address number" msgstr "" @@ -19571,5 +19571,5 @@ #: build/trans_presets.java:2131 build/trans_presets.java:2137 msgid "track" -msgstr "" +msgstr "№piste" #: build/trans_presets.java:1935 @@ -19923,5 +19923,5 @@ #: build/trans_presets.java:2141 msgid "Man-Made" -msgstr "Artificial" +msgstr "Artificiel" #. group "Man-Made" @@ -20378,24 +20378,20 @@ #. item "Man Made/Tower" text "Name" #: build/trans_presets.java:2296 -#, fuzzy msgid "Tower type" -msgstr "Type de route" +msgstr "Type de pylône" #. item "Man Made/Tower" combo "Tower type" #: build/trans_presets.java:2296 -#, fuzzy msgid "communication" -msgstr "connexion" +msgstr "" #: build/trans_presets.java:2296 -#, fuzzy msgid "observation" -msgstr "Altitude" +msgstr "observation" #. #: build/trans_presets.java:2298 -#, fuzzy msgid "Height (meters)" -msgstr "Hauteur max. (mètres)" +msgstr "Hauteur (mètres)" #. item "Man Made/Tower" text "Operator" @@ -20455,7 +20451,6 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "oil" -msgstr "fossil" +msgstr "" #: build/trans_presets.java:2330 build/trans_presets.java:2372 @@ -20464,27 +20459,22 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "sewage" -msgstr "usage" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "heat" -msgstr "lande/bruyère" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "any substance" -msgstr "A Par distance" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "underwater" -msgstr "eau" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "overground" -msgstr "souterrain" +msgstr "" #: build/trans_presets.java:2333 @@ -20629,17 +20619,14 @@ #. item "Man Made/Power Tower" combo "Type" #: build/trans_presets.java:2398 -#, fuzzy msgid "tower" -msgstr "Structure de hauteur" +msgstr "pylônes" #: build/trans_presets.java:2398 -#, fuzzy msgid "pole" -msgstr "Rôle" +msgstr "" #: build/trans_presets.java:2399 -#, fuzzy msgid "Tower reference" -msgstr "Champ de vision" +msgstr "" #. item "Man Made/Power Tower" text "Tower reference" @@ -20657,18 +20644,15 @@ #. item "Man Made/Power Line" label "Edit Power Line" #: build/trans_presets.java:2405 -#, fuzzy msgid "Line type" -msgstr "Type de piste" +msgstr "Type de ligne" #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2405 -#, fuzzy msgid "line" -msgstr "lié" +msgstr "ligne" #: build/trans_presets.java:2405 -#, fuzzy msgid "minor_line" -msgstr "motorway_link" +msgstr "" #. item "Man Made/Power Line" text "Line reference" @@ -20679,5 +20663,4 @@ #. item "Man Made/Power Line" text "Voltage" #: build/trans_presets.java:2409 -#, fuzzy msgid "Amount of Cables" msgstr "Nombre de câbles" @@ -20686,26 +20669,22 @@ #: build/trans_presets.java:2410 msgid "Number of wires (better: conductors) per power cable" -msgstr "" +msgstr "Nombre de conducteurs par câbles" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" #: build/trans_presets.java:2410 -#, fuzzy msgid "single" -msgstr "Angle" +msgstr "simple" #: build/trans_presets.java:2410 -#, fuzzy msgid "double" -msgstr "Boules" +msgstr "double" #: build/trans_presets.java:2410 -#, fuzzy msgid "triple" -msgstr "Échalier" +msgstr "triple" #: build/trans_presets.java:2410 -#, fuzzy msgid "quad" -msgstr "quaker" +msgstr "quadruple" #: build/trans_presets.java:2413 @@ -21654,5 +21633,5 @@ #: build/trans_presets.java:2850 msgid "Islet" -msgstr "" +msgstr "îlot" #. item @@ -21660,5 +21639,5 @@ #: build/trans_presets.java:2852 msgid "Edit Islet" -msgstr "" +msgstr "Éditer l'îlot" #. item "Places/Islet" text "Name" @@ -26600,10 +26579,129 @@ msgstr "Czech UHUL:ORTOFOTO" -#~ msgid "Combine ways with different memberships?" +#~ msgid "Move" +#~ msgstr "Déplacer" + +#~ msgid "Data Layer" +#~ msgstr "Calque de données" + +#~ msgid "No data imported." +#~ msgstr "Aucune donnée importée" + +#~ msgid "No document open so nothing to save." +#~ msgstr "Aucun document ouvert donc rien à sauvegarder." + +#~ msgid "Unknown file extension." +#~ msgstr "Extension de fichier inconnue." + +#~ msgid "Email" +#~ msgstr "E-mail" + +#~ msgid "Resolve Conflicts" +#~ msgstr "Résoudre les conflits" + +#~ msgid "Object" +#~ msgstr "Objet" + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} objet est conflictuel :" +#~ msgstr[1] "{0} objets sont conflictuels :" + +#~ msgid "my version:" +#~ msgstr "ma version :" + +#~ msgid "their version:" +#~ msgstr "version du serveur :" + +#~ msgid "resolved version:" +#~ msgstr "version choisie :" + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Contact du serveur OSM..." + +#~ msgid "Unknown version" +#~ msgstr "Version inconnue" + +#~ msgid "position" +#~ msgstr "position" + +#~ msgid "different" +#~ msgstr "différent" + +#~ msgid "true" +#~ msgstr "vrai" + +#~ msgid "false" +#~ msgstr "faux" + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Résoudre {0} conflits dans {1} objets" + +#~ msgid "Change" +#~ msgstr "Changer" + +#~ msgid "unnamed" +#~ msgstr "sans-nom" + +#~ msgid "Validate" +#~ msgstr "Valider" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." #~ msgstr "" -#~ "Fusionner des chemins qui ne sont pas les mêmes membres d’une relation ?" - -#~ msgid "Combine Anyway" -#~ msgstr "Fusionner quand même" +#~ "Le greffon ne peut pas être supprimé. Merci de le signaler là où vous " +#~ "avez obtenu JOSM." + +#~ msgid "Occupied By" +#~ msgstr "Occupé par" + +#~ msgid "Cannot connect to server." +#~ msgstr "Impossible de se connecter au serveur." + +#~ msgid "Date" +#~ msgstr "Date" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "" +#~ "Valider soit la sélection actuelle, soit toutes les données téléchargées." + +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Metacarta Map Rectifier image id" + +#~ msgid "rectifier id={0}" +#~ msgstr "rectifier id={0}" + +#~ msgid "Navigation" +#~ msgstr "Navigation" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO·(GNOME)" + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "YAHOO·(GNOME·Fix)" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO·(WebKit)" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "YAHOO (WebKit GTK)" + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "Ce greffon nécessite une mise à jour de JOSM : {0}." + +#~ msgid " has zero ref" +#~ msgstr " n’a pas de ref" + +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "" +#~ "Indication : Certains changements viennent de l’envoi de nouvelles " +#~ "données sur le serveur." + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Étiquettes (une valeur vide supprime l’étiquette)" #~ msgid "" @@ -26614,141 +26712,7 @@ #~ "Voulez-vous encore les fusionner ?" -#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -#~ msgstr "Erreur : l’en-tête \"{0}\" ne correspond pas au modèle \"{1}\"" - -#~ msgid "Purging 1 primitive" -#~ msgstr "Suppression d’une primitive" - -#~ msgid "removing reference from way {0}" -#~ msgstr "suppression de la référence du chemin {0}" - -#~ msgid "Empty member in relation." -#~ msgstr "Membre vide dans la relation." - -#~ msgid "Move" -#~ msgstr "Déplacer" - -#~ msgid "Data Layer" -#~ msgstr "Calque de données" - -#~ msgid "No data imported." -#~ msgstr "Aucune donnée importée" - -#~ msgid "No document open so nothing to save." -#~ msgstr "Aucun document ouvert donc rien à sauvegarder." - -#~ msgid "Unknown file extension." -#~ msgstr "Extension de fichier inconnue." - -#~ msgid "Email" -#~ msgstr "E-mail" - -#~ msgid "Resolve Conflicts" -#~ msgstr "Résoudre les conflits" - -#~ msgid "Object" -#~ msgstr "Objet" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} objet est conflictuel :" -#~ msgstr[1] "{0} objets sont conflictuels :" - -#~ msgid "my version:" -#~ msgstr "ma version :" - -#~ msgid "their version:" -#~ msgstr "version du serveur :" - -#~ msgid "resolved version:" -#~ msgstr "version choisie :" - -#~ msgid "Contacting the OSM server..." -#~ msgstr "Contact du serveur OSM..." - -#~ msgid "Unknown version" -#~ msgstr "Version inconnue" - -#~ msgid "position" -#~ msgstr "position" - -#~ msgid "different" -#~ msgstr "différent" - -#~ msgid "true" -#~ msgstr "vrai" - -#~ msgid "false" -#~ msgstr "faux" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Résoudre {0} conflits dans {1} objets" - -#~ msgid "Change" -#~ msgstr "Changer" - -#~ msgid "unnamed" -#~ msgstr "sans-nom" - -#~ msgid "Validate" -#~ msgstr "Valider" - -#~ msgid "" -#~ "The plugin could not be removed. Please tell the people you got JOSM from " -#~ "about the problem." +#~ msgid "Combine ways with different memberships?" #~ msgstr "" -#~ "Le greffon ne peut pas être supprimé. Merci de le signaler là où vous " -#~ "avez obtenu JOSM." - -#~ msgid "Occupied By" -#~ msgstr "Occupé par" - -#~ msgid "Cannot connect to server." -#~ msgstr "Impossible de se connecter au serveur." - -#~ msgid "Date" -#~ msgstr "Date" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "Validate either current selection or complete dataset." -#~ msgstr "" -#~ "Valider soit la sélection actuelle, soit toutes les données téléchargées." - -#~ msgid "Metacarta Map Rectifier image id" -#~ msgstr "Metacarta Map Rectifier image id" - -#~ msgid "rectifier id={0}" -#~ msgstr "rectifier id={0}" - -#~ msgid "Navigation" -#~ msgstr "Navigation" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO·(GNOME)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "YAHOO·(GNOME·Fix)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO·(WebKit)" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "YAHOO (WebKit GTK)" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "Ce greffon nécessite une mise à jour de JOSM : {0}." - -#~ msgid " has zero ref" -#~ msgstr " n’a pas de ref" - -#~ msgid "Hint: Some changes came from uploading new data to the server." -#~ msgstr "" -#~ "Indication : Certains changements viennent de l’envoi de nouvelles " -#~ "données sur le serveur." - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Étiquettes (une valeur vide supprime l’étiquette)" +#~ "Fusionner des chemins qui ne sont pas les mêmes membres d’une relation ?" #~ msgid "Transfer aborted due to error (will wait for 5 seconds):" @@ -26906,4 +26870,7 @@ #~ msgstr "Impossible d’ouvrir le répertoire des préférences : {0}" +#~ msgid "Empty member in relation." +#~ msgstr "Membre vide dans la relation." + #~ msgid "User" #~ msgstr "Utilisateur" @@ -27186,4 +27153,7 @@ #~ "traces à être chargées vers OSM, par ex. en supprimant des parties " #~ "inintéressantes des traces." + +#~ msgid "Combine Anyway" +#~ msgstr "Fusionner quand même" #~ msgid "All the ways were empty" @@ -27315,4 +27285,7 @@ #~ msgstr "Erreur de communication avec le serveur" +#~ msgid "Purging 1 primitive" +#~ msgstr "Suppression d’une primitive" + #~ msgid "Didn't find an historized primitive with id {0} in this dataset" #~ msgstr "Pas de primitive historisée d’id {0} dans ce jeu de données" @@ -27320,4 +27293,7 @@ #~ msgid "Adjust the position of the WMS layer (raster images only)" #~ msgstr "Ajuster la position de la couche WMS (images raster uniquement)" + +#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +#~ msgstr "Erreur : l’en-tête \"{0}\" ne correspond pas au modèle \"{1}\"" #~ msgid "" @@ -27333,4 +27309,7 @@ #~ msgid "API initialization failed" #~ msgstr "Échec d’initialisation de l’API" + +#~ msgid "removing reference from way {0}" +#~ msgstr "suppression de la référence du chemin {0}" #~ msgid "Failed to load history from the server. Details:
{0}" Index: /applications/editors/josm/i18n/po/gl.po =================================================================== --- /applications/editors/josm/i18n/po/gl.po (revision 17945) +++ /applications/editors/josm/i18n/po/gl.po (revision 17946) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 16:38+0200\n" +"POT-Creation-Date: 2009-10-02 22:03+0200\n" "PO-Revision-Date: 2009-09-22 15:04+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-28 14:34+0000\n" +"X-Launchpad-Export-Date: 2009-10-02 19:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -47,5 +47,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -90,9 +90,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -147,5 +147,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 @@ -328,5 +328,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -338,12 +338,12 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -365,5 +365,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 @@ -452,9 +452,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -489,6 +489,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -618,22 +618,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 msgid "Combine Way" msgstr "Combinar vía" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine several ways into one." msgstr "Combinar varias vías en unha." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Change directions?" msgstr "Cambiar direccións?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 msgid "Reverse and Combine" msgstr "Invertir e Combinar" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -643,5 +643,5 @@ "invertir algunhas?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -651,10 +651,10 @@ "serie de nodos)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Combinar {0} vías" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Por favor, selecciona polo menos dúas vías para combinar." @@ -699,5 +699,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -766,5 +766,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333 msgid "OK" @@ -849,8 +849,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -886,5 +886,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 @@ -956,5 +956,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1044,18 +1044,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 msgid "Merge Nodes" msgstr "Acoplar Nodos" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge nodes into the oldest one." msgstr "Acoplar nodos no máis antigo" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Please select at least two nodes to merge." msgstr "Por favor, selecciona polo menos dous nodos a acoplar." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -1063,5 +1063,5 @@ "uso." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261 #, java-format msgid "Merge {0} nodes" @@ -1241,5 +1241,5 @@ "seleccionados." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106 #, java-format msgid "Pasting {0} tag" @@ -1248,5 +1248,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107 #, java-format msgid "to {0} primitive" @@ -2163,53 +2163,53 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a search string." msgstr "Por favor, introduce unha cadea de busca." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 msgid "replace selection" msgstr "reemplazar selección" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "add to selection" msgstr "engadir á selección" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75 msgid "remove from selection" msgstr "eliminar da selección" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 msgid "case sensitive" msgstr "sensible a maiúsculas" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "regular expression" msgstr "expresión regular" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "Baker Street - 'Baker' e 'Street' en calquer clave ou nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"Baker Street\" - 'Baker Street' en calquera clave ou nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' en calquer posición do nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - a clave 'type' co valor exacto 'route'" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2219,50 +2219,50 @@ "b>, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - que non conteña 'Bak' no nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "foot: - key=foot set to any value." msgstr "foot: - clave=foot establecida con calquer valor." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "Special targets:" msgstr "Obxectivos especiais:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "" "type: - type of the object (node, way, relation)" msgstr "type: - tipo do obxecto(node,way,relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "user:... - all objects changed by user" msgstr "user:... - todos os obxectos cambiados polo usuario" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "id:... - object with given ID (0 for new objects)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - obxectro có número de nodos indicado" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "modified - all changed objects" msgstr "modified - todos os obxectos cambiados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "selected - all selected objects" msgstr "selected - todos os obxectos seleccionados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "incomplete - all incomplete objects" msgstr "incomplete - todos os obxectos incompletos" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 msgid "untagged - all untagged objects" msgstr "untagged - todos os obxectos sen etiquetar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 msgid "" "child expr - all children of objects matching the expression" @@ -2271,5 +2271,5 @@ "coa expresión" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "" "parent expr - all parents of objects matching the expression" @@ -2278,17 +2278,17 @@ "expresión" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "Use | or OR to combine with logical or" msgstr "Usar | ou OR para combinar co operador OU lóxico" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "Usar \" para escapar operadores (p.e. se a clave conten : )" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "Use ( and ) to group expressions" msgstr "Usar ( e ) para agrupar expresións" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2298,51 +2298,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Buscar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Start Search" msgstr "Comezar Busca" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 #, java-format msgid "No match found for ''{0}''" msgstr "Non se atoparon coincidencias para \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Non se engadiu nada á selección buscando por \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Non se eliminou da selección buscando por \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, java-format -msgid "Nothing find in selection by searching for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254 +#, fuzzy, java-format +msgid "Nothing found in selection by searching for ''{0}''" +msgstr "Non se engadiu nada á selección buscando por \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264 #, java-format msgid "Found {0} matches" msgstr "Atopadas {0} coincidencias" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 msgid "RX" msgstr "RX" @@ -2658,5 +2658,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 msgid "Delete from relation" msgstr "Borrar da relación" @@ -2710,12 +2710,12 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 -#, fuzzy, java-format +#, java-format msgid "Purged object ''{0}''" -msgstr "Mover obxectos {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 -#, fuzzy, java-format +#, java-format msgid "Purged {0} objects" -msgstr "Cambiar {0} obxecto" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 @@ -2729,7 +2729,7 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 -#, fuzzy, java-format +#, java-format msgid "Removing reference from relation {0}" -msgstr "Borrar realmente a selección da relación {0}?" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 @@ -3092,14 +3092,14 @@ msgstr "Advertencia: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3107,5 +3107,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3456,7 +3456,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 #, java-format @@ -3498,7 +3496,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 -#, fuzzy msgid "Not Found" -msgstr "Ficheiro non atopado" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 @@ -3812,9 +3809,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289 msgid "(no object)" msgstr "(sen obxecto)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416 msgid "User:" msgstr "" @@ -4283,5 +4280,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "borrado" @@ -4382,5 +4379,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4427,6 +4424,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 @@ -4440,6 +4437,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4497,34 +4494,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115 msgid "Conflicts when combining primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121 #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257 msgid "No conflicts to resolve" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 @@ -4542,23 +4539,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66 msgid "Choose a value" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 -msgid "Please decided which values to keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68 +msgid "Please decide which values to keep" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73 #, java-format msgid "Value ''{0}'' is going to be applied for key ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79 #, java-format msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84 #, java-format msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" @@ -4602,7 +4599,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "Paste ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "From ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "To ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:444 +#, java-format +msgid "{0} tag" +msgid_plural "{0} tags" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 #, java-format @@ -4612,7 +4629,5 @@ msgstr[1] "{0} vías" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format @@ -4622,26 +4637,4 @@ msgstr[1] "{0} relacións" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "Paste ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "From ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "To ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425 -#, java-format -msgid "{0} tag" -msgid_plural "{0} tags" -msgstr[0] "" -msgstr[1] "" - #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 #, java-format @@ -4707,4 +4700,12 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 msgid "Decision" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42 +msgid "Please select the values to keep for the following tags." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 +msgid "Show tags with conflicts only" msgstr "" @@ -4724,5 +4725,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 @@ -4817,5 +4818,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -4972,6 +4973,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323 #, java-format msgid "This will change up to {0} object." @@ -4980,22 +4981,22 @@ msgstr[1] "Esto cambiará ata {0} obxectos." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149 msgid "An empty value deletes the key." msgstr "Un valor vacío borra a clave." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347 msgid "Change values?" msgstr "Cambiar valores?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264 #, java-format msgid "Change properties of up to {0} object" @@ -5004,70 +5005,70 @@ msgstr[1] "Cambiar as propiedades de ata {0} obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 msgid "Please select a key" msgstr "Por favor, selecciona unha tecla" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335 msgid "Please select a value" msgstr "Por favor selecciona un valor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447 msgid "Please select the objects you want to change properties for." msgstr "" "Por favor selecciona os obxectos dos que queres cambiar as propiedades." +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 msgid "Properties for selected objects." msgstr "Propiedades dos obxectos seleccionados." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 msgid "Member Of" msgstr "Membro de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576 msgid "Add Properties" msgstr "Engadir Propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 msgid "Add a new key/value pair to all objects" msgstr "Engadir un novo par clave/valor para todos os obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Edit Properties" msgstr "Editar Propiedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 msgid "Edit the value of the selected key for all objects" msgstr "Editar o valor da clave seleccionada para todos os obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799 msgid "Properties / Memberships" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Change relation" msgstr "Cambiar relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Borrar realmente a selección da relación {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860 msgid "Delete the selected key in all objects" msgstr "Borrar a clave seleccionada en todos os obxectos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862 msgid "Delete Properties" msgstr "Borrar Propiedades" @@ -5109,7 +5110,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 -#, fuzzy msgid "Set the current selection to the list of selected relations" -msgstr "A selección actual non pode ser usada para a separación." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5150,9 +5150,9 @@ msgstr "Selección: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307 msgid "Undock the panel" msgstr "Desacoplar o panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5161,5 +5161,5 @@ "da esquerda." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332 msgid "Click to minimize/maximize the panel content" msgstr "Facer click para minimizar/maximizar o contido do panel" @@ -6583,5 +6583,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 #: build/trans_presets.java:67 build/trans_presets.java:103 #: build/trans_presets.java:143 build/trans_presets.java:180 @@ -6959,7 +6959,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -#, fuzzy msgid "Save/Upload and Exit" -msgstr "Gardar e Sair" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 @@ -6968,7 +6967,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -#, fuzzy msgid "Save/Upload and Delete" -msgstr "Subida de datos cancelada" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 @@ -7182,5 +7180,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7532,9 +7530,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 -#, fuzzy, java-format +#, java-format msgid "There was {0} conflict detected." msgid_plural "There were {0} conflicts detected." -msgstr[0] "Detectado un conflito" -msgstr[1] "Detectado un conflito" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 @@ -7550,7 +7548,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 -#, fuzzy msgid "Conflicts detected" -msgstr "Detectado un conflito" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 @@ -7897,5 +7894,5 @@ msgstr "Calibración do grabador de voz" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Cor" @@ -8908,5 +8905,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313 msgid "Parse error: invalid document structure for GPX document." msgstr "Erro de análise: estrutura de documento non válida para documento gpx" @@ -9087,19 +9084,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9565,7 +9562,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' must not be null" -msgstr "o parámetro \"{0}\" debe non ser nulo" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 @@ -10284,69 +10281,73 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911 +msgid "Starting and ending numbers must be the same for alphabetic addresses" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943 msgid "Starting address number must be less than ending address number" msgstr "" @@ -19872,13 +19873,11 @@ #: build/trans_presets.java:2296 -#, fuzzy msgid "observation" -msgstr "Información" +msgstr "" #. #: build/trans_presets.java:2298 -#, fuzzy msgid "Height (meters)" -msgstr "Lonxitude máxima (metros)" +msgstr "" #. item "Man Made/Tower" text "Operator" @@ -19946,7 +19945,6 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "sewage" -msgstr "uso" +msgstr "" #: build/trans_presets.java:2330 @@ -19963,7 +19961,6 @@ #: build/trans_presets.java:2331 -#, fuzzy msgid "overground" -msgstr "fondo" +msgstr "" #: build/trans_presets.java:2333 @@ -20108,17 +20105,14 @@ #. item "Man Made/Power Tower" combo "Type" #: build/trans_presets.java:2398 -#, fuzzy msgid "tower" -msgstr "Máis lento" +msgstr "" #: build/trans_presets.java:2398 -#, fuzzy msgid "pole" -msgstr "Papel" +msgstr "" #: build/trans_presets.java:2399 -#, fuzzy msgid "Tower reference" -msgstr "Preferencias" +msgstr "" #. item "Man Made/Power Tower" text "Tower reference" @@ -20136,7 +20130,6 @@ #. item "Man Made/Power Line" label "Edit Power Line" #: build/trans_presets.java:2405 -#, fuzzy msgid "Line type" -msgstr "tipo" +msgstr "" #. item "Man Made/Power Line" combo "Line type" @@ -20166,17 +20159,14 @@ #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" #: build/trans_presets.java:2410 -#, fuzzy msgid "single" -msgstr "cadea" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "double" -msgstr "Papel" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "triple" -msgstr "Ficheiro" +msgstr "" #: build/trans_presets.java:2410 @@ -26075,13 +26065,4 @@ msgstr "" -#~ msgid "Combine Anyway" -#~ msgstr "Combinar de todas formas" - -#~ msgid "Purging 1 primitive" -#~ msgstr "Purgando 1 primitiva" - -#~ msgid "Empty member in relation." -#~ msgstr "Membro vacío na relación." - #~ msgid "" #~ "Server returned internal error. Try a reduced area or retry after waiting " @@ -26273,4 +26254,7 @@ #~ msgstr "Algúns dos nodos están (case) na liña" +#~ msgid "Combine Anyway" +#~ msgstr "Combinar de todas formas" + #~ msgid "All the ways were empty" #~ msgstr "Todas as vías están vacías" @@ -26349,4 +26333,7 @@ #~ msgid "true" #~ msgstr "verdadeiro" + +#~ msgid "Empty member in relation." +#~ msgstr "Membro vacío na relación." #~ msgid "EPSG:4326" @@ -26410,4 +26397,7 @@ #~ msgstr "Actualización fallida" +#~ msgid "Purging 1 primitive" +#~ msgstr "Purgando 1 primitiva" + #~ msgid "nodes" #~ msgstr "nodos" Index: /applications/editors/josm/i18n/po/he.po =================================================================== --- /applications/editors/josm/i18n/po/he.po (revision 17945) +++ /applications/editors/josm/i18n/po/he.po (revision 17946) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 16:38+0200\n" +"POT-Creation-Date: 2009-10-02 22:03+0200\n" "PO-Revision-Date: 2009-09-22 14:53+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-28 14:34+0000\n" +"X-Launchpad-Export-Date: 2009-10-02 19:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -47,5 +47,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -90,9 +90,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -147,5 +147,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 @@ -332,5 +332,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -342,12 +342,12 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -369,5 +369,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 @@ -456,9 +456,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -493,6 +493,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -622,22 +622,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 msgid "Combine Way" msgstr "שלב דרכים" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine several ways into one." msgstr "שלב מספר דרכים לאחת." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Change directions?" msgstr "לשנות כיוונים?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 msgid "Reverse and Combine" msgstr "הפוך כיוון ואחד" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -645,5 +645,5 @@ msgstr "לא ניתן לשלב את הדרכים בכיווניהם הנוכחיים. האם ברצונך להפוך כמה מהם?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -651,10 +651,10 @@ msgstr "לא ניתן לשלב דרכים (לא ניתן למזג אותן למחרוזת אחת של צמתים)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "שלב {0} דרכים" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "נא בחר לפחות שתי דרכים לשילוב." @@ -700,5 +700,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -766,5 +766,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333 msgid "OK" @@ -849,8 +849,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -886,5 +886,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 @@ -956,5 +956,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1042,22 +1042,22 @@ msgstr "מזג את השכבה הנוכחית לתוך שכבה אחרת" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 msgid "Merge Nodes" msgstr "מיזוג צמתים" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge nodes into the oldest one." msgstr "מזג את הצמתים לישנים ביותר." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Please select at least two nodes to merge." msgstr "אנא בחר לפחות שני צמתים למיזוג." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "לא ניתן למזג צמתים: יש למחוק דרך שעדיין בשימוש." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261 #, java-format msgid "Merge {0} nodes" @@ -1234,5 +1234,5 @@ msgstr "החל תגיות של תוכן מחוצץ ההדבקה על כל הפריטים הנבחרים." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106 #, java-format msgid "Pasting {0} tag" @@ -1241,5 +1241,5 @@ msgstr[1] "מדביק תגים {0}" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107 #, java-format msgid "to {0} primitive" @@ -1858,7 +1858,6 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 -#, fuzzy msgid "No data found in this area." -msgstr "לא נמצאו נתונים על מכשיר." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2118,53 +2117,53 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a search string." msgstr "נא הזן מחרוזת לחיפוש." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 msgid "replace selection" msgstr "החלפת הבחירה" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "add to selection" msgstr "הוספה לבחירה" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75 msgid "remove from selection" msgstr "הסר מהבחירה" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 msgid "case sensitive" msgstr "רגיש להבדל בין אותיות גדולות וקטנות" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "regular expression" msgstr "ביטוי רגולרי" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "רחוב אבג-'רחוב' ו'אבג' בכל מפתח או שם." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"רחוב אבג\"-'רחוב אבג' בכל מפתח או שם." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:אבג-'אבג' איפשהו בשם." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route-מפתח 'type' עם הערך 'route' במדוייק." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2174,72 +2173,72 @@ "*=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:אבג-ללא 'אבג' בשם." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "foot: - key=foot set to any value." msgstr "foot:-מפתח 'foot' עם כל ערך." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "Special targets:" msgstr "מטרות מיוחדות:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "" "type: - type of the object (node, way, relation)" msgstr "type:-סוג העצם (נקודה, דרך, יחס)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "user:... - all objects changed by user" msgstr "user:...-כל העצמים ששונו ע\"י המשתמש" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "id:... - object with given ID (0 for new objects)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "nodes:... - object with given number of nodes" msgstr "nodes:...-עצמים עם מספר הנקודות הנתון" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "modified - all changed objects" msgstr "modified...- כל העצמים ששונו" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "selected - all selected objects" msgstr "selected - כל העצמים הבחורים" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "incomplete - all incomplete objects" msgstr "incomplete - כל העצמים הבלתי גמורים" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 msgid "untagged - all untagged objects" msgstr "untagged - כל העצמים הלא מתוייגים" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "Use | or OR to combine with logical or" msgstr "השתמש ב-| או OR כדי לחבר ב\"או\" לוגי" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "Use ( and ) to group expressions" msgstr "השתמש ב-( ו ) כדי לצרף ביטויים" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2249,51 +2248,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "חפש" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Start Search" msgstr "התחל חיפוש" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 #, java-format msgid "No match found for ''{0}''" msgstr "לא נמצאה התאמה עבור \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "דבר לא נוסף לבחירה ע\"י חיפוש \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "דבר לא הורד מהבחירה ע\"י חיפוש \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, java-format -msgid "Nothing find in selection by searching for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254 +#, fuzzy, java-format +msgid "Nothing found in selection by searching for ''{0}''" +msgstr "דבר לא נוסף לבחירה ע\"י חיפוש \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264 #, java-format msgid "Found {0} matches" msgstr "נמצאו {0} התאמות" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 msgid "RX" msgstr "RX" @@ -2606,5 +2605,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 msgid "Delete from relation" msgstr "מחק מיחס" @@ -2657,12 +2656,12 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 -#, fuzzy, java-format +#, java-format msgid "Purged object ''{0}''" -msgstr "הזז פריטים {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 -#, fuzzy, java-format +#, java-format msgid "Purged {0} objects" -msgstr "שנה עצם {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 @@ -2674,7 +2673,7 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 -#, fuzzy, java-format +#, java-format msgid "Removing reference from relation {0}" -msgstr "באמת מחק את הבחירה מהיחס {0}?" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 @@ -3035,14 +3034,14 @@ msgstr "אזהרה: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3050,5 +3049,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3396,7 +3395,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 #, java-format @@ -3438,7 +3435,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 -#, fuzzy msgid "Not Found" -msgstr "לא מחובר" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 @@ -3750,9 +3746,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289 msgid "(no object)" msgstr "(אין עצם)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416 msgid "User:" msgstr "" @@ -4224,5 +4220,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "מחוק" @@ -4323,5 +4319,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4368,6 +4364,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 @@ -4381,6 +4377,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4438,34 +4434,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115 msgid "Conflicts when combining primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121 #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257 msgid "No conflicts to resolve" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 @@ -4483,23 +4479,23 @@ msgstr "הכל" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66 msgid "Choose a value" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 -msgid "Please decided which values to keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68 +msgid "Please decide which values to keep" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73 #, java-format msgid "Value ''{0}'' is going to be applied for key ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79 #, java-format msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84 #, java-format msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" @@ -4543,7 +4539,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "Paste ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "From ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "To ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:444 +#, java-format +msgid "{0} tag" +msgid_plural "{0} tags" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 #, java-format @@ -4553,7 +4569,5 @@ msgstr[1] "{0} דרכים" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format @@ -4563,26 +4577,4 @@ msgstr[1] "יחסים" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "Paste ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "From ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "To ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425 -#, java-format -msgid "{0} tag" -msgid_plural "{0} tags" -msgstr[0] "" -msgstr[1] "" - #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 #, java-format @@ -4649,4 +4641,13 @@ msgid "Decision" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42 +msgid "Please select the values to keep for the following tags." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 +#, fuzzy +msgid "Show tags with conflicts only" +msgstr "נקודות (עם התנגשויות)" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4665,5 +4666,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 @@ -4756,5 +4757,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -4910,6 +4911,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323 #, java-format msgid "This will change up to {0} object." @@ -4918,22 +4919,22 @@ msgstr[1] "זה ישנה עד {0} עצמים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149 msgid "An empty value deletes the key." msgstr "ערך ריק מוחק את המפתח." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108 msgid "" msgstr "<שונה>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347 msgid "Change values?" msgstr "לשנות ערכים?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264 #, java-format msgid "Change properties of up to {0} object" @@ -4942,69 +4943,69 @@ msgstr[1] "שנה תכונות של עד {0} עצמים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 msgid "Please select a key" msgstr "נא בחר מפתח" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335 msgid "Please select a value" msgstr "נא בחר ערך" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447 msgid "Please select the objects you want to change properties for." msgstr "בחר את העצמים שאתה רוצה לשנות את תכונותיהם." +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "תכונות\\חברויות" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 msgid "Properties for selected objects." msgstr "תכונות לעצמים שנבחרו." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 msgid "Member Of" msgstr "חבר ב" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576 msgid "Add Properties" msgstr "הוסף תכונות" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 msgid "Add a new key/value pair to all objects" msgstr "הוסף מצד מפתח/ערך לכל הפריטים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Edit Properties" msgstr "ערוך מאפיינים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 msgid "Edit the value of the selected key for all objects" msgstr "ערוך את הערך של המפתח הנבחר עבור כל הפריטים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "תכונות: {0} \\ חברויות: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799 msgid "Properties / Memberships" msgstr "תכונות \\ חברויות" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Change relation" msgstr "שנה יחס" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 #, java-format msgid "Really delete selection from relation {0}?" msgstr "באמת מחק את הבחירה מהיחס {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860 msgid "Delete the selected key in all objects" msgstr "מחק את המפתח הנבחר בכל הפריטים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862 msgid "Delete Properties" msgstr "מחק מאפיינים" @@ -5046,7 +5047,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 -#, fuzzy msgid "Set the current selection to the list of selected relations" -msgstr "הבחירה הנוכחית אינה יכולה לשמש לפיצול." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5087,14 +5087,14 @@ msgstr "בחירה: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307 msgid "Undock the panel" msgstr "\"שחרר\" את הפאנל" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "סגור את הפאנל. ניתן לפתוח אותו מחדש בעזרת הכפתורים בסרגל הכלים השמאלי." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332 msgid "Click to minimize/maximize the panel content" msgstr "לחץ כדי למזער \\ למקסם את תוכן הפאנל" @@ -6513,5 +6513,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 #: build/trans_presets.java:67 build/trans_presets.java:103 #: build/trans_presets.java:143 build/trans_presets.java:180 @@ -6889,7 +6889,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -#, fuzzy msgid "Save/Upload and Exit" -msgstr "שמור וצא" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 @@ -7111,5 +7110,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7461,9 +7460,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 -#, fuzzy, java-format +#, java-format msgid "There was {0} conflict detected." msgid_plural "There were {0} conflicts detected." -msgstr[0] "נמצאו {0} התנגשויות במהלך היבוא" -msgstr[1] "נמצאו {0} התנגשויות במהלך היבוא" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 @@ -7479,7 +7478,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 -#, fuzzy msgid "Conflicts detected" -msgstr "התגלתה התנגשות" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 @@ -7806,5 +7804,5 @@ msgstr "כיול רשם קול" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "צבע" @@ -8770,5 +8768,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313 msgid "Parse error: invalid document structure for GPX document." msgstr "שגיאת ניתוח. למסמך gpx מבנה לא תקין." @@ -8947,19 +8945,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9421,7 +9419,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' must not be null" -msgstr "פרמטר ''{0}'' אינו יכול להיות אפס" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 @@ -10135,69 +10133,73 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911 +msgid "Starting and ending numbers must be the same for alphabetic addresses" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943 msgid "Starting address number must be less than ending address number" msgstr "" @@ -19723,24 +19725,20 @@ #. item "Man Made/Tower" text "Name" #: build/trans_presets.java:2296 -#, fuzzy msgid "Tower type" -msgstr "מגדל" +msgstr "" #. item "Man Made/Tower" combo "Tower type" #: build/trans_presets.java:2296 -#, fuzzy msgid "communication" -msgstr "מיקום" +msgstr "" #: build/trans_presets.java:2296 -#, fuzzy msgid "observation" -msgstr "הגבהה" +msgstr "" #. #: build/trans_presets.java:2298 -#, fuzzy msgid "Height (meters)" -msgstr "אורך מירבי (מטרים)" +msgstr "" #. item "Man Made/Tower" text "Operator" @@ -19800,7 +19798,6 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "oil" -msgstr "שירותים" +msgstr "" #: build/trans_presets.java:2330 build/trans_presets.java:2372 @@ -19809,27 +19806,22 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "sewage" -msgstr "שימוש" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "heat" -msgstr "בריאות" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "any substance" -msgstr "A ע\"י מרחק" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "underwater" -msgstr "מים" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "overground" -msgstr "אדמה" +msgstr "" #: build/trans_presets.java:2333 @@ -19974,17 +19966,14 @@ #. item "Man Made/Power Tower" combo "Type" #: build/trans_presets.java:2398 -#, fuzzy msgid "tower" -msgstr "מגדל" +msgstr "" #: build/trans_presets.java:2398 -#, fuzzy msgid "pole" -msgstr "תפקיד" +msgstr "" #: build/trans_presets.java:2399 -#, fuzzy msgid "Tower reference" -msgstr "העדפות" +msgstr "" #. item "Man Made/Power Tower" text "Tower reference" @@ -20002,13 +19991,11 @@ #. item "Man Made/Power Line" label "Edit Power Line" #: build/trans_presets.java:2405 -#, fuzzy msgid "Line type" -msgstr "סוג מסלול" +msgstr "" #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2405 -#, fuzzy msgid "line" -msgstr "צינור" +msgstr "" #: build/trans_presets.java:2405 @@ -20033,22 +20020,18 @@ #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" #: build/trans_presets.java:2410 -#, fuzzy msgid "single" -msgstr "זווית" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "double" -msgstr "תפקיד" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "triple" -msgstr "קובץ" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "quad" -msgstr "מחצבה" +msgstr "" #: build/trans_presets.java:2413 @@ -25943,9 +25926,53 @@ msgstr "" +#~ msgid "Move" +#~ msgstr "הזז" + +#~ msgid "Data Layer" +#~ msgstr "שכבת נתונים" + +#~ msgid "No data imported." +#~ msgstr "לא יובאו נתונים." + +#~ msgid "No document open so nothing to save." +#~ msgstr "אין כל מסמך פתוח ולכן אין מה לשמור." + +#~ msgid "Unknown file extension." +#~ msgstr "סיומת הקובץ אינה ידועה." + +#~ msgid "Email" +#~ msgstr "דוא\"ל" + +#~ msgid "Resolve Conflicts" +#~ msgstr "פתור התנגשויות" + +#~ msgid "There were conflicts during import." +#~ msgstr "ארעו התנגשויות במהלך הייבוא." + +#~ msgid "Unsaved Changes" +#~ msgstr "שינויים לא שמורים" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "לא ניתן לפתוח את תיקיית ההעדפות: {0}" + +#~ msgid "their version:" +#~ msgstr "הגירסה שלהם:" + +#~ msgid "resolved version:" +#~ msgstr "הגירסה הפתורה:" + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "קיימות התנגשויות עם פריט {0}:" +#~ msgstr[1] "קיימות התנגשויות עם {0} פריטים:" + +#~ msgid "my version:" +#~ msgstr "הגירסה שלי:" + +#~ msgid "Object" +#~ msgstr "פריט" + #~ msgid "Combine ways with different memberships?" #~ msgstr "לשלב שתי דרכים בעלות חברויות שונות?" - -#~ msgid "Combine Anyway" -#~ msgstr "אחד בכל זאת" #~ msgid "" @@ -25954,54 +25981,4 @@ #~ msgstr "" #~ "לדרכים הנבחרות ישנם יחסים משתנים. האם אתה עדיין מעוניין לשלב ביניהם?" - -#~ msgid "Empty member in relation." -#~ msgstr "איבר ריק ביחס." - -#~ msgid "Move" -#~ msgstr "הזז" - -#~ msgid "Data Layer" -#~ msgstr "שכבת נתונים" - -#~ msgid "No data imported." -#~ msgstr "לא יובאו נתונים." - -#~ msgid "No document open so nothing to save." -#~ msgstr "אין כל מסמך פתוח ולכן אין מה לשמור." - -#~ msgid "Unknown file extension." -#~ msgstr "סיומת הקובץ אינה ידועה." - -#~ msgid "Email" -#~ msgstr "דוא\"ל" - -#~ msgid "Resolve Conflicts" -#~ msgstr "פתור התנגשויות" - -#~ msgid "There were conflicts during import." -#~ msgstr "ארעו התנגשויות במהלך הייבוא." - -#~ msgid "Unsaved Changes" -#~ msgstr "שינויים לא שמורים" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "לא ניתן לפתוח את תיקיית ההעדפות: {0}" - -#~ msgid "their version:" -#~ msgstr "הגירסה שלהם:" - -#~ msgid "resolved version:" -#~ msgstr "הגירסה הפתורה:" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "קיימות התנגשויות עם פריט {0}:" -#~ msgstr[1] "קיימות התנגשויות עם {0} פריטים:" - -#~ msgid "my version:" -#~ msgstr "הגירסה שלי:" - -#~ msgid "Object" -#~ msgstr "פריט" #~ msgid "All the ways were empty" @@ -26190,4 +26167,7 @@ #~ msgstr "פתור {0} התנגשויות ב{1} עצמים" +#~ msgid "Empty member in relation." +#~ msgstr "איבר ריק ביחס." + #~ msgid "Remove Selected" #~ msgstr "הסרת הנבחרים" @@ -26217,4 +26197,7 @@ #~ "" +#~ msgid "Combine Anyway" +#~ msgstr "אחד בכל זאת" + #~ msgid "Merge Anyway" #~ msgstr "מזג בכל זאת" Index: /applications/editors/josm/i18n/po/is.po =================================================================== --- /applications/editors/josm/i18n/po/is.po (revision 17945) +++ /applications/editors/josm/i18n/po/is.po (revision 17946) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 16:38+0200\n" -"PO-Revision-Date: 2009-09-28 13:34+0000\n" +"POT-Creation-Date: 2009-10-02 22:03+0200\n" +"PO-Revision-Date: 2009-09-28 17:18+0000\n" "Last-Translator: Ævar Arnfjörð Bjarmason \n" "Language-Team: Icelandic \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-28 14:33+0000\n" +"X-Launchpad-Export-Date: 2009-10-02 19:25+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -47,5 +47,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -90,9 +90,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -147,5 +147,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 @@ -329,5 +329,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -339,12 +339,12 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -366,5 +366,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 @@ -453,9 +453,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -490,6 +490,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -619,22 +619,22 @@ msgstr "Niðurhel lista yfir opin breytingarsett ..." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 msgid "Combine Way" msgstr "Sameina vegi" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine several ways into one." msgstr "Sameina marga vegi í einn." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Change directions?" msgstr "Skipta um átt?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 msgid "Reverse and Combine" msgstr "Skipta um átt og sameina" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -644,5 +644,5 @@ "haldist sér. Vilt þú skipta um átt sumra þeirra?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -652,10 +652,10 @@ "að sameina þá þurfa þeir að vera ein samfelld röð af hnútum" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Sameina {0} vegi" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Vinsamlegast veldu a.m.k. tvo vegi til að sameina." @@ -700,5 +700,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -766,5 +766,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333 msgid "OK" @@ -849,8 +849,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -886,5 +886,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 @@ -956,5 +956,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1042,22 +1042,22 @@ msgstr "Sameina það lag sem nú er valið öðru lagi" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 msgid "Merge Nodes" msgstr "Sameina hnúta" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge nodes into the oldest one." msgstr "Sameina valda hnúta á staðsetningu þess elsta." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Please select at least two nodes to merge." msgstr "Veldu minnst tvo hnúta til að sameina." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "Gat ekki sameinað hnúta: Hefði þurft að eyða veg sem enn er í notkun." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261 #, java-format msgid "Merge {0} nodes" @@ -1234,5 +1234,5 @@ msgstr "Líma eigindi hluta á klemmuborðinu á alla valda hluti." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106 #, java-format msgid "Pasting {0} tag" @@ -1241,5 +1241,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107 #, java-format msgid "to {0} primitive" @@ -2120,37 +2120,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a search string." msgstr "Sláðu inn leitarstreng" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 msgid "replace selection" msgstr "skipta út vali" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "add to selection" msgstr "bæta við val" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75 msgid "remove from selection" msgstr "fjarlæga úr vali" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 msgid "case sensitive" msgstr "stafsetursnæmt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "regular expression" msgstr "regluleg segð" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "" @@ -2158,18 +2158,18 @@ "gildi." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "" "\"Gamla Hringbraut\" - „Gamla Hringbraut“ í einhverjum lykli og gildi." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Gam - „Gam“ kemur fyrir í nafninu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - lykilinn „type“ með gildið „route“." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2179,17 +2179,17 @@ "*=gildi, type=, *=* og *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Gam - „Gam“ kemur ekki fyrir í nafninu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "foot: - key=foot set to any value." msgstr "foot: - Lykillinn „foot“ með eitthvað gildi." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "Special targets:" msgstr "Sérleitir:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "" "type: - type of the object (node, way, relation)" @@ -2198,47 +2198,47 @@ "fyrir hnút, veg og vensl" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "user:... - all objects changed by user" msgstr "user:... - Hlutir sem breytt hefur verið af gefnum notanda" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - hlutur með þessa kennitölu (0 fyrir nýja hluti)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - Hlutur með gefið marga hnúta (t.d. „5“ eða „7-9“)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "modified - all changed objects" msgstr "modified - Hlutum sem breytt hefur verið" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "selected - all selected objects" msgstr "selected - Valdir hlutir" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "incomplete - all incomplete objects" msgstr "incomplete - Ókláraðir hlutir" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 msgid "untagged - all untagged objects" msgstr "untagged - Hlutir án eiginda" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 msgid "" "child expr - all children of objects matching the expression" msgstr "child segð - allir undirhlutir sem passa við segðina" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "" "parent expr - all parents of objects matching the expression" msgstr "parent segð - allir yfirhlutir sem passa við segðina" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "Use | or OR to combine with logical or" msgstr "Notaðu | eða OR t.d. „A | B“ til að leita að A eða B" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2246,9 +2246,9 @@ "„:“ eða „ “" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "Use ( and ) to group expressions" msgstr "Notaðu ( og ) til að sameina segðir" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2258,51 +2258,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Leit" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Start Search" msgstr "Hefja leit" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 #, java-format msgid "No match found for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, java-format -msgid "Nothing find in selection by searching for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254 +#, java-format +msgid "Nothing found in selection by searching for ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264 #, java-format msgid "Found {0} matches" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CS" msgstr "stafsetursnæmt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CI" msgstr "stafsetursónæmt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 msgid "RX" msgstr "" @@ -2612,5 +2612,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 msgid "Delete from relation" msgstr "Fjarlægja úr venslum" @@ -2667,12 +2667,12 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 -#, fuzzy, java-format +#, java-format msgid "Purged object ''{0}''" -msgstr "Nota forstillinguna „{0}“" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 -#, fuzzy, java-format +#, java-format msgid "Purged {0} objects" -msgstr "Breyta {0} hlut" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 @@ -2684,7 +2684,7 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 -#, fuzzy, java-format +#, java-format msgid "Removing reference from relation {0}" -msgstr "Eyða valinu úr venslunum {0}?" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 @@ -3045,14 +3045,14 @@ msgstr "Viðvörun: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3060,5 +3060,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3406,7 +3406,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 #, java-format @@ -3448,7 +3446,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 -#, fuzzy msgid "Not Found" -msgstr "Skrá fannst ekki" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 @@ -3754,9 +3751,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289 msgid "(no object)" msgstr "(enginn hlutur)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416 msgid "User:" msgstr "" @@ -4220,5 +4217,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "" @@ -4319,5 +4316,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4364,6 +4361,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 @@ -4377,6 +4374,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4434,34 +4431,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115 msgid "Conflicts when combining primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121 #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257 msgid "No conflicts to resolve" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 @@ -4479,23 +4476,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66 msgid "Choose a value" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 -msgid "Please decided which values to keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68 +msgid "Please decide which values to keep" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73 #, java-format msgid "Value ''{0}'' is going to be applied for key ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79 #, java-format msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84 #, java-format msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" @@ -4539,7 +4536,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "Paste ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "From ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "To ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:444 +#, java-format +msgid "{0} tag" +msgid_plural "{0} tags" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 #, java-format @@ -4549,7 +4566,5 @@ msgstr[1] "{0} vegir" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format @@ -4558,26 +4573,4 @@ msgstr[0] "{0} vensl" msgstr[1] "{0} vensl" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "Paste ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "From ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "To ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425 -#, java-format -msgid "{0} tag" -msgid_plural "{0} tags" -msgstr[0] "" -msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 @@ -4646,4 +4639,13 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42 +#, fuzzy +msgid "Please select the values to keep for the following tags." +msgstr "Veldu þau breytingarsett sem þú vilt loka" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 +msgid "Show tags with conflicts only" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -4661,5 +4663,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 @@ -4752,5 +4754,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -4906,6 +4908,6 @@ msgstr "Upplýsingar um lag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323 #, java-format msgid "This will change up to {0} object." @@ -4914,22 +4916,22 @@ msgstr[1] "Allt að {0} hlutum verður breytt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149 msgid "An empty value deletes the key." msgstr "Tómt gildi eyðir lyklinum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347 msgid "Change values?" msgstr "Breyta eigindum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264 #, java-format msgid "Change properties of up to {0} object" @@ -4938,69 +4940,69 @@ msgstr[1] "Breyta eigindum allt að {0} hluta" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 msgid "Please select a key" msgstr "Veldu lykil" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335 msgid "Please select a value" msgstr "Veldu gildi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447 msgid "Please select the objects you want to change properties for." msgstr "Veldu hluti til að breyta eigindum þeirra." +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "Eigindi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 msgid "Properties for selected objects." msgstr "Eigindi valdra hluta." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 msgid "Member Of" msgstr "Stak í" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576 msgid "Add Properties" msgstr "Bæti vað eigindum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 msgid "Add a new key/value pair to all objects" msgstr "Bæta nýjum eigindum við valda hluti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Edit Properties" msgstr "Breyta eigindum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 msgid "Edit the value of the selected key for all objects" msgstr "Breyta gildi valins lykils í öllum völdum hlutum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799 msgid "Properties / Memberships" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Change relation" msgstr "Breyta venslum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Eyða valinu úr venslunum {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860 msgid "Delete the selected key in all objects" msgstr "Eyða völdum lykil í öllum völdum hlutum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862 msgid "Delete Properties" msgstr "Eyða eigindum" @@ -5042,7 +5044,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 -#, fuzzy msgid "Set the current selection to the list of selected relations" -msgstr "Opna ritil til að breyta völdum venslum" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5083,9 +5084,9 @@ msgstr "Val: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307 msgid "Undock the panel" msgstr "Opna þessa stiku sem glugga" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5094,5 +5095,5 @@ "vinstri tólastikunni." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332 msgid "Click to minimize/maximize the panel content" msgstr "Smelltu til að minnka/hámarka innihald stikunnar" @@ -6517,5 +6518,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 #: build/trans_presets.java:67 build/trans_presets.java:103 #: build/trans_presets.java:143 build/trans_presets.java:180 @@ -6893,7 +6894,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -#, fuzzy msgid "Save/Upload and Exit" -msgstr "Vista og hætta" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 @@ -6902,7 +6902,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -#, fuzzy msgid "Save/Upload and Delete" -msgstr "Vista og eyða" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 @@ -7120,5 +7119,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7482,7 +7481,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 -#, fuzzy msgid "Conflicts detected" -msgstr "Árekstrar" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 @@ -7809,5 +7807,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Litur" @@ -8776,5 +8774,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313 msgid "Parse error: invalid document structure for GPX document." msgstr "" @@ -8953,19 +8951,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10149,69 +10147,73 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911 +msgid "Starting and ending numbers must be the same for alphabetic addresses" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943 msgid "Starting address number must be less than ending address number" msgstr "" @@ -19718,24 +19720,20 @@ #. item "Man Made/Tower" text "Name" #: build/trans_presets.java:2296 -#, fuzzy msgid "Tower type" -msgstr "Turn" +msgstr "" #. item "Man Made/Tower" combo "Tower type" #: build/trans_presets.java:2296 -#, fuzzy msgid "communication" -msgstr "Hringtorg" +msgstr "" #: build/trans_presets.java:2296 -#, fuzzy msgid "observation" -msgstr "Hæð (y/s)" +msgstr "" #. #: build/trans_presets.java:2298 -#, fuzzy msgid "Height (meters)" -msgstr "Hámarkshæð (í metrum)" +msgstr "" #. item "Man Made/Tower" text "Operator" @@ -19795,7 +19793,6 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "oil" -msgstr "Salerni" +msgstr "" #: build/trans_presets.java:2330 build/trans_presets.java:2372 @@ -19808,7 +19805,6 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "heat" -msgstr "Leikhús" +msgstr "" #: build/trans_presets.java:2330 @@ -19817,12 +19813,10 @@ #: build/trans_presets.java:2331 -#, fuzzy msgid "underwater" -msgstr "vatn" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "overground" -msgstr "bakgrunnur" +msgstr "" #: build/trans_presets.java:2333 @@ -19967,17 +19961,14 @@ #. item "Man Made/Power Tower" combo "Type" #: build/trans_presets.java:2398 -#, fuzzy msgid "tower" -msgstr "Turn" +msgstr "" #: build/trans_presets.java:2398 -#, fuzzy msgid "pole" -msgstr "Hlutverk" +msgstr "" #: build/trans_presets.java:2399 -#, fuzzy msgid "Tower reference" -msgstr "Tilvísunarnúmer línunnar" +msgstr "" #. item "Man Made/Power Tower" text "Tower reference" @@ -19995,18 +19986,15 @@ #. item "Man Made/Power Line" label "Edit Power Line" #: build/trans_presets.java:2405 -#, fuzzy msgid "Line type" -msgstr "gerð" +msgstr "" #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2405 -#, fuzzy msgid "line" -msgstr "tengd" +msgstr "" #: build/trans_presets.java:2405 -#, fuzzy msgid "minor_line" -msgstr "tengibraut á hraðbraut" +msgstr "" #. item "Man Made/Power Line" text "Line reference" @@ -20017,7 +20005,6 @@ #. item "Man Made/Power Line" text "Voltage" #: build/trans_presets.java:2409 -#, fuzzy msgid "Amount of Cables" -msgstr "Fjöldi víra" +msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" @@ -20028,17 +20015,14 @@ #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" #: build/trans_presets.java:2410 -#, fuzzy msgid "single" -msgstr "Horn" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "double" -msgstr "Hlutverk" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "triple" -msgstr "Skrá" +msgstr "" #: build/trans_presets.java:2410 @@ -25937,9 +25921,60 @@ msgstr "" +#~ msgid "Aborting..." +#~ msgstr "Hætti við..." + +#~ msgid "Unsaved Changes" +#~ msgstr "Óvistaðar breytingar" + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "Uppfæra þarf JOSM til að viðbótin „{0}“ geti verið notuð." + +#~ msgid "OSM username (email)" +#~ msgstr "OSM notandanafn (getur verið tölvupóstfang)" + +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "{0} viðbót var uppfærð. Vinsamlegast endurræstu JOSM." +#~ msgstr[1] "{0} viðbætur voru uppfærðar. Vinsamlegast endurræstu JOSM." + +#~ msgid "Unknown file extension." +#~ msgstr "Óþekkt skráarending" + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Gat ekki halað niður viðbótinni {0} frá {1}" + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "Það kom upp innri villa á þjóninum. Prófaðu að hala niður minna svæði eða " +#~ "reyna síðar." + +#~ msgid "Unknown version" +#~ msgstr "Óþekkt útgáfa" + +#~ msgid "Email" +#~ msgstr "Netfang" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "" +#~ "Þú getur notað músina eða Ctrl+örvarlykla/./ til að þysja og hliðra." + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Bæta völdum hlutum við venslin" + +#~ msgid "unnamed" +#~ msgstr "ónefnt" + +#~ msgid "Conflicts: {0}" +#~ msgstr "Árekstrar: {0}" + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} hlutur hefur árekstra:" +#~ msgstr[1] "{0} hlutir hafa árekstra:" + #~ msgid "Combine ways with different memberships?" #~ msgstr "Sameina vegi sem eru stak í mismunandi venslum?" - -#~ msgid "Combine Anyway" -#~ msgstr "Sameina þá" #~ msgid "" @@ -25950,58 +25985,4 @@ #~ "það?" -#~ msgid "Aborting..." -#~ msgstr "Hætti við..." - -#~ msgid "Unsaved Changes" -#~ msgstr "Óvistaðar breytingar" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "Uppfæra þarf JOSM til að viðbótin „{0}“ geti verið notuð." - -#~ msgid "OSM username (email)" -#~ msgstr "OSM notandanafn (getur verið tölvupóstfang)" - -#~ msgid "{0} Plugin successfully updated. Please restart JOSM." -#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -#~ msgstr[0] "{0} viðbót var uppfærð. Vinsamlegast endurræstu JOSM." -#~ msgstr[1] "{0} viðbætur voru uppfærðar. Vinsamlegast endurræstu JOSM." - -#~ msgid "Unknown file extension." -#~ msgstr "Óþekkt skráarending" - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Gat ekki halað niður viðbótinni {0} frá {1}" - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "Það kom upp innri villa á þjóninum. Prófaðu að hala niður minna svæði eða " -#~ "reyna síðar." - -#~ msgid "Unknown version" -#~ msgstr "Óþekkt útgáfa" - -#~ msgid "Email" -#~ msgstr "Netfang" - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "" -#~ "Þú getur notað músina eða Ctrl+örvarlykla/./ til að þysja og hliðra." - -#~ msgid "Add all currently selected objects as members" -#~ msgstr "Bæta völdum hlutum við venslin" - -#~ msgid "unnamed" -#~ msgstr "ónefnt" - -#~ msgid "Conflicts: {0}" -#~ msgstr "Árekstrar: {0}" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} hlutur hefur árekstra:" -#~ msgstr[1] "{0} hlutir hafa árekstra:" - #~ msgid "sports" #~ msgstr "íþróttir" @@ -26102,4 +26083,7 @@ #~ msgstr "Ekki var náð í nein gögn" +#~ msgid "Combine Anyway" +#~ msgstr "Sameina þá" + #~ msgid "Deleting layer {0} of {1}" #~ msgstr "Eyði lagi {0} af {1}" Index: /applications/editors/josm/i18n/po/it.po =================================================================== --- /applications/editors/josm/i18n/po/it.po (revision 17945) +++ /applications/editors/josm/i18n/po/it.po (revision 17946) @@ -5,6 +5,6 @@ "Project-Id-Version: josm 20081003\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 16:38+0200\n" -"PO-Revision-Date: 2009-09-24 13:52+0000\n" +"POT-Creation-Date: 2009-10-02 22:03+0200\n" +"PO-Revision-Date: 2009-09-28 18:29+0000\n" "Last-Translator: Davide Prade \n" "Language-Team: Italian \n" @@ -13,5 +13,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-28 14:32+0000\n" +"X-Launchpad-Export-Date: 2009-10-02 19:25+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -45,5 +45,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -88,9 +88,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -123,6 +123,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -145,5 +145,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 @@ -333,5 +333,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -343,12 +343,12 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -370,5 +370,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 @@ -458,9 +458,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -495,6 +495,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -624,22 +624,22 @@ msgstr "Scaricamento dei gruppi di modifiche aperti ..." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 msgid "Combine Way" msgstr "Unisci percorso" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine several ways into one." msgstr "Unisce diversi percorsi in uno." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Change directions?" msgstr "Inverti direzione?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 msgid "Reverse and Combine" msgstr "Inverti direzione e unisci" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -649,5 +649,5 @@ "la direzione di qualcuno?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -657,10 +657,10 @@ "di nodi)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Unisci {0} percorsi" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Selezionare almeno due percorsi da unire." @@ -707,5 +707,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -773,5 +773,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333 msgid "OK" @@ -858,8 +858,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -895,5 +895,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 @@ -965,5 +965,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1056,22 +1056,22 @@ msgstr "Unisci il livello corrente con un altro livello" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 msgid "Merge Nodes" msgstr "Fondi nodi" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge nodes into the oldest one." msgstr "Unisci i nuovi nodi in quello più vecchio." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Please select at least two nodes to merge." msgstr "Seleziona almeno due nodi da unire." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "Impossibile unire i nodi. Cancellare un percorso attualmente usato." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261 #, java-format msgid "Merge {0} nodes" @@ -1252,5 +1252,5 @@ msgstr "Applica le etichette memorizzate a tutti gli elementi selezionati" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106 #, java-format msgid "Pasting {0} tag" @@ -1259,5 +1259,5 @@ msgstr[1] "Incollo i tag {0}" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107 #, java-format msgid "to {0} primitive" @@ -1922,7 +1922,6 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 -#, fuzzy msgid "No data found in this area." -msgstr "Nessun dato trovato sul dispositivo." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2197,56 +2196,56 @@ msgstr "Impossibile effettuare la ricerca perché non ci sono dati caricati." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a filter string." msgstr "Inserire una stringa di filtro." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a search string." msgstr "Inserire una stringa di ricerca." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 msgid "replace selection" msgstr "Sostituisci la selezione" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "add to selection" msgstr "Aggiungi alla selezione" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75 msgid "remove from selection" msgstr "Rimuovi dalla selezione" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76 msgid "find in selection" msgstr "cerca nella selezione" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 msgid "case sensitive" msgstr "Distingui maiuscole" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "regular expression" msgstr "espressione regolare" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "" "Via Nazionale - ''Via'' e ''Nazionale'' in qualunque chiave o nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "" "\"Via Nazionale\" - ''Via Nazionale'' in qualunque chiave o nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Naz - ''Naz'' in qualunque punto del nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "type=route - key 'type' with value exactly 'route'." msgstr "" "type=route - chiave 'type' che contiene esattamente il valore 'route'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2256,17 +2255,17 @@ "*=value, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Naz - ''Naz'' non presente all''interno del nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "foot: - key=foot set to any value." msgstr "foot: - chiave=foot impostata con qualunque valore." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "Special targets:" msgstr "Ricerche speciali:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "" "type: - type of the object (node, way, relation)" @@ -2274,33 +2273,33 @@ "type: - tipo dell''oggetto (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "user:... - all objects changed by user" msgstr "user:... - tutti gli oggetti modificati dall''utente" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - oggetto con un dato ID (0 per nuovi oggetti)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - oggetto con un dato numero di nodi" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "modified - all changed objects" msgstr "modified - tutti gli oggetti modificati" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "selected - all selected objects" msgstr "selected - tutti gli oggetti selezionati" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "incomplete - all incomplete objects" msgstr "incomplete - tutti gli oggetti incompleti" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 msgid "untagged - all untagged objects" msgstr "untagged - tutti gli oggetti provi di proprietà" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 msgid "" "child expr - all children of objects matching the expression" @@ -2309,5 +2308,5 @@ "corrispondenti all'espressione" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "" "parent expr - all parents of objects matching the expression" @@ -2316,5 +2315,5 @@ "corrispondenti all'espressione" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "Use | or OR to combine with logical or" msgstr "" @@ -2322,5 +2321,5 @@ "logico ''or''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2328,9 +2327,9 @@ "contiene :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "Use ( and ) to group expressions" msgstr "Utilizzare ( e ) per raggruppare le espressioni" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2340,52 +2339,52 @@ msgstr "Filtro" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Cerca" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Submit filter" msgstr "Invia filtro" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Start Search" msgstr "Inizia Ricerca" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 #, java-format msgid "No match found for ''{0}''" msgstr "Nessuna corrispondenza trovata per ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Nulla è stato aggiunto alla selezione cercando ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Nulla è stato rimosso dalla selezione cercando ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, java-format -msgid "Nothing find in selection by searching for ''{0}''" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254 +#, fuzzy, java-format +msgid "Nothing found in selection by searching for ''{0}''" msgstr "" "Non è stato trovato niente nella selezione durante la ricerca di ''''{0}''''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264 #, java-format msgid "Found {0} matches" msgstr "Trovate {0} corrispondenze" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 msgid "RX" msgstr "RX" @@ -2666,10 +2665,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 -#, fuzzy, java-format +#, java-format msgid "" "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" -"Impossibile annullare il comando \"{0}\" perchè il layer {1} non è più " -"disponibile" #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 @@ -2717,5 +2714,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 msgid "Delete from relation" msgstr "Elimina dalla relazione" @@ -2773,12 +2770,12 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 -#, fuzzy, java-format +#, java-format msgid "Purged object ''{0}''" -msgstr "Sposta oggetti {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 -#, fuzzy, java-format +#, java-format msgid "Purged {0} objects" -msgstr "Modifica {0} oggetto" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 @@ -2790,7 +2787,7 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 -#, fuzzy, java-format +#, java-format msgid "Removing reference from relation {0}" -msgstr "rimozione del riferimento dalla relazione {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 @@ -3157,14 +3154,14 @@ msgstr "Attenzione: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "Era atteso ID >= 0. Ottenuto {0}." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307 msgid "A primitive with ID = 0 can't be invisible." msgstr "Una primitiva con ID = 0 non può essere invisibile." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3172,5 +3169,5 @@ msgstr "Atteso ID > 0 . Ottenuto {0}." -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3527,7 +3524,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 #, java-format @@ -3569,7 +3564,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 -#, fuzzy msgid "Not Found" -msgstr "Non connesso" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 @@ -3890,9 +3884,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289 msgid "(no object)" msgstr "(nessun oggetto)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416 msgid "User:" msgstr "Utente:" @@ -4390,5 +4384,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "cancellato" @@ -4491,5 +4485,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4540,6 +4534,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 @@ -4553,6 +4547,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4612,9 +4606,9 @@ msgstr "Il loro insieme di dati non include una etichetta con la chiave {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115 msgid "Conflicts when combining primitives" msgstr "Conflitti durante l'unione delle primitive" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121 #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" @@ -4622,25 +4616,25 @@ "Conflitti durante l''unione dei percorsi - il percorso unito è ''''{0}''''" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" msgstr "Conflitti durante l''unione dei nodi - il nodo unito è ''''{0}''''" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257 msgid "No conflicts to resolve" msgstr "Nessun conflitto da risolvere" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "Annulla la risoluzione del conflitto" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "Applica i conflitti risolti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 @@ -4658,23 +4652,24 @@ msgstr "tutti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66 msgid "Choose a value" msgstr "Selezionare un valore" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 -msgid "Please decided which values to keep" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68 +#, fuzzy +msgid "Please decide which values to keep" msgstr "Selezionare quali valori mantenere" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73 #, java-format msgid "Value ''{0}'' is going to be applied for key ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79 #, java-format msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84 #, java-format msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" @@ -4718,7 +4713,27 @@ msgstr "Conflitti nelle etichette incollate" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "Paste ..." +msgstr "Incolla ..." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "From ..." +msgstr "Da ..." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "To ..." +msgstr "A ..." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:444 +#, java-format +msgid "{0} tag" +msgid_plural "{0} tags" +msgstr[0] "{0} etichetta" +msgstr[1] "{0} etichette" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 #, java-format @@ -4728,7 +4743,5 @@ msgstr[1] "{0} percorsi" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format @@ -4737,26 +4750,4 @@ msgstr[0] "{0} relazione" msgstr[1] "{0} relazioni" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "Paste ..." -msgstr "Incolla ..." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "From ..." -msgstr "Da ..." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "To ..." -msgstr "A ..." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425 -#, java-format -msgid "{0} tag" -msgid_plural "{0} tags" -msgstr[0] "{0} etichetta" -msgstr[1] "{0} etichette" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 @@ -4828,4 +4819,15 @@ msgstr "Decisione" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42 +#, fuzzy +msgid "Please select the values to keep for the following tags." +msgstr "" +"Selezionare il gruppo di modifiche che si desidera chiudere" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 +#, fuzzy +msgid "Show tags with conflicts only" +msgstr "Nodi(con conflitti)" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -4844,5 +4846,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 @@ -4937,5 +4939,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -5091,6 +5093,6 @@ msgstr "Informazioni sul livello" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323 #, java-format msgid "This will change up to {0} object." @@ -5099,22 +5101,22 @@ msgstr[1] "Questo cambierà {0} oggetti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149 msgid "An empty value deletes the key." msgstr "Un valore vuoto cancella la chiave." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347 msgid "Change values?" msgstr "Cambiare i valori?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264 #, java-format msgid "Change properties of up to {0} object" @@ -5123,69 +5125,69 @@ msgstr[1] "Cambia le proprietà di al massimo {0} oggetti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 msgid "Please select a key" msgstr "Seleziona una chiave" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335 msgid "Please select a value" msgstr "Seleziona un valore" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447 msgid "Please select the objects you want to change properties for." msgstr "Seleziona gli oggetti di cui vuoi cambiare le proprietà." +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "Proprietà/Appartenenze" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 msgid "Properties for selected objects." msgstr "Proprietà per gli oggetti selezionati." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 msgid "Member Of" msgstr "Membro di" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576 msgid "Add Properties" msgstr "Aggiungi proprietà" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 msgid "Add a new key/value pair to all objects" msgstr "Aggiungi una nuova coppia chiave/valore a tutti gli oggetti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Edit Properties" msgstr "Modifica proprietà" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 msgid "Edit the value of the selected key for all objects" msgstr "Modifica il valore della chiave selezionata per tutti gli oggetti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Proprietà: {0} / Appartenenze: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799 msgid "Properties / Memberships" msgstr "Proprietà / Appartenenze" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Change relation" msgstr "Cambia relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Vuoi veramente cancellare la selezione dalla relazione {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860 msgid "Delete the selected key in all objects" msgstr "Cancella la chiave selezionata in tutti gli oggetti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862 msgid "Delete Properties" msgstr "Elimina proprietà" @@ -5228,7 +5230,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 -#, fuzzy msgid "Set the current selection to the list of selected relations" -msgstr "La selezione attuale non può essere usata per la divisione." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5269,9 +5270,9 @@ msgstr "Selezione: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307 msgid "Undock the panel" msgstr "Stacca il pannello" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5280,5 +5281,5 @@ "degli strumenti a sinistra." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332 msgid "Click to minimize/maximize the panel content" msgstr "Cliccare per minimizzare/massimizzare il contenuto del pannello" @@ -6710,5 +6711,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 #: build/trans_presets.java:67 build/trans_presets.java:103 #: build/trans_presets.java:143 build/trans_presets.java:180 @@ -7088,7 +7089,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -#, fuzzy msgid "Save/Upload and Exit" -msgstr "Salva ed Esci" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 @@ -7098,7 +7098,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -#, fuzzy msgid "Save/Upload and Delete" -msgstr "Salva ed elimina" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 @@ -7317,5 +7316,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7672,9 +7671,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 -#, fuzzy, java-format +#, java-format msgid "There was {0} conflict detected." msgid_plural "There were {0} conflicts detected." -msgstr[0] "Ci sono stati {0} conflitti durante l'importazione" -msgstr[1] "Ci sono stati {0} conflitti durante l'importazione" +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 @@ -7690,7 +7689,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 -#, fuzzy msgid "Conflicts detected" -msgstr "Rilevato un conflitto" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 @@ -8046,5 +8044,5 @@ msgstr "Calibrazione del registratore vocale" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Colore" @@ -9070,5 +9068,5 @@ msgstr "Analisi del file \"{0}\" fallita" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313 msgid "Parse error: invalid document structure for GPX document." msgstr "" @@ -9256,19 +9254,19 @@ msgstr "OK - nuovo tentativo." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9749,7 +9747,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' must not be null" -msgstr "il parametro ''{0}'' non deve essere nullo" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 @@ -10495,29 +10493,29 @@ msgstr "Assocerà {0} nodi supplementari per la numerazione degli edifici" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381 msgid "City:" msgstr "Città:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382 msgid "State:" msgstr "Stato:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383 msgid "Post Code:" msgstr "Codice postale:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384 msgid "Country:" msgstr "Nazione:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385 msgid "Full Address:" msgstr "Indirizzo completo:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420 msgid "Optional Information:" msgstr "Informazioni aggiuntive:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600 msgid "Please select a street to associate with address interpolation way" msgstr "" @@ -10525,42 +10523,46 @@ "indirizzi" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613 msgid "Please select address interpolation way for this street" msgstr "" "Selezionare un percorso di interpolazione degli indirizzi per questa strada" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 msgid "Country code must be 2 letters" msgstr "Il codice della nazione deve essere composto da 2 lettere" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911 +msgid "Starting and ending numbers must be the same for alphabetic addresses" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943 msgid "Starting address number must be less than ending address number" msgstr "" @@ -20316,24 +20318,20 @@ #. item "Man Made/Tower" text "Name" #: build/trans_presets.java:2296 -#, fuzzy msgid "Tower type" -msgstr "Tipo di percorso" +msgstr "" #. item "Man Made/Tower" combo "Tower type" #: build/trans_presets.java:2296 -#, fuzzy msgid "communication" -msgstr "collegamento" +msgstr "" #: build/trans_presets.java:2296 -#, fuzzy msgid "observation" -msgstr "Elevazione" +msgstr "" #. #: build/trans_presets.java:2298 -#, fuzzy msgid "Height (meters)" -msgstr "Altezza massima (metri)" +msgstr "" #. item "Man Made/Tower" text "Operator" @@ -20393,7 +20391,6 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "oil" -msgstr "a combustibile fossile" +msgstr "" #: build/trans_presets.java:2330 build/trans_presets.java:2372 @@ -20402,27 +20399,22 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "sewage" -msgstr "uso" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "heat" -msgstr "brughiera" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "any substance" -msgstr "A in distanza" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "underwater" -msgstr "acqua" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "overground" -msgstr "sotterraneo" +msgstr "" #: build/trans_presets.java:2333 @@ -20567,17 +20559,14 @@ #. item "Man Made/Power Tower" combo "Type" #: build/trans_presets.java:2398 -#, fuzzy msgid "tower" -msgstr "Torre" +msgstr "" #: build/trans_presets.java:2398 -#, fuzzy msgid "pole" -msgstr "Ruolo" +msgstr "" #: build/trans_presets.java:2399 -#, fuzzy msgid "Tower reference" -msgstr "Riferimento linea" +msgstr "" #. item "Man Made/Power Tower" text "Tower reference" @@ -20595,18 +20584,15 @@ #. item "Man Made/Power Line" label "Edit Power Line" #: build/trans_presets.java:2405 -#, fuzzy msgid "Line type" -msgstr "Tipo di pista" +msgstr "" #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2405 -#, fuzzy msgid "line" -msgstr "collegato" +msgstr "" #: build/trans_presets.java:2405 -#, fuzzy msgid "minor_line" -msgstr "motorway_link" +msgstr "" #. item "Man Made/Power Line" text "Line reference" @@ -20617,7 +20603,6 @@ #. item "Man Made/Power Line" text "Voltage" #: build/trans_presets.java:2409 -#, fuzzy msgid "Amount of Cables" -msgstr "Numero di linee" +msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" @@ -20628,22 +20613,18 @@ #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" #: build/trans_presets.java:2410 -#, fuzzy msgid "single" -msgstr "Angolo" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "double" -msgstr "Boule (sport popolare in Francia)" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "triple" -msgstr "Stile" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "quad" -msgstr "Quacchera" +msgstr "" #: build/trans_presets.java:2413 @@ -26539,9 +26520,193 @@ msgstr "Czech UHUL:ORTOFOTO" +#~ msgid "No data imported." +#~ msgstr "Nessun dato importato." + +#~ msgid "Data Layer" +#~ msgstr "Livello dati" + +#~ msgid "Email" +#~ msgstr "Email" + +#~ msgid "Move" +#~ msgstr "Sposta" + +#~ msgid "unnamed" +#~ msgstr "Senza nome" + +#~ msgid "No document open so nothing to save." +#~ msgstr "Nessun documento è aperto per cui non c'è niente da salvare." + +#~ msgid "Unknown file extension." +#~ msgstr "L'estensione del file è sconosciuta." + +#~ msgid "Change" +#~ msgstr "Cambia" + +#~ msgid "Resolve {0} conflicts in {1} objects" +#~ msgstr "Risolvere {0} conflitti in {1} oggetti" + +#~ msgid "Rotate" +#~ msgstr "Ruota" + +#~ msgid "different" +#~ msgstr "diverso" + +#~ msgid "true" +#~ msgstr "vero" + +#~ msgid "false" +#~ msgstr "falso" + +#~ msgid "position" +#~ msgstr "posizione" + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} oggetto causa conflitti:" +#~ msgstr[1] "{0} oggetti causano conflitti:" + +#~ msgid "my version:" +#~ msgstr "versione locale:" + +#~ msgid "their version:" +#~ msgstr "versione remota:" + +#~ msgid "resolved version:" +#~ msgstr "versione risolta:" + +#~ msgid "Resolve Conflicts" +#~ msgstr "Resolvi conflitti" + +#~ msgid "Click Reload to refresh list" +#~ msgstr "Fare clic su Ricarica per aggiornare la lista" + +#~ msgid "Object" +#~ msgstr "Oggetto" + +#~ msgid "Date" +#~ msgstr "Data" + +#~ msgid "" +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." +#~ msgstr "" +#~ "Riporta lo stato di tutti gli oggetti correntemente selezionati alla " +#~ "versione selezionata nella lista della cronologia." + +#~ msgid "Occupied By" +#~ msgstr "Occupato da" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "Etichette (un valore vuoto cancella l'etichetta)" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "Aggiungi tutti gli oggetti selezionati come membri" + +#~ msgid "There were conflicts during import." +#~ msgstr "Si sono verificati dei conflitti durante l'importazione." + +#~ msgid "Error parsing server response." +#~ msgstr "Errore di scansione nella risposta del server." + +#~ msgid "Cannot connect to server." +#~ msgstr "Impossibile connettersi al server." + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "" +#~ "Per spostare, ingrandire e rimpicciolire la mappa puoi usare il mouse " +#~ "oppure premere Ctrl e le frecce, il punto (.) e la virgola (,)." + +#~ msgid "Contacting the OSM server..." +#~ msgstr "Connessione al server OSM..." + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "Aggiungi sia site-josm.xml che le pagine Wiki." + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "Nome utente (email) per l'account di OSM." + +#~ msgid "OSM username (email)" +#~ msgstr "Username OSM (email)" + +#~ msgid "Aborting..." +#~ msgstr "Interruzione in corso" + +#~ msgid "Unknown version" +#~ msgstr "Versione sconosciuta" + +#~ msgid "Found element in non-way." +#~ msgstr "Trovato elemento in non-percorso." + +#~ msgid " has zero ref" +#~ msgstr " ha zero ref" + +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "" +#~ "Suggerimento: alcuni cambiamenti derivano dal caricamento dei nuovi dati " +#~ "sul server." + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "Impossibile scaricare il plugin: {0} da {1}" + +#~ msgid "Navigation" +#~ msgstr "Navigazione" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "Unire i nodi con diffenti appartenenze?" + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "Errore Interno: impossibile controllare le condizioni dei layer. Segnala " +#~ "questo come bug." + +#~ msgid "Delete {1} {0}" +#~ msgstr "Cancella {1} {0}" + +#~ msgid "Revert" +#~ msgstr "Ripristina" + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "Il server ha restituito un errore interno. Prova con un'area piccola o " +#~ "aspetta prima di riprovare." + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "Adjust the position of the WMS layer" +#~ msgstr "Aggiusta la posizione dl layer WMS" + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" +#~ msgstr "" +#~ "I nodi selezionati appartengono a relazioni differenti. Vuoi comunque " +#~ "unirli?" + +#~ msgid "All the ways were empty" +#~ msgstr "Tutti i percorsi erano vuoti" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "YAHOO (correzione GNOME)" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO (GNOME)" + +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Id dell'immagine Metacarta Map Rectifier" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "Convalida la selezione corrente oppure tutto l'insieme dei dati." + #~ msgid "Combine ways with different memberships?" #~ msgstr "Unire i percorsi con diverse appartenenze?" - -#~ msgid "Combine Anyway" -#~ msgstr "Unisci comunque" #~ msgid "" @@ -26551,205 +26716,4 @@ #~ "I percorsi selezionati appartengono a relazioni differenti. Vuoi comunque " #~ "unirli?" - -#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -#~ msgstr "" -#~ "L'intestazione dell'errore \"{0}\" non corrisponde allo schema atteso " -#~ "\"{1}\"" - -#~ msgid "Purging 1 primitive" -#~ msgstr "Eliminazione di 1 primitiva" - -#~ msgid "removing reference from way {0}" -#~ msgstr "rimozione del riferimento dal percorso {0}" - -#~ msgid "Empty member in relation." -#~ msgstr "Membro vuoto nella relazione." - -#~ msgid "No data imported." -#~ msgstr "Nessun dato importato." - -#~ msgid "Data Layer" -#~ msgstr "Livello dati" - -#~ msgid "Email" -#~ msgstr "Email" - -#~ msgid "Move" -#~ msgstr "Sposta" - -#~ msgid "unnamed" -#~ msgstr "Senza nome" - -#~ msgid "No document open so nothing to save." -#~ msgstr "Nessun documento è aperto per cui non c'è niente da salvare." - -#~ msgid "Unknown file extension." -#~ msgstr "L'estensione del file è sconosciuta." - -#~ msgid "Change" -#~ msgstr "Cambia" - -#~ msgid "Resolve {0} conflicts in {1} objects" -#~ msgstr "Risolvere {0} conflitti in {1} oggetti" - -#~ msgid "Rotate" -#~ msgstr "Ruota" - -#~ msgid "different" -#~ msgstr "diverso" - -#~ msgid "true" -#~ msgstr "vero" - -#~ msgid "false" -#~ msgstr "falso" - -#~ msgid "position" -#~ msgstr "posizione" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} oggetto causa conflitti:" -#~ msgstr[1] "{0} oggetti causano conflitti:" - -#~ msgid "my version:" -#~ msgstr "versione locale:" - -#~ msgid "their version:" -#~ msgstr "versione remota:" - -#~ msgid "resolved version:" -#~ msgstr "versione risolta:" - -#~ msgid "Resolve Conflicts" -#~ msgstr "Resolvi conflitti" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "Fare clic su Ricarica per aggiornare la lista" - -#~ msgid "Object" -#~ msgstr "Oggetto" - -#~ msgid "Date" -#~ msgstr "Data" - -#~ msgid "" -#~ "Revert the state of all currently selected objects to the version " -#~ "selected in the history list." -#~ msgstr "" -#~ "Riporta lo stato di tutti gli oggetti correntemente selezionati alla " -#~ "versione selezionata nella lista della cronologia." - -#~ msgid "Occupied By" -#~ msgstr "Occupato da" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "Etichette (un valore vuoto cancella l'etichetta)" - -#~ msgid "Add all currently selected objects as members" -#~ msgstr "Aggiungi tutti gli oggetti selezionati come membri" - -#~ msgid "There were conflicts during import." -#~ msgstr "Si sono verificati dei conflitti durante l'importazione." - -#~ msgid "Error parsing server response." -#~ msgstr "Errore di scansione nella risposta del server." - -#~ msgid "Cannot connect to server." -#~ msgstr "Impossibile connettersi al server." - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "" -#~ "Per spostare, ingrandire e rimpicciolire la mappa puoi usare il mouse " -#~ "oppure premere Ctrl e le frecce, il punto (.) e la virgola (,)." - -#~ msgid "Contacting the OSM server..." -#~ msgstr "Connessione al server OSM..." - -#~ msgid "Add either site-josm.xml or Wiki Pages." -#~ msgstr "Aggiungi sia site-josm.xml che le pagine Wiki." - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "Nome utente (email) per l'account di OSM." - -#~ msgid "OSM username (email)" -#~ msgstr "Username OSM (email)" - -#~ msgid "Aborting..." -#~ msgstr "Interruzione in corso" - -#~ msgid "Unknown version" -#~ msgstr "Versione sconosciuta" - -#~ msgid "Found element in non-way." -#~ msgstr "Trovato elemento in non-percorso." - -#~ msgid " has zero ref" -#~ msgstr " ha zero ref" - -#~ msgid "Hint: Some changes came from uploading new data to the server." -#~ msgstr "" -#~ "Suggerimento: alcuni cambiamenti derivano dal caricamento dei nuovi dati " -#~ "sul server." - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "Impossibile scaricare il plugin: {0} da {1}" - -#~ msgid "Navigation" -#~ msgstr "Navigazione" - -#~ msgid "Merge nodes with different memberships?" -#~ msgstr "Unire i nodi con diffenti appartenenze?" - -#~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this " -#~ "as a bug." -#~ msgstr "" -#~ "Errore Interno: impossibile controllare le condizioni dei layer. Segnala " -#~ "questo come bug." - -#~ msgid "Delete {1} {0}" -#~ msgstr "Cancella {1} {0}" - -#~ msgid "Revert" -#~ msgstr "Ripristina" - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "Il server ha restituito un errore interno. Prova con un'area piccola o " -#~ "aspetta prima di riprovare." - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "Adjust the position of the WMS layer" -#~ msgstr "Aggiusta la posizione dl layer WMS" - -#~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still " -#~ "want to merge them?" -#~ msgstr "" -#~ "I nodi selezionati appartengono a relazioni differenti. Vuoi comunque " -#~ "unirli?" - -#~ msgid "All the ways were empty" -#~ msgstr "Tutti i percorsi erano vuoti" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO (WebKit)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "YAHOO (correzione GNOME)" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO (GNOME)" - -#~ msgid "Metacarta Map Rectifier image id" -#~ msgstr "Id dell'immagine Metacarta Map Rectifier" - -#~ msgid "Validate either current selection or complete dataset." -#~ msgstr "Convalida la selezione corrente oppure tutto l'insieme dei dati." #~ msgid "Charge" @@ -26925,4 +26889,7 @@ #~ "Non caricarire nessun dato dopo questo messaggio." +#~ msgid "Empty member in relation." +#~ msgstr "Membro vuoto nella relazione." + #~ msgid "Replaces Selection with Users data" #~ msgstr "Sostituisci la selezione con i dati dell'utente" @@ -27012,4 +26979,7 @@ #~ msgid "Delete and Download" #~ msgstr "Elimina e Scarica" + +#~ msgid "Combine Anyway" +#~ msgstr "Unisci comunque" #~ msgid "Merge Anyway" @@ -27227,6 +27197,12 @@ #~ msgstr "Primitiva mancante" +#~ msgid "removing reference from way {0}" +#~ msgstr "rimozione del riferimento dal percorso {0}" + #~ msgid "Failed to initialize API. Please try again later." #~ msgstr "E' fallita l'inizializzazione delle API. Riprovare più tardi." + +#~ msgid "Purging 1 primitive" +#~ msgstr "Eliminazione di 1 primitiva" #~ msgid "Layer {0} must be in list of layers" @@ -27306,2 +27282,7 @@ #~ "Pagina di aiuto mancante. crearla in italiano oppure " #~ "la propria lingua." + +#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +#~ msgstr "" +#~ "L'intestazione dell'errore \"{0}\" non corrisponde allo schema atteso " +#~ "\"{1}\"" Index: /applications/editors/josm/i18n/po/ja.po =================================================================== --- /applications/editors/josm/i18n/po/ja.po (revision 17945) +++ /applications/editors/josm/i18n/po/ja.po (revision 17946) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 16:38+0200\n" -"PO-Revision-Date: 2009-09-27 09:08+0000\n" +"POT-Creation-Date: 2009-10-02 22:03+0200\n" +"PO-Revision-Date: 2009-09-30 12:02+0000\n" "Last-Translator: higa4 \n" "Language-Team: Japanese \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-09-28 14:33+0000\n" +"X-Launchpad-Export-Date: 2009-10-02 19:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -47,5 +47,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -90,9 +90,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -147,5 +147,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 @@ -337,5 +337,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -347,12 +347,12 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -374,5 +374,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 @@ -463,9 +463,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -500,6 +500,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -629,22 +629,22 @@ msgstr "開かれた変更セットをダウンロード中 ..." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 msgid "Combine Way" msgstr "ウェイの結合" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine several ways into one." msgstr "複数のウェイを一つに結合" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Change directions?" msgstr "方向を変更しますか?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 msgid "Reverse and Combine" msgstr "逆転して結合" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -652,5 +652,5 @@ msgstr "ウェイは現在の方向で結合できません。一方の方向にそろえますか？" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -659,10 +659,10 @@ "ウェイを結合できません（これらをノードの一列として統合することができません）" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "{0}ウェイを結合" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "結合する少なくとも二つのウェイを選択してください。" @@ -709,5 +709,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -775,5 +775,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333 msgid "OK" @@ -859,8 +859,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -896,5 +896,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 @@ -968,5 +968,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1056,23 +1056,23 @@ msgstr "現在のレイヤーを他のレイヤーに結合" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 msgid "Merge Nodes" msgstr "ノードの結合" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge nodes into the oldest one." msgstr "一番古いものにノードをマージします。" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Please select at least two nodes to merge." msgstr "結合する少なくとも二つのウェイを選択してください。" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" "ノードを結合できません：使用しているウェイを削除しないとけなくなります。" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261 #, java-format msgid "Merge {0} nodes" @@ -1253,5 +1253,5 @@ "クリップボードのコンテンツのタグを、すべての選択したアイテムに適用します。" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106 #, java-format msgid "Pasting {0} tag" @@ -1259,5 +1259,5 @@ msgstr[0] "{0} タグを貼り付けています" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107 #, java-format msgid "to {0} primitive" @@ -1803,4 +1803,6 @@ "primitive and retrying to upload." msgstr "" +"警告: プリミティブの ''{0}'' は既にサーバから削除されています。このプリミ" +"ティブをスキップし、アップロードを再試行します。" #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1911,7 +1913,6 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 -#, fuzzy msgid "No data found in this area." -msgstr "デバイスにデータがありません" +msgstr "この範囲ではデータは見つかりません" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2182,55 +2183,55 @@ msgstr "データがロードされていないので検索できません。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a filter string." msgstr "フィルター文字列を入力してください。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a search string." msgstr "検索文字列を入力してください" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 msgid "replace selection" msgstr "セレクションを置換" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "add to selection" msgstr "セレクションに加える" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75 msgid "remove from selection" msgstr "セレクションの削除" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76 msgid "find in selection" msgstr "選択範囲の中から見つける" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 msgid "case sensitive" msgstr "大/小文字を区別する" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "regular expression" msgstr "正規表現検索" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "" "ベイカー・ストリート - どんなキーや名前の 'ベイカー' と 'ストリート'。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "" "\"ベイカー・ストリート\" - どんなキーや名前の 'ベイカー・ストリート'。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' その名前のどこか。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - 正確に 'route'の値を持つキー 'type'です。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2240,17 +2241,17 @@ "type=, *=*, *=もできます。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - その名前の内 'Bak' でない。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "foot: - key=foot set to any value." msgstr "foot: - key=任意の値を入力してください." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "Special targets:" msgstr "特殊なターゲット:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "" "type: - type of the object (node, way, relation)" @@ -2258,55 +2259,55 @@ "type: - オブジェクトの型 (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "user:... - all objects changed by user" msgstr "user:... - 該当ユーザに変更された全オブジェクト" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - オブジェクトに与えられた ID (0 は新しいオブジェクト)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - 指定されたノード番号のオブジェクト" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "modified - all changed objects" msgstr "変更済み - 変更されたオブジェクトすべて" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "selected - all selected objects" msgstr "選択- 選択されたオブジェクトすべて" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "incomplete - all incomplete objects" msgstr "不完全 - すべての不完全なオブジェクト" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 msgid "untagged - all untagged objects" msgstr "タグなし - すべてのタグなしオブジェクト" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 msgid "" "child expr - all children of objects matching the expression" msgstr "child 式 - 式にマッチしたオブジェクトの全ての子" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "" "parent expr - all parents of objects matching the expression" msgstr "parent 式 - 式にマッチしたオブジェクトの全ての親" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "Use | or OR to combine with logical or" msgstr "| や ORを、論理和をとるために使う" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "\" を演算子をくくるために使ってください。（例：キーが：を含む)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "Use ( and ) to group expressions" msgstr "グループの分類のために ( と ) を使用する。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2316,51 +2317,51 @@ msgstr "フィルター" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "検索" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Submit filter" msgstr "フィルターを登録" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Start Search" msgstr "検索開始" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 #, java-format msgid "No match found for ''{0}''" msgstr "\"{0}\"にマッチするものが見つからない" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "''{0}''を検索することにより、何も選択肢に加えられませんでした。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "''{0}''を検索することにより、何も選択肢から除かれませんでした。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, java-format -msgid "Nothing find in selection by searching for ''{0}''" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254 +#, fuzzy, java-format +msgid "Nothing found in selection by searching for ''{0}''" msgstr "''{0}'' を探した結果何も見つからなかった" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264 #, java-format msgid "Found {0} matches" msgstr "{0} の一致が見つかりました" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 msgid "RX" msgstr "RX" @@ -2641,9 +2642,10 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 -#, fuzzy, java-format +#, java-format msgid "" "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" -"コマンド ''{0}'' はレイヤー {1} がすでに表示されていないので取り消せません" +"コマンド ''{0}'' をアンドゥできません。なぜならレイヤ ''{1}'' はもうないから" +"です。" #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 @@ -2687,5 +2689,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 msgid "Delete from relation" msgstr "関連から削除" @@ -2742,12 +2744,12 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 -#, fuzzy, java-format +#, java-format msgid "Purged object ''{0}''" -msgstr "オブジェクト{0}を移動" +msgstr "オブジェクト ''{0}'' を取り除いた。" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 -#, fuzzy, java-format +#, java-format msgid "Purged {0} objects" -msgstr "{0}このオブジェクトを変更" +msgstr "{0} 個のオブジェクトを取り除いた。" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 @@ -2761,7 +2763,7 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 -#, fuzzy, java-format +#, java-format msgid "Removing reference from relation {0}" -msgstr "リレーション {0}から、参照を除きます。" +msgstr "リレーション {0} からリファレンスを削除する" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 @@ -3142,14 +3144,14 @@ msgstr "Warning: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "ID >= 0 である必要があります。 {0} を受け取りました" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307 msgid "A primitive with ID = 0 can't be invisible." msgstr "id=0 のプリミティブは非表示にできません" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3157,5 +3159,5 @@ msgstr "ID > 0 である必要があります。 {0} を受け取りました" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3515,7 +3517,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 #, java-format @@ -3555,7 +3555,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 -#, fuzzy msgid "Not Found" -msgstr "接続していません" +msgstr "見つかりません" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 @@ -3874,9 +3873,9 @@ "ウスでこの表から直接選べます。" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289 msgid "(no object)" msgstr "(オブジェクトなし)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416 msgid "User:" msgstr "ユーザ:" @@ -4358,5 +4357,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "削除しました" @@ -4462,5 +4461,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4507,6 +4506,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 @@ -4520,6 +4519,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4578,34 +4577,34 @@ msgstr "相手のデータセットはキー {0} を持つタグを含みません" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115 msgid "Conflicts when combining primitives" msgstr "プリミティブの連結時に競合" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121 #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" msgstr "ウェイの連結時に競合 - 連結されたウェイは''{0}'' です" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" msgstr "ノードの結合時に競合 - 結合されたノードは''{0}'' です" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257 msgid "No conflicts to resolve" msgstr "解決が必要な競合はありません" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "競合解決をキャンセル" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "解決済み競合を適用" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 @@ -4623,23 +4622,24 @@ msgstr "全て" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66 msgid "Choose a value" msgstr "値を選択" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 -msgid "Please decided which values to keep" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68 +#, fuzzy +msgid "Please decide which values to keep" msgstr "どちらの値を残すか決定してください" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73 #, java-format msgid "Value ''{0}'' is going to be applied for key ''{1}''" msgstr "値 ''{0}'' はキー ''{1}'' に割り当てられます" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79 #, java-format msgid "The key ''{0}'' and all its values are going to be removed" msgstr "キー ''{0}'' とその全ての値は削除されます" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84 #, java-format msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" @@ -4685,7 +4685,26 @@ msgstr "貼り付けられたタグの競合" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "Paste ..." +msgstr "貼り付け ..." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "From ..." +msgstr "元: ..." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "To ..." +msgstr "先: ..." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:444 +#, java-format +msgid "{0} tag" +msgid_plural "{0} tags" +msgstr[0] "{0} タグ" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 #, java-format @@ -4694,7 +4713,5 @@ msgstr[0] "{0}ウェイ" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format @@ -4702,25 +4719,4 @@ msgid_plural "{0} relations" msgstr[0] "{0} 関連" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "Paste ..." -msgstr "貼り付け ..." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "From ..." -msgstr "元: ..." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "To ..." -msgstr "先: ..." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425 -#, java-format -msgid "{0} tag" -msgid_plural "{0} tags" -msgstr[0] "{0} タグ" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 @@ -4789,4 +4785,14 @@ msgstr "判断" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42 +#, fuzzy +msgid "Please select the values to keep for the following tags." +msgstr "閉じる変更セットを選んでください" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 +#, fuzzy +msgid "Show tags with conflicts only" +msgstr "ノード(競合あり)" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -4804,5 +4810,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 @@ -4895,5 +4901,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -5051,6 +5057,6 @@ msgstr "レイヤーについての情報" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323 #, java-format msgid "This will change up to {0} object." @@ -5058,22 +5064,22 @@ msgstr[0] "これは、最大{0}このオブジェクトが変更されます。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149 msgid "An empty value deletes the key." msgstr "空の値でキーを削除。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108 msgid "" msgstr "<差異あり>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347 msgid "Change values?" msgstr "値を変更しますか?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264 #, java-format msgid "Change properties of up to {0} object" @@ -5081,69 +5087,69 @@ msgstr[0] "{0}このオブジェクトのプロパティーの変更" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 msgid "Please select a key" msgstr "キーを選択してください" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335 msgid "Please select a value" msgstr "値を選択してください" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447 msgid "Please select the objects you want to change properties for." msgstr "プロパティを変えたいオブジェクトを選択してください。" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "プロパティ/メンバー" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 msgid "Properties for selected objects." msgstr "選択されたオブジェクトのプロパティ" #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 msgid "Member Of" msgstr "メンバー" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576 msgid "Add Properties" msgstr "プロパティの追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 msgid "Add a new key/value pair to all objects" msgstr "すべてのオブジェクトに新しいキー/値をペアで追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Edit Properties" msgstr "プロパティの編集" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 msgid "Edit the value of the selected key for all objects" msgstr "すべてのオブジェクトの選択したキーの値の編集" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "プロパティ: {0} / メンバー: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799 msgid "Properties / Memberships" msgstr "プロパティ/メンバー" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Change relation" msgstr "関連の変更" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 #, java-format msgid "Really delete selection from relation {0}?" msgstr "本当に関連{0}から選択分を削除しますか？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860 msgid "Delete the selected key in all objects" msgstr "すべてのオブジェクトの選択したキーの削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862 msgid "Delete Properties" msgstr "プロパティの削除" @@ -5182,10 +5188,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280 msgid "Create a copy of this relation and open it in another editor window" -msgstr "このリレーションのコピーを作成し、他のエディタウィンドウで開く" +msgstr "このリレーションのコピーを作成し、他の編集ウィンドウで開く" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 -#, fuzzy msgid "Set the current selection to the list of selected relations" -msgstr "現在選択されているリレーションを編集" +msgstr "現在の選択を選択したリレーションのリストへセットする" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5226,9 +5231,9 @@ msgstr "選択: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307 msgid "Undock the panel" msgstr "パネルの取り外し" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5237,5 +5242,5 @@ "ます。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332 msgid "Click to minimize/maximize the panel content" msgstr "クリックすることでパネルの内容を最小化/最大化" @@ -5445,5 +5450,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805 msgid "Relation Editor: Remove Selected" -msgstr "リレーションエディタ: 削除が選択されました" +msgstr "リレーション編集画面: 削除が選択されました" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 @@ -5472,5 +5477,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897 msgid "Relation Editor: Sort" -msgstr "リレーションエディタ: ソート" +msgstr "リレーション編集画面: ソート" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909 @@ -5481,5 +5486,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912 msgid "Relation Editor: Move Up" -msgstr "リレーションエディタ: 上へ移動" +msgstr "リレーション編集画面: 上へ移動" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 @@ -5490,5 +5495,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931 msgid "Relation Editor: Move Down" -msgstr "リレーションエディタ: 下へ移動" +msgstr "リレーション編集画面: 下へ移動" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947 @@ -5499,5 +5504,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950 msgid "Relation Editor: Remove" -msgstr "リレーションエディタ: 削除" +msgstr "リレーション編集画面: 削除" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 @@ -5519,5 +5524,5 @@ "conflict and close the editor?" msgstr "" -"このリレーションはエディタ以外で変更されています。
変更を適用して編" +"このリレーションは編集画面以外で変更されています。
変更を適用して編" "集を続けることはできません

競合を作成してエディタを閉じますか？" @@ -5561,5 +5566,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190 msgid "Relation Editor: Download Members" -msgstr "リレーションエディタ: メンバーをダウンロード" +msgstr "リレーション編集画面: メンバーをダウンロード" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208 @@ -6684,5 +6689,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 #: build/trans_presets.java:67 build/trans_presets.java:103 #: build/trans_presets.java:143 build/trans_presets.java:180 @@ -7070,7 +7075,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -#, fuzzy msgid "Save/Upload and Exit" -msgstr "保存して終了" +msgstr "保存/アップロードして終了" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 @@ -7079,7 +7083,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -#, fuzzy msgid "Save/Upload and Delete" -msgstr "保存と削除" +msgstr "保存/アップロードして削除" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 @@ -7093,11 +7096,10 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481 -#, fuzzy msgid "" "An upload and/or save operation of one layer with modifications
was " "cancelled or has failed." msgstr "" -"修正されたひとつのレイヤーのアップロード、保存操作は
キャンセルされ" -"たか失敗しました。" +"変更したレイヤのアップロードまたは保存の作業は
キャンセルされたか失" +"敗しました。" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491 @@ -7295,5 +7297,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7644,8 +7646,8 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 -#, fuzzy, java-format +#, java-format msgid "There was {0} conflict detected." msgid_plural "There were {0} conflicts detected." -msgstr[0] "インポートした内容には {0} の競合があります。" +msgstr[0] "検出された競合が {0} 個あります" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 @@ -7658,7 +7660,8 @@ "on the server." msgstr[0] "" +"{0} 個のオブジェクトはサーバから削除されましたので、ローカルなデータセットか" +"ら放棄されました。" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 -#, fuzzy msgid "Conflicts detected" msgstr "競合が検出されました" @@ -8001,5 +8004,5 @@ msgstr "ボイスレコーダの調整" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "色" @@ -8983,5 +8986,5 @@ #, java-format msgid "Markers from {0}" -msgstr "{0} からのオーディオマーカー" +msgstr "{0}　のマーカー" #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71 @@ -8995,5 +8998,5 @@ msgstr "ファイル \"{0}\" の解析に失敗" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313 msgid "Parse error: invalid document structure for GPX document." msgstr "パースエラー：GPXファイルのドキュメント構造が不適切です" @@ -9180,19 +9183,19 @@ msgstr "OK - やり直しています。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 #, java-format msgid "Starting retry {0} of {1}." msgstr "{1} 分の {0} 回の再試行を開始。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 msgid "Current changeset is null. Can't upload data." msgstr "現在の変更セットはヌルです。データをアップロードできません。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "現在の変更セットのID > 0 でなければなりません。現在のID: {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9427,11 +9430,11 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 -#, fuzzy, java-format +#, java-format msgid "" "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}''," "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." msgstr "" -"要素 ''bounds'' に必要な属性が見つかりません。入力値: minlon=''{0}''," -"minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''。" +"要素 ''bounds'' に必要な属性がありません。入力値: minlon=''{0}''," +"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''。" #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 @@ -9553,5 +9556,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490 -#, fuzzy, java-format +#, java-format msgid "" "Relation with external id ''{0}'' refers to a missing primitive with " @@ -9676,7 +9679,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' must not be null" -msgstr "パラメータ ''{0}'' はヌルでなければなりません" +msgstr "パラメータの ''{0}'' はヌルではいけません" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 @@ -10449,69 +10452,74 @@ msgstr "{0} 付加番地に関連付ける" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381 msgid "City:" msgstr "市区:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382 msgid "State:" msgstr "都道府県:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383 msgid "Post Code:" msgstr "郵便番号:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384 msgid "Country:" msgstr "国" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385 msgid "Full Address:" msgstr "フルアドレス:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420 msgid "Optional Information:" msgstr "オプション情報" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600 msgid "Please select a street to associate with address interpolation way" msgstr "アドレス補間ウェイと関連付けるストリートを選択してください" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613 msgid "Please select address interpolation way for this street" msgstr "このストリートのアドレス補間ウェイを選択してください" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719 msgid "Expected odd numbers for addresses" msgstr "奇数番号のアドレスが期待されている" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 msgid "Expected even numbers for addresses" msgstr "偶数番号のアドレスが期待されている" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 msgid "Country code must be 2 letters" msgstr "国コードは2文字でなければなりません" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878 msgid "Please enter valid number for starting and ending address" msgstr "開始および終了アドレスに正しい値を入力してください" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896 msgid "Alphabetic address must end with a letter" msgstr "アルファベットのアドレスは文字で終了しなければなりません" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911 +#, fuzzy +msgid "Starting and ending numbers must be the same for alphabetic addresses" +msgstr "開始アドレスの数字は終了アドレスの数字よりも小さくなければなりません" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917 msgid "Starting address letter must be less than ending address letter" msgstr "開始アドレス文字は終了アドレス文字よりも小さくなければなりません" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933 msgid "Please enter valid number for starting address" msgstr "開始アドレスに正しい数字を入力してください" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936 msgid "Please enter valid number for ending address" msgstr "終了アドレスに正しい数字を入力してください" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943 msgid "Starting address number must be less than ending address number" msgstr "開始アドレスの数字は終了アドレスの数字よりも小さくなければなりません" @@ -10575,5 +10583,5 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118 msgid "One of the selected files was null !!!" -msgstr "選択したファイルはのひとつは null でした !!!" +msgstr "選択したファイルはのひとつはヌルでした !!!" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 @@ -13028,6 +13036,6 @@ "programs." msgstr "" -"OSM データ妥当性検証はユーザやエディタプログラムによる一般的なエラーをチェッ" -"クします。" +"OSM データ妥当性検証はユーザや編集プログラムによる一般的なエラーをチェックし" +"ます。" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99 @@ -14328,5 +14336,5 @@ "align it with the map." msgstr "" -"このプラグインではエディタの背景として任意の画像を表示し、地図と並べることが" +"このプラグインでは編集画面の背景として任意の画像を表示し、地図と並べることが" "できます。" @@ -18335,5 +18343,5 @@ #: build/trans_presets.java:1725 msgid "region" -msgstr "地域" +msgstr "地方" #. item "Tourism/Other Information Points" text "Name" @@ -20201,24 +20209,20 @@ #. item "Man Made/Tower" text "Name" #: build/trans_presets.java:2296 -#, fuzzy msgid "Tower type" -msgstr "ルート種類" +msgstr "塔の種類" #. item "Man Made/Tower" combo "Tower type" #: build/trans_presets.java:2296 -#, fuzzy msgid "communication" -msgstr "接続" +msgstr "通信用" #: build/trans_presets.java:2296 -#, fuzzy msgid "observation" -msgstr "高度" +msgstr "" #. #: build/trans_presets.java:2298 -#, fuzzy msgid "Height (meters)" -msgstr "最大高（ｍ）" +msgstr "高さ(メートル)" #. item "Man Made/Tower" text "Operator" @@ -20278,7 +20282,6 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "oil" -msgstr "火力発電" +msgstr "石油" #: build/trans_presets.java:2330 build/trans_presets.java:2372 @@ -20287,27 +20290,22 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "sewage" -msgstr "使用法" +msgstr "下水" #: build/trans_presets.java:2330 -#, fuzzy msgid "heat" -msgstr "荒地" +msgstr "熱" #: build/trans_presets.java:2330 -#, fuzzy msgid "any substance" -msgstr "距離でA" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "underwater" -msgstr "水域(湖沼)" +msgstr "水中" #: build/trans_presets.java:2331 -#, fuzzy msgid "overground" -msgstr "地下" +msgstr "地上" #: build/trans_presets.java:2333 @@ -20452,17 +20450,14 @@ #. item "Man Made/Power Tower" combo "Type" #: build/trans_presets.java:2398 -#, fuzzy msgid "tower" -msgstr "タワー" +msgstr "送電塔" #: build/trans_presets.java:2398 -#, fuzzy msgid "pole" -msgstr "役割" +msgstr "電柱" #: build/trans_presets.java:2399 -#, fuzzy msgid "Tower reference" -msgstr "ライン参照" +msgstr "塔の参照番号" #. item "Man Made/Power Tower" text "Tower reference" @@ -20480,18 +20475,15 @@ #. item "Man Made/Power Line" label "Edit Power Line" #: build/trans_presets.java:2405 -#, fuzzy msgid "Line type" -msgstr "ゲレンデのタイプ" +msgstr "" #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2405 -#, fuzzy msgid "line" -msgstr "継げられた" +msgstr "" #: build/trans_presets.java:2405 -#, fuzzy msgid "minor_line" -msgstr "高速道路のランプ" +msgstr "細い線" #. item "Man Made/Power Line" text "Line reference" @@ -20502,33 +20494,28 @@ #. item "Man Made/Power Line" text "Voltage" #: build/trans_presets.java:2409 -#, fuzzy msgid "Amount of Cables" -msgstr "ワイヤー量" +msgstr "電線の電流量" #. item "Man Made/Power Line" text "Amount of Cables" #: build/trans_presets.java:2410 msgid "Number of wires (better: conductors) per power cable" -msgstr "" +msgstr "電力線束のうち良導体の線の数" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" #: build/trans_presets.java:2410 -#, fuzzy msgid "single" -msgstr "角度" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "double" -msgstr "ペタンク" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "triple" -msgstr "踏み越し段" +msgstr "３" #: build/trans_presets.java:2410 -#, fuzzy msgid "quad" -msgstr "クエーカー教徒" +msgstr "４" #: build/trans_presets.java:2413 @@ -26423,29 +26410,4 @@ msgstr "チェコ UHUL:ORTOFOTO" -#~ msgid "Combine ways with different memberships?" -#~ msgstr "異なるメンバーであるウェイを結合しますか？" - -#~ msgid "Combine Anyway" -#~ msgstr "強制的に連結。" - -#~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want " -#~ "to combine them?" -#~ msgstr "" -#~ "選択したウェイは、それぞれ異なった関連へ含まれています。それでも、結合しま" -#~ "すか？" - -#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -#~ msgstr "エラー　ヘッダ \"{0}\" は期待パターン \"{1}\" に一致しません" - -#~ msgid "Purging 1 primitive" -#~ msgstr "1 つのプリミティブを破棄" - -#~ msgid "removing reference from way {0}" -#~ msgstr "ウェイ {0}から、参照を取り除く" - -#~ msgid "Empty member in relation." -#~ msgstr "リレーションに登録すべきものがありません。" - #~ msgid "Move" #~ msgstr "移動" @@ -26591,4 +26553,7 @@ #~ msgid "EPSG:4326" #~ msgstr "EPSG:4326" + +#~ msgid "Empty member in relation." +#~ msgstr "リレーションに登録すべきものがありません。" #~ msgid "Email" @@ -26753,4 +26718,14 @@ #~ "本メッセージ後は、データのアップロードはやめてください。" +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "" +#~ "選択したウェイは、それぞれ異なった関連へ含まれています。それでも、結合しま" +#~ "すか？" + +#~ msgid "Combine ways with different memberships?" +#~ msgstr "異なるメンバーであるウェイを結合しますか？" + #~ msgid "No document open so nothing to save." #~ msgstr "一つも開かれたデータがありませんんで、保存されません。" @@ -26841,4 +26816,7 @@ #~ "内部エラー：レイヤーのないところで条件チェックはできません。バグとして報告" #~ "してください。" + +#~ msgid "Combine Anyway" +#~ msgstr "強制的に連結。" #~ msgid "Please select ways with almost right angles to orthogonalize." @@ -27012,4 +26990,7 @@ #~ "セットのIDが 0 です。" +#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +#~ msgstr "エラー　ヘッダ \"{0}\" は期待パターン \"{1}\" に一致しません" + #~ msgid "not yet decided" #~ msgstr "未決定です" @@ -27017,4 +26998,10 @@ #~ msgid "parameter '{0}' must not be null" #~ msgstr "パラメータ '{0}' はヌル以外でなければなりません" + +#~ msgid "Purging 1 primitive" +#~ msgstr "1 つのプリミティブを破棄" + +#~ msgid "removing reference from way {0}" +#~ msgstr "ウェイ {0}から、参照を取り除く" #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." Index: /applications/editors/josm/i18n/po/nb.po =================================================================== --- /applications/editors/josm/i18n/po/nb.po (revision 17945) +++ /applications/editors/josm/i18n/po/nb.po (revision 17946) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 16:38+0200\n" +"POT-Creation-Date: 2009-10-02 22:03+0200\n" "PO-Revision-Date: 2009-09-22 15:16+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-28 14:34+0000\n" +"X-Launchpad-Export-Date: 2009-10-02 19:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -47,5 +47,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -90,9 +90,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -147,5 +147,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 @@ -329,5 +329,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -339,12 +339,12 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -366,5 +366,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 @@ -453,9 +453,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -490,6 +490,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -619,22 +619,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 msgid "Combine Way" msgstr "Sammenføy linjer" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine several ways into one." msgstr "Sammenføy flere linjer til én" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Change directions?" msgstr "Endre retninger?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 msgid "Reverse and Combine" msgstr "Snu og sammenføy" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -644,5 +644,5 @@ "retningen på noen av linjene?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -650,10 +650,10 @@ msgstr "Kan ikke sammenføye linjer. (Kan ikke bli sammenhengende nodestreng)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Sammenføy {0} linjer" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Velg minst to linjer å sammenføye." @@ -700,5 +700,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -766,5 +766,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333 msgid "OK" @@ -849,8 +849,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -886,5 +886,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 @@ -956,5 +956,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1044,22 +1044,22 @@ msgstr "Flett det gjeldende laget inn i et annet lag" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 msgid "Merge Nodes" msgstr "Samle noder" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge nodes into the oldest one." msgstr "Samle noder i den eldste" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Please select at least two nodes to merge." msgstr "Velg minst to noder til å samle" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "Kan ikke samle noder. Ville ha måttet slette en linje som er i bruk." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261 #, java-format msgid "Merge {0} nodes" @@ -1236,5 +1236,5 @@ msgstr "Bruk egenskaper i utklippstavla på alle valgte element." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106 #, java-format msgid "Pasting {0} tag" @@ -1243,5 +1243,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107 #, java-format msgid "to {0} primitive" @@ -1877,7 +1877,6 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 -#, fuzzy msgid "No data found in this area." -msgstr "Fant ikke data på enhet." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2148,53 +2147,53 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a search string." msgstr "Skriv inn søketekst." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 msgid "replace selection" msgstr "erstatt utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "add to selection" msgstr "legg til i utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75 msgid "remove from selection" msgstr "fjern fra utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 msgid "case sensitive" msgstr "skill mellom store/små bokstaver" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "regular expression" msgstr "regulært uttrykk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "Nansens gate – «Nansens» og «gate» i nøkkel eller navn." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"Nansens gate\" – «Nansens gate» i nøkkel eller navn." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Nan – «Nan» finnes innen navnet." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route – nøkkel «type» med eksakt verdi «route»." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2204,50 +2203,50 @@ "*=value, type=, *=*, *=." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Nan – «Nan» finnes ikke innen navnet." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "foot: - key=foot set to any value." msgstr "foot: – nøkkel «foot» med hvilken som helst verdi." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "Special targets:" msgstr "Spesialsøk:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "" "type: - type of the object (node, way, relation)" msgstr "type: – type objekt (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "user:... - all objects changed by user" msgstr "user:… – alle objekter redigert av angitt bruker" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "id:... - object with given ID (0 for new objects)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "nodes:... - object with given number of nodes" msgstr "nodes:… – objekt med angitt antall noder" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "modified - all changed objects" msgstr "modified – alle endrede objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "selected - all selected objects" msgstr "selected – alle objekter i utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "incomplete - all incomplete objects" msgstr "incomplete – alle uferdige objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 msgid "untagged - all untagged objects" msgstr "untagged – alle objekter uten egenskaper" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 msgid "" "child expr - all children of objects matching the expression" @@ -2255,5 +2254,5 @@ "child uttrykk – alle underobjekter av objektene i uttrykket" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "" "parent expr - all parents of objects matching the expression" @@ -2261,9 +2260,9 @@ "parent uttrykk – alle overobjekter av objektene i uttrykket" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "Use | or OR to combine with logical or" msgstr "Bruk | eller OR for søk med logisk eller" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2271,9 +2270,9 @@ "«:»)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "Use ( and ) to group expressions" msgstr "Bruk ( og ) for å gruppere uttrykk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2283,51 +2282,51 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Søk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Start Search" msgstr "Start søk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 #, java-format msgid "No match found for ''{0}''" msgstr "Fant ingen treff for «{0}»" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Ingenting lagt til utvalg ved søk etter «{0}»" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Ingenting fjernet fra utvalg ved søk etter «{0}»" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, java-format -msgid "Nothing find in selection by searching for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254 +#, fuzzy, java-format +msgid "Nothing found in selection by searching for ''{0}''" +msgstr "Ingenting lagt til utvalg ved søk etter «{0}»" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264 #, java-format msgid "Found {0} matches" msgstr "Fant {0} treff" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 msgid "RX" msgstr "RX" @@ -2597,10 +2596,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 -#, fuzzy, java-format +#, java-format msgid "" "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" -"Kan ikke gjøre om kommando \"{0}\" fordi lag \"{1}\" ikke lenger er " -"tilgjengelig" #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 @@ -2648,5 +2645,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 msgid "Delete from relation" msgstr "Slett fra relasjon" @@ -2700,12 +2697,12 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 -#, fuzzy, java-format +#, java-format msgid "Purged object ''{0}''" -msgstr "Flytt objektene {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 -#, fuzzy, java-format +#, java-format msgid "Purged {0} objects" -msgstr "Endre {0} objekt" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 @@ -2719,7 +2716,7 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 -#, fuzzy, java-format +#, java-format msgid "Removing reference from relation {0}" -msgstr "fjerner henvisning fra relasjon {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 @@ -3084,14 +3081,14 @@ msgstr "Advarsel: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3099,5 +3096,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3453,7 +3450,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 #, java-format @@ -3495,7 +3490,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 -#, fuzzy msgid "Not Found" -msgstr "Ikke Tilkoblet" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 @@ -3809,9 +3803,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289 msgid "(no object)" msgstr "(intet objekt)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416 msgid "User:" msgstr "" @@ -4310,5 +4304,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "slettet" @@ -4411,5 +4405,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4456,6 +4450,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 @@ -4469,6 +4463,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4526,34 +4520,34 @@ msgstr "Tjenerens datasett inneholder ingen egenskap med nøkkel {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115 msgid "Conflicts when combining primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121 #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257 msgid "No conflicts to resolve" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 @@ -4571,23 +4565,23 @@ msgstr "alle" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66 msgid "Choose a value" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 -msgid "Please decided which values to keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68 +msgid "Please decide which values to keep" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73 #, java-format msgid "Value ''{0}'' is going to be applied for key ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79 #, java-format msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84 #, java-format msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" @@ -4631,7 +4625,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "Paste ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "From ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "To ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:444 +#, java-format +msgid "{0} tag" +msgid_plural "{0} tags" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 #, java-format @@ -4641,7 +4655,5 @@ msgstr[1] "{0} linjer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format @@ -4651,26 +4663,4 @@ msgstr[1] "{0} relasjoner" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "Paste ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "From ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "To ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425 -#, java-format -msgid "{0} tag" -msgid_plural "{0} tags" -msgstr[0] "" -msgstr[1] "" - #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 #, java-format @@ -4737,4 +4727,13 @@ msgid "Decision" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42 +msgid "Please select the values to keep for the following tags." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 +#, fuzzy +msgid "Show tags with conflicts only" +msgstr "Noder (med konflikter)" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4753,5 +4752,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 @@ -4844,5 +4843,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -4998,6 +4997,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323 #, java-format msgid "This will change up to {0} object." @@ -5006,22 +5005,22 @@ msgstr[1] "Dette vil endre opptil {0} objekt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149 msgid "An empty value deletes the key." msgstr "Nøkkelen blir ikke lagret når den er tom." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347 msgid "Change values?" msgstr "Endre verdier?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264 #, java-format msgid "Change properties of up to {0} object" @@ -5030,69 +5029,69 @@ msgstr[1] "Endre egenskap på inntil {0} objekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 msgid "Please select a key" msgstr "Velg en nøkkel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335 msgid "Please select a value" msgstr "Velg en verdi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447 msgid "Please select the objects you want to change properties for." msgstr "Velg de objekter, du vil rette egenskaper for." +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "Egenskaper/medlemsskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 msgid "Properties for selected objects." msgstr "Egenskaper for valgte objekt." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 msgid "Member Of" msgstr "Medlem av" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576 msgid "Add Properties" msgstr "Tilføy egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 msgid "Add a new key/value pair to all objects" msgstr "Tilføy et nytt nøkkel/verdi-sett til alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Edit Properties" msgstr "Endre Oppsett" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 msgid "Edit the value of the selected key for all objects" msgstr "Rett verdien for den valgte nøkkel for alle objekter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Egenskaper: {0} / Medlemskap: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799 msgid "Properties / Memberships" msgstr "Egenskaper / Medlemskap" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Change relation" msgstr "Skift relasjon" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Vil du slette utvalget fra relasjon {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860 msgid "Delete the selected key in all objects" msgstr "Fjern den valgte nøkkel i alle objekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862 msgid "Delete Properties" msgstr "DSlett egenskaper" @@ -5134,7 +5133,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 -#, fuzzy msgid "Set the current selection to the list of selected relations" -msgstr "Kan ikke splitte med dette utvalget" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5175,14 +5173,14 @@ msgstr "Utvalg: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307 msgid "Undock the panel" msgstr "Frigjør panelet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "Lukk panelet. Du kan åpne det med knappene i venstre verktøygruppe." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332 msgid "Click to minimize/maximize the panel content" msgstr "Klikk for at minimere/maksimere panelet" @@ -6607,5 +6605,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 #: build/trans_presets.java:67 build/trans_presets.java:103 #: build/trans_presets.java:143 build/trans_presets.java:180 @@ -6983,7 +6981,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -#, fuzzy msgid "Save/Upload and Exit" -msgstr "Lagre og avslutt" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 @@ -6992,7 +6989,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -#, fuzzy msgid "Save/Upload and Delete" -msgstr "Opplastingen ble avsluttet" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 @@ -7206,5 +7202,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7558,9 +7554,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 -#, fuzzy, java-format +#, java-format msgid "There was {0} conflict detected." msgid_plural "There were {0} conflicts detected." -msgstr[0] "Det oppstod {0} konflikter under import." -msgstr[1] "Det oppstod {0} konflikter under import." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 @@ -7576,7 +7572,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 -#, fuzzy msgid "Conflicts detected" -msgstr "Konflikt oppdaget" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 @@ -7921,5 +7916,5 @@ msgstr "Stemme recorder kalibrering" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Farge" @@ -8918,5 +8913,5 @@ msgstr "Klarte ikke lese fil «{0}»" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313 msgid "Parse error: invalid document structure for GPX document." msgstr "Lesefeil: Strukturen i GPX fila er ukjent" @@ -9099,19 +9094,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9588,7 +9583,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' must not be null" -msgstr "parameter «{0}» må ha en verdi" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 @@ -10318,69 +10313,73 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911 +msgid "Starting and ending numbers must be the same for alphabetic addresses" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943 msgid "Starting address number must be less than ending address number" msgstr "" @@ -20032,24 +20031,20 @@ #. item "Man Made/Tower" text "Name" #: build/trans_presets.java:2296 -#, fuzzy msgid "Tower type" -msgstr "Rutetype" +msgstr "" #. item "Man Made/Tower" combo "Tower type" #: build/trans_presets.java:2296 -#, fuzzy msgid "communication" -msgstr "forbindelse" +msgstr "" #: build/trans_presets.java:2296 -#, fuzzy msgid "observation" -msgstr "Høyde" +msgstr "" #. #: build/trans_presets.java:2298 -#, fuzzy msgid "Height (meters)" -msgstr "Max. Høyde (meter)" +msgstr "" #. item "Man Made/Tower" text "Operator" @@ -20109,7 +20104,6 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "oil" -msgstr "fossil" +msgstr "" #: build/trans_presets.java:2330 build/trans_presets.java:2372 @@ -20118,27 +20112,22 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "sewage" -msgstr "bruk" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "heat" -msgstr "beiteområde" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "any substance" -msgstr "A etter Avstand" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "underwater" -msgstr "vann" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "overground" -msgstr "P-kjeller" +msgstr "" #: build/trans_presets.java:2333 @@ -20283,17 +20272,14 @@ #. item "Man Made/Power Tower" combo "Type" #: build/trans_presets.java:2398 -#, fuzzy msgid "tower" -msgstr "Tårn" +msgstr "" #: build/trans_presets.java:2398 -#, fuzzy msgid "pole" -msgstr "Rolle" +msgstr "" #: build/trans_presets.java:2399 -#, fuzzy msgid "Tower reference" -msgstr "Linjenummer" +msgstr "" #. item "Man Made/Power Tower" text "Tower reference" @@ -20311,18 +20297,15 @@ #. item "Man Made/Power Line" label "Edit Power Line" #: build/trans_presets.java:2405 -#, fuzzy msgid "Line type" -msgstr "Løypetype" +msgstr "" #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2405 -#, fuzzy msgid "line" -msgstr "koblet" +msgstr "" #: build/trans_presets.java:2405 -#, fuzzy msgid "minor_line" -msgstr "motorway_link" +msgstr "" #. item "Man Made/Power Line" text "Line reference" @@ -20333,7 +20316,6 @@ #. item "Man Made/Power Line" text "Voltage" #: build/trans_presets.java:2409 -#, fuzzy msgid "Amount of Cables" -msgstr "Antall ledere" +msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" @@ -20344,22 +20326,18 @@ #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" #: build/trans_presets.java:2410 -#, fuzzy msgid "single" -msgstr "Vinkel" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "double" -msgstr "Boule" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "triple" -msgstr "Gjerdetrapp" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "quad" -msgstr "quaker" +msgstr "" #: build/trans_presets.java:2413 @@ -26254,35 +26232,15 @@ msgstr "" -#~ msgid "Combine ways with different memberships?" -#~ msgstr "Sammenføye linjer med forskjellig tilhørighet?" +#~ msgid "Move" +#~ msgstr "Flytt" + +#~ msgid "Unsaved Changes" +#~ msgstr "Ulagrede endringer" + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "Noen av nodene er (nesten) på linje" #~ msgid "Combine Anyway" #~ msgstr "Sammenføy uansett" - -#~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want " -#~ "to combine them?" -#~ msgstr "Vil du virkelig sammenføye linjer med forskjellig tilhørighet?" - -#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -#~ msgstr "Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»" - -#~ msgid "Purging 1 primitive" -#~ msgstr "Rydder ut 1 objekt" - -#~ msgid "removing reference from way {0}" -#~ msgstr "fjerner henvisning fra vei {0}" - -#~ msgid "Empty member in relation." -#~ msgstr "Tomt medlem i relasjon." - -#~ msgid "Move" -#~ msgstr "Flytt" - -#~ msgid "Unsaved Changes" -#~ msgstr "Ulagrede endringer" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "Noen av nodene er (nesten) på linje" #~ msgid "Email" @@ -26690,4 +26648,12 @@ #~ msgstr "Last inn TCX filer direkte fra JOSM." +#~ msgid "Combine ways with different memberships?" +#~ msgstr "Sammenføye linjer med forskjellig tilhørighet?" + +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "Vil du virkelig sammenføye linjer med forskjellig tilhørighet?" + #~ msgid "All the ways were empty" #~ msgstr "Alle linjene var tomme" @@ -26751,4 +26717,7 @@ #~ msgstr "linjer" +#~ msgid "Empty member in relation." +#~ msgstr "Tomt medlem i relasjon." + #~ msgid "Contacting the OSM server..." #~ msgstr "Kontakter OSM-tjeneren …" @@ -26762,4 +26731,10 @@ #~ msgid "Missing primitive" #~ msgstr "Mangler objekt" + +#~ msgid "Purging 1 primitive" +#~ msgstr "Rydder ut 1 objekt" + +#~ msgid "removing reference from way {0}" +#~ msgstr "fjerner henvisning fra vei {0}" #~ msgid "Failed to load history from the server. Details:
{0}" @@ -26845,4 +26820,7 @@ #~ "Ikke last opp data etter denne meldingen." +#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +#~ msgstr "Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»" + #~ msgid "parameter '{0}' must not be null" #~ msgstr "parameter «{0}» må ha en verdi" Index: /applications/editors/josm/i18n/po/nl.po =================================================================== --- /applications/editors/josm/i18n/po/nl.po (revision 17945) +++ /applications/editors/josm/i18n/po/nl.po (revision 17946) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 16:38+0200\n" -"PO-Revision-Date: 2009-09-22 17:40+0000\n" +"POT-Creation-Date: 2009-10-02 22:03+0200\n" +"PO-Revision-Date: 2009-09-28 18:08+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Dutch \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2009-09-28 14:34+0000\n" +"X-Launchpad-Export-Date: 2009-10-02 19:25+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -47,5 +47,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -90,9 +90,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -147,5 +147,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 @@ -329,5 +329,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -339,12 +339,12 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -366,5 +366,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 @@ -453,9 +453,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -490,6 +490,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -619,22 +619,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 msgid "Combine Way" msgstr "Wegen combineren." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine several ways into one." msgstr "Verschillende wegen combineren tot één weg." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Change directions?" msgstr "Richting omkeren?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 msgid "Reverse and Combine" msgstr "Omkeren en combineren" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -644,5 +644,5 @@ "de richting van enkele omkeren?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -652,10 +652,10 @@ "reeks van knopen)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "{0} wegen combineren" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Selecteer twee of meer wegen om te combineren." @@ -702,5 +702,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -768,5 +768,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333 msgid "OK" @@ -851,8 +851,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -888,5 +888,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 @@ -958,5 +958,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1044,18 +1044,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 msgid "Merge Nodes" msgstr "Knopen samenvoegen" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge nodes into the oldest one." msgstr "Knopen in de oudste samenvoegen" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Please select at least two nodes to merge." msgstr "Minstens twee knopen selecteren om samen te voegen." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -1063,5 +1063,5 @@ "in gebruik is." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261 #, java-format msgid "Merge {0} nodes" @@ -1238,5 +1238,5 @@ msgstr "Inhoudtags uit klembord toepassen op alle geselecteerde items." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106 #, java-format msgid "Pasting {0} tag" @@ -1245,5 +1245,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107 #, java-format msgid "to {0} primitive" @@ -1882,7 +1882,6 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 -#, fuzzy msgid "No data found in this area." -msgstr "Geen gegevens op apparaat gevonden." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2149,53 +2148,53 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a search string." msgstr "Voer een zoekopdracht in:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 msgid "replace selection" msgstr "Selectie vervangen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "add to selection" msgstr "Toevoegen aan selectie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75 msgid "remove from selection" msgstr "Verwijderen uit selectie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 msgid "case sensitive" msgstr "Hoofdlettergevoelig" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "regular expression" msgstr "Reguliere expressie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "Lange straat - 'Lange' en 'straat' in een sleutel of naam." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"Lange straat\" - 'Lange' en 'straat' in een sleutel of naam." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Lange - 'Lang' ergens in de naam." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - sleutel 'type' met exacte waarde 'route'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2205,73 +2204,73 @@ "type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Lange - geen 'Lang' in de naam." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "foot: - key=foot set to any value." msgstr "foot: - sleutel=foot, met een willekeurige waarde." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "Special targets:" msgstr "Speciale zoekopdrachten:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "" "type: - type of the object (node, way, relation)" msgstr "type: - objecttype (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "user:... - all objects changed by user" msgstr "gebruiker:... - alle objecten veranderd door gebruiker" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "id:... - object with given ID (0 for new objects)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - object met opgegeven aantal knopen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "modified - all changed objects" msgstr "modified - alle aangepaste objecten" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "selected - all selected objects" msgstr "selected - alle geselecteerde objecten" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "incomplete - all incomplete objects" msgstr "incomplete - alle incomplete objecten" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 msgid "untagged - all untagged objects" msgstr "ongetagd - alle objecten zonder tag" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "Use | or OR to combine with logical or" msgstr "Gebruik | of OR om te combineren met een logische OR" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" "Gebruik \" om operanten aan te halen (b.v. als sleutel \":\" bevat)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "Use ( and ) to group expressions" msgstr "Gebruik ( en ) om expressies te groeperen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2281,51 +2280,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Zoeken" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Start Search" msgstr "Start zoeken" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 #, java-format msgid "No match found for ''{0}''" msgstr "Geen overeenkomst gevonden voor ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Zoeken naar ''{0}'' heeft de selectie niet uitgebreid." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Zoeken naar ''{0}'' heeft de selectie niet verkleind." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, java-format -msgid "Nothing find in selection by searching for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254 +#, fuzzy, java-format +msgid "Nothing found in selection by searching for ''{0}''" +msgstr "Zoeken naar ''{0}'' heeft de selectie niet uitgebreid." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264 #, java-format msgid "Found {0} matches" msgstr "{0} overeenkomsten gevonden" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 msgid "RX" msgstr "RX" @@ -2641,5 +2640,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 msgid "Delete from relation" msgstr "Uit relatie verwijderen" @@ -2693,12 +2692,12 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 -#, fuzzy, java-format +#, java-format msgid "Purged object ''{0}''" -msgstr "Objecten {0} verplaatsen" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 -#, fuzzy, java-format +#, java-format msgid "Purged {0} objects" -msgstr "{0} object wijzigen" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 @@ -2710,7 +2709,7 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 -#, fuzzy, java-format +#, java-format msgid "Removing reference from relation {0}" -msgstr "Selectie uit relatie {0} zeker verwijderen?" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 @@ -3074,14 +3073,14 @@ msgstr "Waarschuwing: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3089,5 +3088,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3441,7 +3440,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 #, java-format @@ -3483,7 +3480,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 -#, fuzzy msgid "Not Found" -msgstr "Niet verbonden" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 @@ -3801,9 +3797,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289 msgid "(no object)" msgstr "(geen object)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416 msgid "User:" msgstr "" @@ -4270,5 +4266,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "verwijderd" @@ -4369,5 +4365,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4414,6 +4410,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 @@ -4427,6 +4423,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4484,34 +4480,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115 msgid "Conflicts when combining primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121 #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257 msgid "No conflicts to resolve" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 @@ -4529,23 +4525,23 @@ msgstr "alles" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66 msgid "Choose a value" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 -msgid "Please decided which values to keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68 +msgid "Please decide which values to keep" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73 #, java-format msgid "Value ''{0}'' is going to be applied for key ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79 #, java-format msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84 #, java-format msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" @@ -4589,7 +4585,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "Paste ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "From ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "To ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:444 +#, java-format +msgid "{0} tag" +msgid_plural "{0} tags" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 #, java-format @@ -4599,7 +4615,5 @@ msgstr[1] "{0} wegen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format @@ -4609,26 +4623,4 @@ msgstr[1] "{0} relaties" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "Paste ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "From ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "To ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425 -#, java-format -msgid "{0} tag" -msgid_plural "{0} tags" -msgstr[0] "" -msgstr[1] "" - #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 #, java-format @@ -4695,4 +4687,13 @@ msgid "Decision" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42 +msgid "Please select the values to keep for the following tags." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 +#, fuzzy +msgid "Show tags with conflicts only" +msgstr "Knopen (met conflicten)" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4711,5 +4712,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 @@ -4806,5 +4807,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -4960,6 +4961,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323 #, java-format msgid "This will change up to {0} object." @@ -4968,22 +4969,22 @@ msgstr[1] "Dit verandert {0} objecten." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149 msgid "An empty value deletes the key." msgstr "Een lege waarde verwijdert de sleutel." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347 msgid "Change values?" msgstr "Waarden aanpassen?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264 #, java-format msgid "Change properties of up to {0} object" @@ -4992,69 +4993,69 @@ msgstr[1] "Eigenschappen van {0} objecten aanpassen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 msgid "Please select a key" msgstr "Selecteer een sleutel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335 msgid "Please select a value" msgstr "Selecteer een waarde" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447 msgid "Please select the objects you want to change properties for." msgstr "Selecteer de objecten waarvan de eigenschappen moet veranderen." +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "Eigenschappen/Lidmaatschappen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 msgid "Properties for selected objects." msgstr "Eigenschappen voor geselecteerde objecten." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 msgid "Member Of" msgstr "Lid van" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576 msgid "Add Properties" msgstr "Eigenschappen toevoegen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 msgid "Add a new key/value pair to all objects" msgstr "Een nieuwe sleutel/waarde aan alle objecten toevoegen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Edit Properties" msgstr "Eigenschappen bewerken" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 msgid "Edit the value of the selected key for all objects" msgstr "De geselecteerde sleutelwaarde voor alle objecten bewerken" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Eigenschappen: {0} / Leden: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799 msgid "Properties / Memberships" msgstr "Eigenschappen / Leden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Change relation" msgstr "Relatie wijzigen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Selectie uit relatie {0} zeker verwijderen?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860 msgid "Delete the selected key in all objects" msgstr "De geselecteerde sleutel in alle objecten verwijderen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862 msgid "Delete Properties" msgstr "Eigenschappen verwijderen" @@ -5096,7 +5097,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 -#, fuzzy msgid "Set the current selection to the list of selected relations" -msgstr "De huidige selectie kan niet gebruik worden voor splitsen." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5137,9 +5137,9 @@ msgstr "Selectie: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307 msgid "Undock the panel" msgstr "Laat paneel drijven" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5148,5 +5148,5 @@ "werkbalk." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332 msgid "Click to minimize/maximize the panel content" msgstr "Klik om de paneelinhoud te verkleinen/vergroten" @@ -6568,5 +6568,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 #: build/trans_presets.java:67 build/trans_presets.java:103 #: build/trans_presets.java:143 build/trans_presets.java:180 @@ -6944,7 +6944,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -#, fuzzy msgid "Save/Upload and Exit" -msgstr "Sla op en verlaat JOSM" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 @@ -6953,7 +6952,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -#, fuzzy msgid "Save/Upload and Delete" -msgstr "Uploaden afgebroken" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 @@ -7167,5 +7165,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7519,9 +7517,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 -#, fuzzy, java-format +#, java-format msgid "There was {0} conflict detected." msgid_plural "There were {0} conflicts detected." -msgstr[0] "Er waren {0} tegenstrijdigheden tijdens het importeren." -msgstr[1] "Er waren {0} tegenstrijdigheden tijdens het importeren." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 @@ -7537,7 +7535,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 -#, fuzzy msgid "Conflicts detected" -msgstr "Tegenstrijdigheid ontdekt" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 @@ -7887,5 +7884,5 @@ msgstr "Calibratie geluidsopname" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Kleur" @@ -8896,5 +8893,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313 msgid "Parse error: invalid document structure for GPX document." msgstr "Ontleedfout: documentstructuur van GPX-bestand is ongeldig" @@ -9073,19 +9070,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9549,7 +9546,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' must not be null" -msgstr "Parameter \"{0}\" mag niet leeg zijn." +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 @@ -10272,69 +10269,73 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911 +msgid "Starting and ending numbers must be the same for alphabetic addresses" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943 msgid "Starting address number must be less than ending address number" msgstr "" @@ -19944,24 +19945,20 @@ #. item "Man Made/Tower" text "Name" #: build/trans_presets.java:2296 -#, fuzzy msgid "Tower type" -msgstr "Toren" +msgstr "" #. item "Man Made/Tower" combo "Tower type" #: build/trans_presets.java:2296 -#, fuzzy msgid "communication" -msgstr "Locatie" +msgstr "" #: build/trans_presets.java:2296 -#, fuzzy msgid "observation" -msgstr "Stijging" +msgstr "" #. #: build/trans_presets.java:2298 -#, fuzzy msgid "Height (meters)" -msgstr "Max. hoogte (meters)" +msgstr "" #. item "Man Made/Tower" text "Operator" @@ -20021,7 +20018,6 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "oil" -msgstr "fossiele brandstoffen" +msgstr "" #: build/trans_presets.java:2330 build/trans_presets.java:2372 @@ -20030,27 +20026,22 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "sewage" -msgstr "gebruik" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "heat" -msgstr "heide" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "any substance" -msgstr "A tegen afstand" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "underwater" -msgstr "water" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "overground" -msgstr "ondergronds" +msgstr "" #: build/trans_presets.java:2333 @@ -20195,17 +20186,14 @@ #. item "Man Made/Power Tower" combo "Type" #: build/trans_presets.java:2398 -#, fuzzy msgid "tower" -msgstr "Toren" +msgstr "" #: build/trans_presets.java:2398 -#, fuzzy msgid "pole" -msgstr "Rol" +msgstr "" #: build/trans_presets.java:2399 -#, fuzzy msgid "Tower reference" -msgstr "Lijnreferentie" +msgstr "" #. item "Man Made/Power Tower" text "Tower reference" @@ -20223,18 +20211,15 @@ #. item "Man Made/Power Line" label "Edit Power Line" #: build/trans_presets.java:2405 -#, fuzzy msgid "Line type" -msgstr "Soort piste" +msgstr "" #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2405 -#, fuzzy msgid "line" -msgstr "Pijplijn" +msgstr "" #: build/trans_presets.java:2405 -#, fuzzy msgid "minor_line" -msgstr "op- en afrit autosnelweg" +msgstr "" #. item "Man Made/Power Line" text "Line reference" @@ -20245,7 +20230,6 @@ #. item "Man Made/Power Line" text "Voltage" #: build/trans_presets.java:2409 -#, fuzzy msgid "Amount of Cables" -msgstr "Hoeveelheid draden" +msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" @@ -20256,22 +20240,18 @@ #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" #: build/trans_presets.java:2410 -#, fuzzy msgid "single" -msgstr "Hoek" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "double" -msgstr "Boule" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "triple" -msgstr "Overstap" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "quad" -msgstr "Quaker" +msgstr "" #: build/trans_presets.java:2413 @@ -26166,20 +26146,4 @@ msgstr "" -#~ msgid "Combine ways with different memberships?" -#~ msgstr "Wegen combineren ondanks verschillende relaties?" - -#~ msgid "Combine Anyway" -#~ msgstr "Toch combineren" - -#~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want " -#~ "to combine them?" -#~ msgstr "" -#~ "De geselecteerde wegen zijn onderdeel van niet verschillende relaties. " -#~ "Weet u zeker dat u ze wilt combineren?" - -#~ msgid "Empty member in relation." -#~ msgstr "Relatie bevat leeg lid." - #~ msgid "Unknown version" #~ msgstr "Onbekende versie" @@ -26360,4 +26324,7 @@ #~ "\n" #~ "{0}" + +#~ msgid "Empty member in relation." +#~ msgstr "Relatie bevat leeg lid." #~ msgid "Import TCX File..." @@ -26537,4 +26504,14 @@ #~ msgstr "Los {0} conflicten in {1} objecten op" +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "" +#~ "De geselecteerde wegen zijn onderdeel van niet verschillende relaties. " +#~ "Weet u zeker dat u ze wilt combineren?" + +#~ msgid "Combine ways with different memberships?" +#~ msgstr "Wegen combineren ondanks verschillende relaties?" + #~ msgid "No document open so nothing to save." #~ msgstr "Geen document geopend, dus ook niets om op te slaan." @@ -26658,4 +26635,7 @@ #~ msgstr "Verwijder en download" +#~ msgid "Combine Anyway" +#~ msgstr "Toch combineren" + #~ msgid "" #~ "Please select at least one node, way or relation. Only already uploaded " Index: /applications/editors/josm/i18n/po/pl.po =================================================================== --- /applications/editors/josm/i18n/po/pl.po (revision 17945) +++ /applications/editors/josm/i18n/po/pl.po (revision 17946) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 16:38+0200\n" -"PO-Revision-Date: 2009-09-22 18:15+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2009-10-02 22:03+0200\n" +"PO-Revision-Date: 2009-10-01 13:18+0000\n" +"Last-Translator: Zbigniew Czernik \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2009-09-28 14:33+0000\n" +"X-Launchpad-Export-Date: 2009-10-02 19:24+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: POLAND\n" @@ -51,5 +51,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -94,9 +94,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -129,6 +129,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -151,5 +151,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 @@ -332,5 +332,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -342,12 +342,12 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -369,5 +369,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 @@ -458,9 +458,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -495,6 +495,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -624,22 +624,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 msgid "Combine Way" msgstr "Połącz drogi" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine several ways into one." msgstr "Łączy kilka dróg w jedną." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Change directions?" msgstr "Zmienić kierunek?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 msgid "Reverse and Combine" msgstr "Odwróć i połącz" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -649,5 +649,5 @@ "zmienić kierunek niektórych dróg?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -657,10 +657,10 @@ "węzłów)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Połącz {0} dróg" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Wybierz co najmniej dwie drogi do połączenia." @@ -707,5 +707,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -775,5 +775,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333 msgid "OK" @@ -858,8 +858,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -895,5 +895,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 @@ -965,5 +965,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1053,18 +1053,18 @@ msgstr "Włącz aktualną warstwę do innej." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 msgid "Merge Nodes" msgstr "Połącz węzły" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge nodes into the oldest one." msgstr "Scala wybrane węzły z najstarszym." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Please select at least two nodes to merge." msgstr "Proszę wybierz przynajmniej dwa węzły aby scalić." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -1072,5 +1072,5 @@ "używana." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261 #, java-format msgid "Merge {0} nodes" @@ -1249,5 +1249,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106 #, java-format msgid "Pasting {0} tag" @@ -1256,5 +1256,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107 #, java-format msgid "to {0} primitive" @@ -1886,5 +1886,5 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 msgid "No data found in this area." -msgstr "" +msgstr "Nie znaleziono żadnych danych w tym obszarze." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2148,54 +2148,54 @@ msgstr "Nie mogę szukać ponieważ nie załadowano danych." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a search string." msgstr "Podaj proszę czego szukać." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 msgid "replace selection" msgstr "zamień zaznaczenie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "add to selection" msgstr "dodaj do zaznaczenia" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75 msgid "remove from selection" msgstr "usuń z zaznaczenia" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 msgid "case sensitive" msgstr "uwzględnij wielkość liter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "regular expression" msgstr "wyrażenie regularne" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "" "Baker Street - 'Baker' oraz 'Street' w dowolnym kluczu lub nazwie." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"Baker Street\" - 'Baker Street' w dowolnym kluczu lub nazwie." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' gdziekolwiek w nazwie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "type=route - key 'type' with value exactly 'route'." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2203,17 +2203,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - brak 'Bak' w nazwie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "foot: - key=foot set to any value." msgstr "foot: - klucz=foot ustawiony na dowolną wartość" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "Special targets:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "" "type: - type of the object (node, way, relation)" @@ -2221,55 +2221,55 @@ "type: - rodzaj obiektu (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "user:... - all objects changed by user" msgstr "user:... - wszystkie obiekty zmienione przez użytkownika" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "id:... - object with given ID (0 for new objects)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - obiekt z podaną liczbą węzłów" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "modified - all changed objects" msgstr "modified - wszystkie zmienione obiekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "selected - all selected objects" msgstr "selected - wszystkie zaznaczone obiekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "incomplete - all incomplete objects" msgstr "incomplete - wszystkie niekompletne obiekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 msgid "untagged - all untagged objects" msgstr "untagged - wszystkie obiekty bez tagów" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "Use | or OR to combine with logical or" msgstr "Użyj I lub OR by połączyć logicznym \"lub\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "Użyj \" aby wpisać operator (np.: jeżeli klucz zawiera :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "Use ( and ) to group expressions" msgstr "Użyj ( oraz ) aby pogrupować wyrażenia" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2279,51 +2279,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Szukaj" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Start Search" msgstr "Rozpocznij szukanie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 #, java-format msgid "No match found for ''{0}''" msgstr "Nie znaleziono nic szukając ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Niczego nie dodano do zaznaczenia szukając \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Niczego nie usunięto z zaznaczenia szukając \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, java-format -msgid "Nothing find in selection by searching for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254 +#, fuzzy, java-format +msgid "Nothing found in selection by searching for ''{0}''" +msgstr "Niczego nie dodano do zaznaczenia szukając \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264 #, java-format msgid "Found {0} matches" msgstr "Znaleziono {0} pasujących." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 msgid "RX" msgstr "" @@ -2464,9 +2464,9 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53 msgid "Relation ..." -msgstr "" +msgstr "Relacja ..." #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54 msgid "... refers to relation" -msgstr "" +msgstr "... odwołuje się do relacji" #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87 @@ -2477,30 +2477,30 @@ #, java-format msgid "Add node {0}" -msgstr "" +msgstr "Dodaj węzeł {0}" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67 #, java-format msgid "Add way {0}" -msgstr "" +msgstr "Dodaj drogę {0}" #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68 #, java-format msgid "Add relation {0}" -msgstr "" +msgstr "Dodaj relację {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 #, java-format msgid "Change node {0}" -msgstr "" +msgstr "Zmień węzeł {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50 #, java-format msgid "Change way {0}" -msgstr "" +msgstr "Zmień drogę {0}" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51 #, java-format msgid "Change relation {0}" -msgstr "" +msgstr "Zmień relację {0}" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102 @@ -2634,5 +2634,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 msgid "Delete from relation" msgstr "Usuń z relacji" @@ -2686,12 +2686,12 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 -#, fuzzy, java-format +#, java-format msgid "Purged object ''{0}''" -msgstr "Przesuń obiekty {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 -#, fuzzy, java-format +#, java-format msgid "Purged {0} objects" -msgstr "Zmień {0} obiekt" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 @@ -2703,7 +2703,7 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 -#, fuzzy, java-format +#, java-format msgid "Removing reference from relation {0}" -msgstr "Na pewno usunąć zaznaczenie z relacji {0}?" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 @@ -3066,14 +3066,14 @@ msgstr "Uwaga: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3081,5 +3081,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3430,7 +3430,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 #, java-format @@ -3474,7 +3472,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 -#, fuzzy msgid "Not Found" -msgstr "Nie połączony" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 @@ -3780,9 +3777,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289 msgid "(no object)" msgstr "(brak obiektu)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416 msgid "User:" msgstr "" @@ -4246,5 +4243,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "usunięto" @@ -4345,5 +4342,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4390,6 +4387,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 @@ -4403,6 +4400,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4460,34 +4457,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115 msgid "Conflicts when combining primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121 #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257 msgid "No conflicts to resolve" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 @@ -4505,23 +4502,23 @@ msgstr "wszystkie" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66 msgid "Choose a value" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 -msgid "Please decided which values to keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68 +msgid "Please decide which values to keep" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73 #, java-format msgid "Value ''{0}'' is going to be applied for key ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79 #, java-format msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84 #, java-format msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" @@ -4565,7 +4562,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "Paste ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "From ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "To ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:444 +#, java-format +msgid "{0} tag" +msgid_plural "{0} tags" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 #, java-format @@ -4576,7 +4593,5 @@ msgstr[2] "{0} dróg" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format @@ -4587,26 +4602,4 @@ msgstr[2] "{0} relacji" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "Paste ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "From ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "To ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425 -#, java-format -msgid "{0} tag" -msgid_plural "{0} tags" -msgstr[0] "" -msgstr[1] "" - #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 #, java-format @@ -4672,4 +4665,12 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 msgid "Decision" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42 +msgid "Please select the values to keep for the following tags." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 +msgid "Show tags with conflicts only" msgstr "" @@ -4689,5 +4690,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 @@ -4780,5 +4781,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -4934,6 +4935,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323 #, java-format msgid "This will change up to {0} object." @@ -4943,22 +4944,22 @@ msgstr[2] "Ta operacja może zmienić {0} obiektów." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149 msgid "An empty value deletes the key." msgstr "Ustawienie wartości na pustą usuwa klucz" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347 msgid "Change values?" msgstr "Zmienić wartości?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264 #, java-format msgid "Change properties of up to {0} object" @@ -4968,69 +4969,69 @@ msgstr[2] "Zmiana właściwości {0} obiektów." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 msgid "Please select a key" msgstr "Proszę wybierz klucz" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335 msgid "Please select a value" msgstr "Proszę wybierz wartość" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447 msgid "Please select the objects you want to change properties for." msgstr "Zaznacz proszę te obiekty, których właściwości chcesz zmienić." +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "Właściwości/członkostwo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 msgid "Properties for selected objects." msgstr "Właściwości zaznaczonych obiektów." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 msgid "Member Of" msgstr "Członek" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576 msgid "Add Properties" msgstr "Dodaj właściwości" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 msgid "Add a new key/value pair to all objects" msgstr "Dodaj nową parę nazwa/wartość do wszystkich obiektów" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Edit Properties" msgstr "Edycja właściwości" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 msgid "Edit the value of the selected key for all objects" msgstr "Edytuj wartość wybranego klucza dla wszystkich obiektów" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Właściwości: {0} / członkostwo: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799 msgid "Properties / Memberships" msgstr "Właściwości / członkostwo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Change relation" msgstr "Zmień relację" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Na pewno usunąć zaznaczenie z relacji {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860 msgid "Delete the selected key in all objects" msgstr "Usuń wybrany klucz ze wszystkich obiektów." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862 msgid "Delete Properties" msgstr "Usuń właściwość" @@ -5072,7 +5073,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 -#, fuzzy msgid "Set the current selection to the list of selected relations" -msgstr "Bieżące zaznaczenie nie może być użyte do rozdzielenia." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5113,9 +5113,9 @@ msgstr "Zaznaczenie: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307 msgid "Undock the panel" msgstr "Oderwij panel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5123,5 +5123,5 @@ "Zamknij panel. Możesz ponownie go otworzyć używając przycisków po lewej." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332 msgid "Click to minimize/maximize the panel content" msgstr "Kliknij aby zminimalizować/maksymalizować zawartość panela" @@ -6542,5 +6542,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 #: build/trans_presets.java:67 build/trans_presets.java:103 #: build/trans_presets.java:143 build/trans_presets.java:180 @@ -6918,7 +6918,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -#, fuzzy msgid "Save/Upload and Exit" -msgstr "Zapisz i wyjdź" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 @@ -7140,5 +7139,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7493,10 +7492,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 -#, fuzzy, java-format +#, java-format msgid "There was {0} conflict detected." msgid_plural "There were {0} conflicts detected." -msgstr[0] "Wystąpił/o {0} koflikt/ów podczas importu." -msgstr[1] "Wystąpił/o {0} koflikt/ów podczas importu." -msgstr[2] "Wystąpił/o {0} koflikt/ów podczas importu." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 @@ -7510,10 +7508,8 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 -#, fuzzy msgid "Conflicts detected" -msgstr "Wykryto konflikt" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 @@ -7848,5 +7844,5 @@ msgstr "Kalibracja urządzenia nagrywającego" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Kolor" @@ -8825,5 +8821,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313 msgid "Parse error: invalid document structure for GPX document." msgstr "Błąd parsowania: błędna struktura dokumentu gpx" @@ -9002,19 +8998,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9478,7 +9474,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' must not be null" -msgstr "parameter ''{0}'' nie może być pusty (null)" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 @@ -10203,69 +10199,73 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911 +msgid "Starting and ending numbers must be the same for alphabetic addresses" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943 msgid "Starting address number must be less than ending address number" msgstr "" @@ -19791,24 +19791,20 @@ #. item "Man Made/Tower" text "Name" #: build/trans_presets.java:2296 -#, fuzzy msgid "Tower type" -msgstr "Typ trasy" +msgstr "" #. item "Man Made/Tower" combo "Tower type" #: build/trans_presets.java:2296 -#, fuzzy msgid "communication" -msgstr "połaczenie" +msgstr "" #: build/trans_presets.java:2296 -#, fuzzy msgid "observation" -msgstr "Wysokość" +msgstr "" #. #: build/trans_presets.java:2298 -#, fuzzy msgid "Height (meters)" -msgstr "Maks. wysokość (w metrach)" +msgstr "" #. item "Man Made/Tower" text "Operator" @@ -19868,7 +19864,6 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "oil" -msgstr "cieplna" +msgstr "" #: build/trans_presets.java:2330 build/trans_presets.java:2372 @@ -19877,27 +19872,22 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "sewage" -msgstr "użycie" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "heat" -msgstr "zdrowie" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "any substance" -msgstr "A wg. odległości" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "underwater" -msgstr "woda" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "overground" -msgstr "podziemny" +msgstr "" #: build/trans_presets.java:2333 @@ -20042,17 +20032,14 @@ #. item "Man Made/Power Tower" combo "Type" #: build/trans_presets.java:2398 -#, fuzzy msgid "tower" -msgstr "wieża" +msgstr "" #: build/trans_presets.java:2398 -#, fuzzy msgid "pole" -msgstr "Rola" +msgstr "" #: build/trans_presets.java:2399 -#, fuzzy msgid "Tower reference" -msgstr "oznaczenie linii" +msgstr "" #. item "Man Made/Power Tower" text "Tower reference" @@ -20070,18 +20057,15 @@ #. item "Man Made/Power Line" label "Edit Power Line" #: build/trans_presets.java:2405 -#, fuzzy msgid "Line type" -msgstr "Rodzaj trasy" +msgstr "" #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2405 -#, fuzzy msgid "line" -msgstr "rurociąg" +msgstr "" #: build/trans_presets.java:2405 -#, fuzzy msgid "minor_line" -msgstr "ciąg pieszy" +msgstr "" #. item "Man Made/Power Line" text "Line reference" @@ -20092,7 +20076,6 @@ #. item "Man Made/Power Line" text "Voltage" #: build/trans_presets.java:2409 -#, fuzzy msgid "Amount of Cables" -msgstr "Ilość przewodów" +msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" @@ -20103,22 +20086,18 @@ #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" #: build/trans_presets.java:2410 -#, fuzzy msgid "single" -msgstr "Kąt" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "double" -msgstr "bule" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "triple" -msgstr "przełaz" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "quad" -msgstr "kwakrzy" +msgstr "" #: build/trans_presets.java:2413 @@ -21034,5 +21013,5 @@ #: build/trans_presets.java:2829 msgid "Hamlet" -msgstr "wólka" +msgstr "przysiółek" #. item @@ -26013,78 +25992,69 @@ msgstr "" +#~ msgid "Move" +#~ msgstr "Przenieś" + +#~ msgid "No document open so nothing to save." +#~ msgstr "Żaden dokument nie jest otwarty więc nie ma nic do zapisania." + +#~ msgid "Unknown file extension." +#~ msgstr "Nieznane rozszerzenie pliku." + +#~ msgid "Email" +#~ msgstr "E-mail" + +#~ msgid "Unsaved Changes" +#~ msgstr "Niezapisane zmiany" + +#~ msgid "Object" +#~ msgstr "Obiekt" + +#~ msgid "Unknown version" +#~ msgstr "Nieznana wersja" + +#~ msgid "true" +#~ msgstr "prawda" + +#~ msgid "false" +#~ msgstr "fałsz" + +#~ msgid "Change" +#~ msgstr "Zmień" + +#~ msgid "unnamed" +#~ msgstr "bez nazwy" + +#~ msgid "Data Layer" +#~ msgstr "Warstwa danych" + +#~ msgid "my version:" +#~ msgstr "moja wersja:" + +#~ msgid "their version:" +#~ msgstr "ich wersja:" + +#~ msgid "Cannot connect to server." +#~ msgstr "Nie można połączyć się z serwerem." + +#~ msgid "Date" +#~ msgstr "Data" + +#~ msgid "Revert" +#~ msgstr "Wycofaj" + +#~ msgid "OSM username (email)" +#~ msgstr "Użytkownik OSM (email)" + +#~ msgid "position" +#~ msgstr "pozycja" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "Delete {1} {0}" +#~ msgstr "Usuń {1} {0}" + #~ msgid "Combine ways with different memberships?" #~ msgstr "Czy połączyć drogi, które należą do różnych relacji?" - -#~ msgid "Combine Anyway" -#~ msgstr "Połącz mimo tego" - -#~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want " -#~ "to combine them?" -#~ msgstr "" -#~ "Wybrane drogi należą do różnych relacji. Czy nadal chcesz je połączyć?" - -#~ msgid "Move" -#~ msgstr "Przenieś" - -#~ msgid "No document open so nothing to save." -#~ msgstr "Żaden dokument nie jest otwarty więc nie ma nic do zapisania." - -#~ msgid "Unknown file extension." -#~ msgstr "Nieznane rozszerzenie pliku." - -#~ msgid "Email" -#~ msgstr "E-mail" - -#~ msgid "Unsaved Changes" -#~ msgstr "Niezapisane zmiany" - -#~ msgid "Object" -#~ msgstr "Obiekt" - -#~ msgid "Unknown version" -#~ msgstr "Nieznana wersja" - -#~ msgid "true" -#~ msgstr "prawda" - -#~ msgid "false" -#~ msgstr "fałsz" - -#~ msgid "Change" -#~ msgstr "Zmień" - -#~ msgid "unnamed" -#~ msgstr "bez nazwy" - -#~ msgid "Data Layer" -#~ msgstr "Warstwa danych" - -#~ msgid "my version:" -#~ msgstr "moja wersja:" - -#~ msgid "their version:" -#~ msgstr "ich wersja:" - -#~ msgid "Cannot connect to server." -#~ msgstr "Nie można połączyć się z serwerem." - -#~ msgid "Date" -#~ msgstr "Data" - -#~ msgid "Revert" -#~ msgstr "Wycofaj" - -#~ msgid "OSM username (email)" -#~ msgstr "Użytkownik OSM (email)" - -#~ msgid "position" -#~ msgstr "pozycja" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "Delete {1} {0}" -#~ msgstr "Usuń {1} {0}" #~ msgid "Validate" @@ -26356,4 +26326,13 @@ #~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "" +#~ "Wybrane drogi należą do różnych relacji. Czy nadal chcesz je połączyć?" + +#~ msgid "Combine Anyway" +#~ msgstr "Połącz mimo tego" + +#~ msgid "" #~ "Please select at least one node, way or relation. Only already uploaded " #~ "elements have a history." Index: /applications/editors/josm/i18n/po/pt_BR.po =================================================================== --- /applications/editors/josm/i18n/po/pt_BR.po (revision 17945) +++ /applications/editors/josm/i18n/po/pt_BR.po (revision 17946) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 16:38+0200\n" -"PO-Revision-Date: 2009-09-27 05:02+0000\n" -"Last-Translator: Skippern \n" +"POT-Creation-Date: 2009-10-02 22:03+0200\n" +"PO-Revision-Date: 2009-09-28 17:02+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2009-09-28 14:33+0000\n" +"X-Launchpad-Export-Date: 2009-10-02 19:25+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -47,5 +47,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -90,9 +90,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -125,6 +125,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -147,5 +147,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 @@ -336,5 +336,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -346,12 +346,12 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -373,5 +373,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 @@ -462,9 +462,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -499,6 +499,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -628,22 +628,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 msgid "Combine Way" msgstr "Combinar Caminhos" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine several ways into one." msgstr "Combinar vários caminho em um só" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Change directions?" msgstr "Inverter direções?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 msgid "Reverse and Combine" msgstr "Inverter e Combinar" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -653,5 +653,5 @@ "algum destes?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -661,10 +661,10 @@ "único conjunto de nós)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Combinar {0} caminhos" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Por favor selecione no mínimo 2 caminhos a combinar" @@ -711,5 +711,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -777,5 +777,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333 msgid "OK" @@ -861,8 +861,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -898,5 +898,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 @@ -968,5 +968,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1057,23 +1057,23 @@ msgstr "Combinar camada atual em outra camada" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 msgid "Merge Nodes" msgstr "Unir Nós" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge nodes into the oldest one." msgstr "Unir nós no mais antigo" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Please select at least two nodes to merge." msgstr "Por favor selecione no mínimo dois nós para unir." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" "Não é possivel unir nós: Será necessário deletar o caminho que ainda é usado." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261 #, java-format msgid "Merge {0} nodes" @@ -1256,5 +1256,5 @@ "selecionados." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106 #, java-format msgid "Pasting {0} tag" @@ -1263,5 +1263,5 @@ msgstr[1] "A colar {0} tags" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107 #, java-format msgid "to {0} primitive" @@ -1915,7 +1915,6 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 -#, fuzzy msgid "No data found in this area." -msgstr "Nenhum exportador encontrado! Nada guardado." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2190,53 +2189,53 @@ msgstr "Não pode procurar porque não exite informação carregada." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a search string." msgstr "Por favor, entre com uma string de busca." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 msgid "replace selection" msgstr "susbtitui a seleção" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "add to selection" msgstr "adiciona à seleção" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75 msgid "remove from selection" msgstr "remove da seleção" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 msgid "case sensitive" msgstr "sensível à caixa alta" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "regular expression" msgstr "expressão regular" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "Rua Augusta - 'Rua' and 'Augusta em qualquer chave ou valor." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"Baker Street\" - 'Baker Street' em qualquer chave ou nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:May - 'Bak' em qualquer parte do nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - chave 'type' com valor exato 'route'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2246,17 +2245,17 @@ "b>, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - 'Bak' não existe no nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "foot: - key=foot set to any value." msgstr "foot: - qualquer valor presente na chave=foot" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "Special targets:" msgstr "Destinos especiais:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "" "type: - type of the object (node, way, relation)" @@ -2264,33 +2263,33 @@ "type: - tipo de objeto (nó, caminho, relação)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "user:... - all objects changed by user" msgstr "user:... - todos os objetos modificados por determinado usuário" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "id:... - object with given ID (0 for new objects)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "nodes:... - object with given number of nodes" msgstr "nós:... - objeto com um determinado número de nós" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "modified - all changed objects" msgstr "modificado - todos os objetos modificados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "selected - all selected objects" msgstr "selecionados - todos os objetos selecionados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "incomplete - all incomplete objects" msgstr "incompletos - todos os objetos incompletos" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 msgid "untagged - all untagged objects" msgstr "não tagueados - todos objetos não tagueados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 msgid "" "child expr - all children of objects matching the expression" @@ -2298,5 +2297,5 @@ "child expr - todos objetos filhos que coincidem com a expressão" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "" "parent expr - all parents of objects matching the expression" @@ -2305,17 +2304,17 @@ "expressão" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "Use | or OR to combine with logical or" msgstr "Use | ou OR para combinar com \"ou\" lógico" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "Usar \" para operadores de aspas (se a chave contém :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "Use ( and ) to group expressions" msgstr "Usar ( and ) para agrupar expressões" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2325,51 +2324,51 @@ msgstr "Filtro" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Buscar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Start Search" msgstr "Iniciar Pesquisa" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 #, java-format msgid "No match found for ''{0}''" msgstr "Não há valores coincidentes para ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Nada adicionado à seleção pela busca por \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Nada foi removido da seleção quando buscado por \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, java-format -msgid "Nothing find in selection by searching for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254 +#, fuzzy, java-format +msgid "Nothing found in selection by searching for ''{0}''" +msgstr "Nada adicionado à seleção pela busca por \"{0}\"" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264 #, java-format msgid "Found {0} matches" msgstr "Encontrados {0} resultados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 msgid "RX" msgstr "RX" @@ -2647,10 +2646,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 -#, fuzzy, java-format +#, java-format msgid "" "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" -"Não é possível desfazer comando \"{0}\" porque a camada \"{1}\" não está " -"mais presente" #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 @@ -2698,5 +2695,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 msgid "Delete from relation" msgstr "Deletar da relação" @@ -2754,12 +2751,12 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 -#, fuzzy, java-format +#, java-format msgid "Purged object ''{0}''" -msgstr "Mover objetos {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 -#, fuzzy, java-format +#, java-format msgid "Purged {0} objects" -msgstr "Modificar objeto {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 @@ -2773,7 +2770,7 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 -#, fuzzy, java-format +#, java-format msgid "Removing reference from relation {0}" -msgstr "removendo referência da relação {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 @@ -3157,14 +3154,14 @@ msgstr "Aviso: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3172,5 +3169,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3530,7 +3527,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 #, java-format @@ -3572,7 +3567,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 -#, fuzzy msgid "Not Found" -msgstr "Não conectada" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 @@ -3887,9 +3881,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289 msgid "(no object)" msgstr "(nenhum objeto)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416 msgid "User:" msgstr "Usuário:" @@ -4391,5 +4385,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "removido" @@ -4492,5 +4486,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4539,6 +4533,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 @@ -4552,6 +4546,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4609,34 +4603,34 @@ msgstr "Seus dados não inclui uma tag com a chave {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115 msgid "Conflicts when combining primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121 #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257 msgid "No conflicts to resolve" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 @@ -4654,23 +4648,23 @@ msgstr "todos os números" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66 msgid "Choose a value" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 -msgid "Please decided which values to keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68 +msgid "Please decide which values to keep" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73 #, java-format msgid "Value ''{0}'' is going to be applied for key ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79 #, java-format msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84 #, java-format msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" @@ -4714,7 +4708,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "Paste ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "From ..." +msgstr "De ..." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "To ..." +msgstr "Para ..." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:444 +#, java-format +msgid "{0} tag" +msgid_plural "{0} tags" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 #, java-format @@ -4724,7 +4738,5 @@ msgstr[1] "{0} vias" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format @@ -4733,26 +4745,4 @@ msgstr[0] "{0} relação" msgstr[1] "{0} relações" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "Paste ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "From ..." -msgstr "De ..." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "To ..." -msgstr "Para ..." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425 -#, java-format -msgid "{0} tag" -msgid_plural "{0} tags" -msgstr[0] "" -msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 @@ -4821,4 +4811,13 @@ msgstr "Decisão" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42 +msgid "Please select the values to keep for the following tags." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 +#, fuzzy +msgid "Show tags with conflicts only" +msgstr "Nós (com conflitos)" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 @@ -4836,5 +4835,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 @@ -4929,5 +4928,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -5083,6 +5082,6 @@ msgstr "Informação sobre camada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323 #, java-format msgid "This will change up to {0} object." @@ -5091,22 +5090,22 @@ msgstr[1] "Isto modificará {0} objetos." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149 msgid "An empty value deletes the key." msgstr "Um valor vazio apaga a chave." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347 msgid "Change values?" msgstr "Modificar valores?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264 #, java-format msgid "Change properties of up to {0} object" @@ -5115,69 +5114,69 @@ msgstr[1] "Modificar propriedades de até {0} objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 msgid "Please select a key" msgstr "Por favor, selecione uma chave" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335 msgid "Please select a value" msgstr "Por favor, selecione um valor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447 msgid "Please select the objects you want to change properties for." msgstr "Por favor, selecione os objetos que deseja modificar propriedades." +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "Propriedades/Associações" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 msgid "Properties for selected objects." msgstr "Propriedades dos objetos selecionados." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 msgid "Member Of" msgstr "Membro de" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576 msgid "Add Properties" msgstr "Adicionar Propriedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 msgid "Add a new key/value pair to all objects" msgstr "Adicionar um novo par chave/valor para todos objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Edit Properties" msgstr "Editar Propriedades" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 msgid "Edit the value of the selected key for all objects" msgstr "Editar o valor da chave selecionada para todos objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Propriedades: {0} / Membros: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799 msgid "Properties / Memberships" msgstr "Propriedades / Associações" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Change relation" msgstr "Modificar relação" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Confirmar a exclusão da relação {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860 msgid "Delete the selected key in all objects" msgstr "Excluir a chave selecionada em todos objetos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862 msgid "Delete Properties" msgstr "Excluir Propriedades" @@ -5219,7 +5218,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 -#, fuzzy msgid "Set the current selection to the list of selected relations" -msgstr "Editar relação selecionada atualmente" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5260,9 +5258,9 @@ msgstr "Seleção: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307 msgid "Undock the panel" msgstr "Desacoplar painel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5270,5 +5268,5 @@ "Fechar este painel. Você pode reabri-lo com os botões da barra da esquerda." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332 msgid "Click to minimize/maximize the panel content" msgstr "Clique para minimizar/maximizar o conteúdo do painel" @@ -6703,5 +6701,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 #: build/trans_presets.java:67 build/trans_presets.java:103 #: build/trans_presets.java:143 build/trans_presets.java:180 @@ -7079,7 +7077,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -#, fuzzy msgid "Save/Upload and Exit" -msgstr "Salvar e Sair" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 @@ -7303,5 +7300,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7651,9 +7648,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 -#, fuzzy, java-format +#, java-format msgid "There was {0} conflict detected." msgid_plural "There were {0} conflicts detected." -msgstr[0] "Houve {0} conflitos durante a importação." -msgstr[1] "Houve {0} conflitos durante a importação." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 @@ -7669,7 +7666,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 -#, fuzzy msgid "Conflicts detected" -msgstr "Detectado conflito" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 @@ -8010,5 +8006,5 @@ msgstr "Calibração do gravador de voz" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Cor" @@ -8978,5 +8974,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313 msgid "Parse error: invalid document structure for GPX document." msgstr "Erro de interpretação: estrutura inválida para documento gpx" @@ -9155,19 +9151,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9631,7 +9627,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' must not be null" -msgstr "parâmetro ''{0}'' não pode ser nulo" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 @@ -10358,69 +10354,73 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911 +msgid "Starting and ending numbers must be the same for alphabetic addresses" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943 msgid "Starting address number must be less than ending address number" msgstr "" @@ -19930,24 +19930,20 @@ #. item "Man Made/Tower" text "Name" #: build/trans_presets.java:2296 -#, fuzzy msgid "Tower type" -msgstr "Tipo de rota" +msgstr "" #. item "Man Made/Tower" combo "Tower type" #: build/trans_presets.java:2296 -#, fuzzy msgid "communication" -msgstr "Localidade" +msgstr "" #: build/trans_presets.java:2296 -#, fuzzy msgid "observation" -msgstr "Altitude" +msgstr "" #. #: build/trans_presets.java:2298 -#, fuzzy msgid "Height (meters)" -msgstr "Altura máxima (metros)" +msgstr "" #. item "Man Made/Tower" text "Operator" @@ -20007,7 +20003,6 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "oil" -msgstr "fóssil" +msgstr "" #: build/trans_presets.java:2330 build/trans_presets.java:2372 @@ -20016,12 +20011,10 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "sewage" -msgstr "uso" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "heat" -msgstr "saúde" +msgstr "" #: build/trans_presets.java:2330 @@ -20030,12 +20023,10 @@ #: build/trans_presets.java:2331 -#, fuzzy msgid "underwater" -msgstr "água" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "overground" -msgstr "terra" +msgstr "" #: build/trans_presets.java:2333 @@ -20180,17 +20171,14 @@ #. item "Man Made/Power Tower" combo "Type" #: build/trans_presets.java:2398 -#, fuzzy msgid "tower" -msgstr "Torre" +msgstr "" #: build/trans_presets.java:2398 -#, fuzzy msgid "pole" -msgstr "Regra" +msgstr "" #: build/trans_presets.java:2399 -#, fuzzy msgid "Tower reference" -msgstr "Preferências" +msgstr "" #. item "Man Made/Power Tower" text "Tower reference" @@ -20208,13 +20196,11 @@ #. item "Man Made/Power Line" label "Edit Power Line" #: build/trans_presets.java:2405 -#, fuzzy msgid "Line type" -msgstr "Tipo de rota" +msgstr "" #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2405 -#, fuzzy msgid "line" -msgstr "Aclive" +msgstr "" #: build/trans_presets.java:2405 @@ -20229,7 +20215,6 @@ #. item "Man Made/Power Line" text "Voltage" #: build/trans_presets.java:2409 -#, fuzzy msgid "Amount of Cables" -msgstr "Quantidade de Cabos" +msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" @@ -20240,22 +20225,18 @@ #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" #: build/trans_presets.java:2410 -#, fuzzy msgid "single" -msgstr "Ângulo" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "double" -msgstr "Regra" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "triple" -msgstr "" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "quad" -msgstr "quaker" +msgstr "" #: build/trans_presets.java:2413 @@ -26150,29 +26131,4 @@ msgstr "" -#~ msgid "Combine ways with different memberships?" -#~ msgstr "Combinar caminhos com membros diferentes?" - -#~ msgid "Combine Anyway" -#~ msgstr "Combinar assim mesmo" - -#~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want " -#~ "to combine them?" -#~ msgstr "" -#~ "Os caminhos selecionados têm filiações diferentes. Você pretende uni-los " -#~ "mesmo assim?" - -#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -#~ msgstr "Cabeçalho de erro \"{0}\" não se encaixa no padrão \"{1}\"" - -#~ msgid "Purging 1 primitive" -#~ msgstr "Purgando 1 primitiva" - -#~ msgid "removing reference from way {0}" -#~ msgstr "removendo referência de caminho {0}" - -#~ msgid "Empty member in relation." -#~ msgstr "Membro vazio na relação." - #~ msgid "Unknown version" #~ msgstr "Versão desconhecida" @@ -26218,4 +26174,7 @@ #~ "O plugin não pode ser removido. Por favor, reporte o problema aos " #~ "desenvolvedores do JOSM." + +#~ msgid "Empty member in relation." +#~ msgstr "Membro vazio na relação." #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" @@ -26299,4 +26258,7 @@ #~ msgstr "Alguns dos nós estão (praticamente) na linha" +#~ msgid "Combine ways with different memberships?" +#~ msgstr "Combinar caminhos com membros diferentes?" + #~ msgid "All the ways were empty" #~ msgstr "Todos caminhos estavam vazios" @@ -26380,4 +26342,17 @@ #~ "Não foi possível selecionar a primitiva com o id {0} no conjunto de dados " #~ "atual" + +#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +#~ msgstr "Cabeçalho de erro \"{0}\" não se encaixa no padrão \"{1}\"" + +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "" +#~ "Os caminhos selecionados têm filiações diferentes. Você pretende uni-los " +#~ "mesmo assim?" + +#~ msgid "Combine Anyway" +#~ msgstr "Combinar assim mesmo" #~ msgid "unnamed" @@ -26425,4 +26400,10 @@ #~ msgid "Delete {1} {0}" #~ msgstr "Apagar {1} {0}" + +#~ msgid "Purging 1 primitive" +#~ msgstr "Purgando 1 primitiva" + +#~ msgid "removing reference from way {0}" +#~ msgstr "removendo referência de caminho {0}" #~ msgid "nodes" Index: /applications/editors/josm/i18n/po/ro.po =================================================================== --- /applications/editors/josm/i18n/po/ro.po (revision 17945) +++ /applications/editors/josm/i18n/po/ro.po (revision 17946) @@ -8,6 +8,6 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 16:38+0200\n" -"PO-Revision-Date: 2009-09-22 17:11+0000\n" +"POT-Creation-Date: 2009-10-02 22:03+0200\n" +"PO-Revision-Date: 2009-09-28 16:38+0000\n" "Last-Translator: Manuel R. Ciosici \n" "Language-Team: Romanian \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-09-28 14:34+0000\n" +"X-Launchpad-Export-Date: 2009-10-02 19:26+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: ROMANIA\n" @@ -51,5 +51,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -94,9 +94,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -129,6 +129,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -151,5 +151,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 @@ -334,5 +334,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -344,12 +344,12 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -371,5 +371,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 @@ -458,9 +458,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -495,6 +495,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -624,22 +624,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 msgid "Combine Way" msgstr "Combină calea" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine several ways into one." msgstr "Combină mai multe căi într-una." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Change directions?" msgstr "Schimbă direcţiile?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 msgid "Reverse and Combine" msgstr "Inversează şi Combină" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -649,5 +649,5 @@ "din ele?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -655,10 +655,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Combină {0} căi" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Selectează te rog cel puţin două căi pentru a le combina." @@ -703,5 +703,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -769,5 +769,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333 msgid "OK" @@ -852,8 +852,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -889,5 +889,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 @@ -959,5 +959,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1045,22 +1045,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 msgid "Merge Nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge nodes into the oldest one." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Please select at least two nodes to merge." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261 #, java-format msgid "Merge {0} nodes" @@ -1237,5 +1237,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106 #, java-format msgid "Pasting {0} tag" @@ -1244,5 +1244,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107 #, java-format msgid "to {0} primitive" @@ -2114,53 +2114,53 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a search string." msgstr "Vă rog introduceţi un şir de căutat" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 msgid "replace selection" msgstr "Înlocuieşte selecţia" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "add to selection" msgstr "adaugă la selecţie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75 msgid "remove from selection" msgstr "elimină din selecţie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 msgid "case sensitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "regular expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "type=route - key 'type' with value exactly 'route'." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2168,72 +2168,72 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "-name:Bak - not 'Bak' in the name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "foot: - key=foot set to any value." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "Special targets:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "" "type: - type of the object (node, way, relation)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "user:... - all objects changed by user" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "id:... - object with given ID (0 for new objects)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "nodes:... - object with given number of nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "modified - all changed objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "selected - all selected objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "incomplete - all incomplete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 msgid "untagged - all untagged objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "Use | or OR to combine with logical or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2243,51 +2243,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Căutare" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Start Search" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 #, java-format msgid "No match found for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, java-format -msgid "Nothing find in selection by searching for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254 +#, java-format +msgid "Nothing found in selection by searching for ''{0}''" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264 #, java-format msgid "Found {0} matches" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CS" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CI" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 msgid "RX" msgstr "" @@ -2596,5 +2596,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 msgid "Delete from relation" msgstr "" @@ -2650,7 +2650,7 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 -#, fuzzy, java-format +#, java-format msgid "Purged {0} objects" -msgstr "Schimb {0} obiect" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 @@ -3023,14 +3023,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3038,5 +3038,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3386,7 +3386,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 #, java-format @@ -3736,9 +3734,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289 msgid "(no object)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416 msgid "User:" msgstr "" @@ -4202,5 +4200,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "şters" @@ -4301,5 +4299,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4346,6 +4344,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 @@ -4359,6 +4357,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4416,34 +4414,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115 msgid "Conflicts when combining primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121 #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257 msgid "No conflicts to resolve" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 @@ -4461,23 +4459,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66 msgid "Choose a value" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 -msgid "Please decided which values to keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68 +msgid "Please decide which values to keep" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73 #, java-format msgid "Value ''{0}'' is going to be applied for key ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79 #, java-format msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84 #, java-format msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" @@ -4521,7 +4519,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "Paste ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "From ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "To ..." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:444 +#, java-format +msgid "{0} tag" +msgid_plural "{0} tags" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 #, java-format @@ -4531,7 +4549,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format @@ -4541,26 +4557,4 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "Paste ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "From ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "To ..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425 -#, java-format -msgid "{0} tag" -msgid_plural "{0} tags" -msgstr[0] "" -msgstr[1] "" - #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 #, java-format @@ -4626,4 +4620,12 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 msgid "Decision" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42 +msgid "Please select the values to keep for the following tags." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 +msgid "Show tags with conflicts only" msgstr "" @@ -4643,5 +4645,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 @@ -4738,5 +4740,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -4892,6 +4894,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323 #, java-format msgid "This will change up to {0} object." @@ -4900,22 +4902,22 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149 msgid "An empty value deletes the key." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347 msgid "Change values?" msgstr "Schimb valorile?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264 #, java-format msgid "Change properties of up to {0} object" @@ -4924,70 +4926,70 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 msgid "Please select a key" msgstr "Vă rog selectaţi o cheie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335 msgid "Please select a value" msgstr "Vă rog selectaţi o valoare" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447 msgid "Please select the objects you want to change properties for." msgstr "" "Vă rog selectaţi obiectele pentru care doriţi să schimbaţi proprietăţile." +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 msgid "Properties for selected objects." msgstr "" #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 msgid "Member Of" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576 msgid "Add Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 msgid "Add a new key/value pair to all objects" msgstr "Adaugă o nouă pereche cheie/valoare tuturor obiectelor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Edit Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 msgid "Edit the value of the selected key for all objects" msgstr "Editează valoarea cheii selectata pentru toate obiectele" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799 msgid "Properties / Memberships" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Change relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 #, java-format msgid "Really delete selection from relation {0}?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860 msgid "Delete the selected key in all objects" msgstr "Şterge cheia selectată din toate obiectele" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862 msgid "Delete Properties" msgstr "" @@ -5069,14 +5071,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307 msgid "Undock the panel" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332 msgid "Click to minimize/maximize the panel content" msgstr "" @@ -6494,5 +6496,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 #: build/trans_presets.java:67 build/trans_presets.java:103 #: build/trans_presets.java:143 build/trans_presets.java:180 @@ -6870,7 +6872,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -#, fuzzy msgid "Save/Upload and Exit" -msgstr "Salvez şi Ies" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 @@ -7092,5 +7093,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7442,5 +7443,4 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 @@ -7454,10 +7454,8 @@ msgstr[0] "" msgstr[1] "" -msgstr[2] "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 -#, fuzzy msgid "Conflicts detected" -msgstr "Conflicte" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 @@ -7788,5 +7786,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Culoare" @@ -8755,5 +8753,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313 msgid "Parse error: invalid document structure for GPX document." msgstr "" @@ -8932,19 +8930,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10098,69 +10096,73 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911 +msgid "Starting and ending numbers must be the same for alphabetic addresses" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943 msgid "Starting address number must be less than ending address number" msgstr "" @@ -19675,7 +19677,6 @@ #: build/trans_presets.java:2296 -#, fuzzy msgid "observation" -msgstr "poziţie" +msgstr "" #. @@ -19748,7 +19749,6 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "sewage" -msgstr "utilizare" +msgstr "" #: build/trans_presets.java:2330 @@ -19765,7 +19765,6 @@ #: build/trans_presets.java:2331 -#, fuzzy msgid "overground" -msgstr "fundal" +msgstr "" #: build/trans_presets.java:2333 @@ -19918,7 +19917,6 @@ #: build/trans_presets.java:2399 -#, fuzzy msgid "Tower reference" -msgstr "Preferinţe" +msgstr "" #. item "Man Made/Power Tower" text "Tower reference" @@ -19965,7 +19963,6 @@ #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" #: build/trans_presets.java:2410 -#, fuzzy msgid "single" -msgstr "şir" +msgstr "" #: build/trans_presets.java:2410 @@ -19974,7 +19971,6 @@ #: build/trans_presets.java:2410 -#, fuzzy msgid "triple" -msgstr "adevărat" +msgstr "" #: build/trans_presets.java:2410 @@ -25873,7 +25869,4 @@ msgstr "" -#~ msgid "Combine Anyway" -#~ msgstr "Combină oricum" - #~ msgid "Aborting..." #~ msgstr "Anulez..." @@ -25957,4 +25950,7 @@ #~ msgstr "Unele din noduri sunt (aproape) în linie" +#~ msgid "Combine Anyway" +#~ msgstr "Combină oricum" + #~ msgid "YAHOO (WebKit GTK)" #~ msgstr "YAHOO (WebKit GTK)" Index: /applications/editors/josm/i18n/po/ru.po =================================================================== --- /applications/editors/josm/i18n/po/ru.po (revision 17945) +++ /applications/editors/josm/i18n/po/ru.po (revision 17946) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 16:38+0200\n" -"PO-Revision-Date: 2009-09-28 06:30+0000\n" -"Last-Translator: Calibrator \n" +"POT-Creation-Date: 2009-10-02 22:03+0200\n" +"PO-Revision-Date: 2009-10-02 11:51+0000\n" +"Last-Translator: yohanson \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-09-28 14:33+0000\n" +"X-Launchpad-Export-Date: 2009-10-02 19:25+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: RUSSIAN FEDERATION\n" @@ -50,5 +50,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -93,9 +93,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -128,6 +128,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -150,5 +150,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 @@ -340,5 +340,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -350,12 +350,12 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -377,5 +377,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 @@ -466,9 +466,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -503,6 +503,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -603,5 +603,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 msgid "Closes open changesets" -msgstr "Закроет открытые пакеты изменений" +msgstr "Закрывает открытые пакеты изменений" #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37 @@ -633,22 +633,22 @@ msgstr "Скачиваение открытых пакетов изменений ..." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 msgid "Combine Way" msgstr "Объединить линию" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine several ways into one." msgstr "Объединить несколько линий в одну." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Change directions?" msgstr "Изменить направления?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 msgid "Reverse and Combine" msgstr "Перевернуть и объеденить" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -658,5 +658,5 @@ "некоторых линий?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -666,10 +666,10 @@ "последовательностью точек." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "Объединить {0} линии" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Выделите не менее двух линий для объединения." @@ -715,5 +715,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -781,5 +781,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333 msgid "OK" @@ -796,5 +796,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37 msgid "Download primitives referring to one of the selected primitives" -msgstr "Скачать элементы, сославшись на один из выбранных элементов" +msgstr "Скачать элементы, сославшись на один из выделенных элементов" #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38 @@ -864,8 +864,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -901,5 +901,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 @@ -971,5 +971,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1060,18 +1060,18 @@ msgstr "Соединить текущий слой с другим слоем" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 msgid "Merge Nodes" msgstr "Объединить точки" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge nodes into the oldest one." msgstr "Объединить точки в одну (более старую)" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Please select at least two nodes to merge." msgstr "Пожалуйста, выберите как минимум две точки для объединения." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" @@ -1079,5 +1079,5 @@ "используется." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261 #, java-format msgid "Merge {0} nodes" @@ -1101,5 +1101,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33 msgid "Mirror selected nodes and ways." -msgstr "Отзеркалить выбранные точки и линии." +msgstr "Отзеркалить выделенные точки и линии." #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53 @@ -1256,19 +1256,19 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35 msgid "Paste Tags" -msgstr "Вставить теги" +msgstr "Вставить метки" #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34 msgid "Apply tags of contents of paste buffer to all selected items." -msgstr "Применить теги из буфера ко всем выделенным объектам." - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +msgstr "Применить метки из буфера ко всем выделенным объектам." + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106 #, java-format msgid "Pasting {0} tag" msgid_plural "Pasting {0} tags" -msgstr[0] "Вставляется {0} тег" -msgstr[1] "Вставляется {0} тега" -msgstr[2] "Вставляется {0} тегов" - -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +msgstr[0] "Вставляется {0} метка" +msgstr[1] "Вставляется {0} метки" +msgstr[2] "Вставляется {0} меток" + +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107 #, java-format msgid "to {0} primitive" @@ -1455,5 +1455,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52 msgid "Split a way at the selected node." -msgstr "Разделить линию в выбранной точке." +msgstr "Разделить линию в выделенной точке." #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69 @@ -1464,6 +1464,6 @@ msgid "The selected node is not in the middle of any way." msgid_plural "The selected nodes are not in the middle of any way." -msgstr[0] "Выбранная точка не находится в середине какой-либо линии." -msgstr[1] "Выбранные точки не находится в середине линии." +msgstr[0] "Выделенная точка не находится в середине какой-либо линии." +msgstr[1] "Выделенные точки не находится в середине линии." msgstr[2] "Выбранные точки не находится в середине какой-либо линии." @@ -1487,12 +1487,12 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 msgid "The selected nodes do not share the same way." -msgstr "Выбранные точки не являются частью одной линии." +msgstr "Выделенные точки не являются частью одной линии." #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165 msgid "The selected way does not contain the selected node." msgid_plural "The selected way does not contain all the selected nodes." -msgstr[0] "Выбранная линия не содержит все выбранные точки" +msgstr[0] "Выделенная линия не содержит все выделенные точки" msgstr[1] "Выбранная линия не содержит выбранных точек" -msgstr[2] "Выбранная линия не содержит все выбранные точки" +msgstr[2] "Выделенная линия не содержит все выбранные точки" #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236 @@ -1538,5 +1538,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 msgid "Draw lines between raw gps points." -msgstr "Отображать линии между точками трэков GPS" +msgstr "Отображать линии между точками треков GPS" #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15 @@ -1577,5 +1577,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121 msgid "* One tagged node, or" -msgstr "* Одна точка с тегами, либо" +msgstr "* Одна точка с метками, либо" #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122 @@ -1607,7 +1607,7 @@ "own copy and all nodes will be selected." msgstr "" -"Прим.: Если выбрана линия, она получит дубликаты точек, и они\n" -"будут выбраны. В противном случае, все линии получат дубликаты\n" -"и все точки будут выбраны." +"Прим.: Если выделена линия, она получит дубликаты точек, и они\n" +"будут выделены. В противном случае, все линии получат дубликаты\n" +"и все точки будут выделены." #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170 @@ -1685,9 +1685,9 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 msgid "Updates the currently selected primitives from the server" -msgstr "Обновить выбранные элементы с сервера" +msgstr "Обновить выделенные элементы с сервера" #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120 msgid "There are no selected primitives to update." -msgstr "Не выбраны элементы для обновления." +msgstr "Не выделены элементы для обновления." #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121 @@ -1827,4 +1827,6 @@ "primitive and retrying to upload." msgstr "" +"Предупреждение: элемент ''{0}'' уже удалён на сервере. Повторная загрузка на " +"сервер будет произведена без этого элемента." #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15 @@ -1937,7 +1939,6 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 -#, fuzzy msgid "No data found in this area." -msgstr "На устройстве не найдено данных." +msgstr "В этом месте нет данных." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -1985,5 +1986,7 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94 msgid "Delete nodes or ways." -msgstr "Удалить точки или линии." +msgstr "" +"Удалить выделенные точки и линии (Внимание! При нажатии на эту кнопку, " +"выделенные объекты будет удалены без диалога)." #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95 @@ -2024,5 +2027,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 msgid "selected" -msgstr "выбранные" +msgstr "выделено" #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:358 @@ -2116,5 +2119,5 @@ "+release to synchronize audio at that point." msgstr "" -"Передвиньте значёк с играющей головой и отпустите возле трэка для " +"Передвиньте значок с лапкой проигрывателя и отпустите возле трека для " "проигрывания звука в этом месте. SHIFT+release для синхронизации звука в " "этой точке" @@ -2181,6 +2184,6 @@ msgstr "" "Переместите объект путём перетаскивания; Нажмите Shift для добавления к " -"выбранному (Ctrl для удаления); Shift-Ctrl для вращениы выбранного; или " -"измените выбранные элементы" +"выделенному (Ctrl для удаления); Shift-Ctrl для вращения выделенного; или " +"выделите что-либо другое" #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 @@ -2216,53 +2219,53 @@ msgstr "Поиск невозможен, так как не загружено никаких данных." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a filter string." msgstr "Пожалуйста, введите строку фильтра" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a search string." msgstr "Пожалуйста, введите строку для поиска." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 msgid "replace selection" msgstr "заменить выделение" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "add to selection" msgstr "добавить к выделению" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75 msgid "remove from selection" msgstr "убрать из выделения" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76 msgid "find in selection" -msgstr "найти в выбранном" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 +msgstr "найти в выделенном" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 msgid "case sensitive" msgstr "регистрозависимый" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "regular expression" msgstr "регулярное выражение" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "Baker Street - 'Baker' и 'Street' в любом ключе или названии." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "\"Baker Street\" - 'Baker Street' в любом ключе или названии." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' в любом месте названия." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - ключ 'type' с точным значением 'route'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2272,51 +2275,52 @@ "b>, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - название не содержит 'Bak'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "foot: - key=foot set to any value." msgstr "foot: - key=foot устанавливает в любых значениях." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "Special targets:" msgstr "Специальные цели:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "" "type: - type of the object (node, way, relation)" msgstr "" -"тип: - тип объекта (точка, линия, отношение)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +"type:object_type, где object_type - node(точка), way" +"(линия), relation(отношение)" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "user:... - all objects changed by user" msgstr "user:... - все объекты, измененные заданным пользователем" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - объект с данным ID (0 для новых объектов)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "nodes:... - object with given number of nodes" msgstr "точки:... - объект с заданным количеством точек" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "modified - all changed objects" msgstr "modified - все измененные объекты" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "selected - all selected objects" -msgstr "selected - все выбранные объекты" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +msgstr "selected - все выделенные объекты" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "incomplete - all incomplete objects" msgstr "incomplete - все незаконченные объекты" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 msgid "untagged - all untagged objects" -msgstr "untagged - все объекты без тегов" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +msgstr "untagged - все объекты без меток" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 msgid "" "child expr - all children of objects matching the expression" @@ -2325,5 +2329,5 @@ "выражению" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "" "parent expr - all parents of objects matching the expression" @@ -2332,5 +2336,5 @@ "выражению" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "Use | or OR to combine with logical or" msgstr "" @@ -2338,5 +2342,5 @@ "«или»" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2344,9 +2348,9 @@ "ключ содержит двоеточие)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "Use ( and ) to group expressions" -msgstr "Используйте ( и ) для группировки выражений" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +msgstr "Используйте ( and ) для группировки выражений" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2356,51 +2360,51 @@ msgstr "Фильтр" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Поиск" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Submit filter" msgstr "Принять фильтр" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Start Search" msgstr "Начать поиск" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 #, java-format msgid "No match found for ''{0}''" msgstr "Не найдено совпадений для ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Ничего не добавлено к выделению в результате поиска ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Ничего не удалено из выделения в результате поиска ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, java-format -msgid "Nothing find in selection by searching for ''{0}''" -msgstr "Ничего не найдено для выбранного ''{0}''" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254 +#, fuzzy, java-format +msgid "Nothing found in selection by searching for ''{0}''" +msgstr "Ничего не найдено для выделенного ''{0}''" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264 #, java-format msgid "Found {0} matches" msgstr "Найдено {0} совпадений" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 msgid "RX" msgstr "RX" @@ -2420,5 +2424,5 @@ msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -"Ключ не может быть пустым при использовании тега оператора. Пример " +"Ключ не может быть пустым при использовании метки оператора. Пример " "использования: ключ=значение" @@ -2519,5 +2523,5 @@ "{1}" msgstr "" -"Предупреждение: автоматическое усечение значения тега ''{0}'' на удалённом " +"Предупреждение: автоматическое усечение значения метки ''{0}'' на удалённом " "элементе {1}" @@ -2528,5 +2532,5 @@ "length {2}. Values length is {3}." msgstr "" -"Длина значения для тега \"{0}'' элемента {1} превышает максимально " +"Длина значения для метки \"{0}'' элемента {1} превышает максимально " "допустимую длину {2}. Значение длины {3}." @@ -2684,8 +2688,8 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:215 -#, fuzzy, java-format +#, java-format msgid "" "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more" -msgstr "Невозможно отменить команду ''{0}'' так как отсутствует слой ''{1}''" +msgstr "Невозможно вернуть команду ''{0}'' потому что слоя ''{1}'' больше нет" #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 @@ -2737,5 +2741,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 msgid "Delete from relation" msgstr "Удалить из отношения" @@ -2747,5 +2751,5 @@ "from relation?" msgstr "" -"Выбранный объект \"{0}\" используется в отношении \"{1}\" в роли {2}." +"Выделенный объект \"{0}\" используется в отношении \"{1}\" в роли {2}." "
Удалить из отношения?" @@ -2756,5 +2760,5 @@ "" msgstr "" -"Выбранный объект \"{0}\" используется в отношении \"{1}\".
Удалить " +"Выделенный объект \"{0}\" используется в отношении \"{1}\".
Удалить " "из отношения?" @@ -2794,12 +2798,12 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 -#, fuzzy, java-format +#, java-format msgid "Purged object ''{0}''" -msgstr "Переместить объекты {0}" +msgstr "Очищеный объект ''{0}''" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 -#, fuzzy, java-format +#, java-format msgid "Purged {0} objects" -msgstr "Изменить {0} объект" +msgstr "Очищено объектов: {0}" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 @@ -2813,7 +2817,7 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 -#, fuzzy, java-format +#, java-format msgid "Removing reference from relation {0}" -msgstr "удаление ссылки из отношения {0}" +msgstr "Удаление ссылки из отношения {0}" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 @@ -2857,15 +2861,15 @@ #, java-format msgid "Resolve {0} tag conflicts in node {1}" -msgstr "Устранить {0} конфликтов тегов в точке {1}" +msgstr "Устранить {0} конфликтов меток в точке {1}" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 #, java-format msgid "Resolve {0} tag conflicts in way {1}" -msgstr "Устранить {0} конфликтов тегов в линии {1}" +msgstr "Устранить {0} конфликтов меток в линии {1}" #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" -msgstr "Устранить {0} конфликтов тегов в отношении {1}" +msgstr "Устранить {0} конфликтов меток в отношении {1}" #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66 @@ -2963,5 +2967,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:144 msgid "Automatic tag correction" -msgstr "Автоматически исправлять теги" +msgstr "Автоматически исправлять метки" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:263 @@ -3197,14 +3201,14 @@ msgstr "Предупреждение: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "обнаружен id >= 0. Получено {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307 msgid "A primitive with ID = 0 can't be invisible." msgstr "Элемент с id=0 не может быть невидимым" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3212,5 +3216,5 @@ msgstr "обнаружено id > 0. Получено {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3235,5 +3239,5 @@ "multiple values." msgstr "" -"Набор тегов не может быть применен к элементу из-за наличия ключей с " +"Набор меток не может быть применен к элементу из-за наличия ключей с " "несколькими значениями." @@ -3405,5 +3409,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1324 msgid "untagged" -msgstr "без тега" +msgstr "без метки" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1325 @@ -3461,5 +3465,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 msgid "untagged way" -msgstr "линия без тегов" +msgstr "линия без меток" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 @@ -3578,7 +3582,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 #, java-format @@ -3622,7 +3624,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 -#, fuzzy msgid "Not Found" -msgstr "Не подключено" +msgstr "Не найдено" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 @@ -3943,9 +3944,9 @@ "this list with the mouse.
" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289 msgid "(no object)" msgstr "(нет объекта)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416 msgid "User:" msgstr "Пользователь:" @@ -3980,9 +3981,9 @@ msgid "" "partial: different selected objects have different values, do not change" -msgstr "partial: выбранные объекты имеют различные значения, не изменяйте" +msgstr "частично: выделенные объекты имеют различные значения, не изменяйте" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:101 msgid "unset: do not set this property on the selected objects" -msgstr "unset: не устанавливать этот параметр у выбранных объектов" +msgstr "unset: не устанавливать этот параметр у выделенных объектов" #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94 @@ -4028,5 +4029,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" -msgstr "Тэги" +msgstr "Метки" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 @@ -4046,15 +4047,15 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 msgid "No pending tag conflicts to be resolved" -msgstr "Нет конфликтов тегов" +msgstr "Нет конфликтов меток" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "Tags({0} conflicts)" -msgstr "Тэги({0} конфликтов)" +msgstr "Метки({0} конфликтов)" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 #, java-format msgid "{0} pending tag conflicts to be resolved" -msgstr "{0} неустранённых конфликтов тегов" +msgstr "{0} неустранённых конфликтов меток" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 @@ -4448,5 +4449,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "удалён" @@ -4552,5 +4553,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4588,5 +4589,5 @@ #, java-format msgid "The merged dataset will not include a tag with key {0}" -msgstr "Объединённый набор данных не будет содержать тег с ключом {0}" +msgstr "Объединённый набор данных не будет содержать метку с ключом {0}" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48 @@ -4594,11 +4595,11 @@ #, java-format msgid "My dataset does not include a tag with key {0}" -msgstr "Мой набор данных не содержит тег с ключом {0}" +msgstr "Мой набор данных не содержит метку с ключом {0}" #. setting up the properties table #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 @@ -4612,6 +4613,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4626,5 +4627,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100 msgid "Cannot apply undecided tag merge item." -msgstr "Не могу принять неопределённое объединение тегов" +msgstr "Не могу принять неопределённое объединение меток" #. should not happen, but just in case @@ -4661,5 +4662,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 msgid "Mark the selected tags as undecided" -msgstr "Пометить выделенные теги как нерешённые" +msgstr "Пометить выделенные метки, как неулаженные конфликты" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 @@ -4667,36 +4668,36 @@ #, java-format msgid "Their dataset does not include a tag with key {0}" -msgstr "Их набор данных не содержит тег с ключом {0}" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97 +msgstr "Их набор данных не содержит метку с ключом {0}" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115 msgid "Conflicts when combining primitives" msgstr "Конфликты при объединении элементов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121 #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" msgstr "Возникли конфликты при объединении линий - полученная линия: ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" msgstr "Конфликт при слиянии точек - объединённая точка ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257 msgid "No conflicts to resolve" msgstr "Конфликтов не обнаружено" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "Отменить устранение конфликтов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "Применить устранённые конфликты" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 @@ -4714,23 +4715,24 @@ msgstr "все" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66 msgid "Choose a value" msgstr "Выберите значение" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 -msgid "Please decided which values to keep" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68 +#, fuzzy +msgid "Please decide which values to keep" msgstr "Необходимо выбрать значение для сохранения" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73 #, java-format msgid "Value ''{0}'' is going to be applied for key ''{1}''" msgstr "Значение ''{0}'' будет присовено ключу ''{1}''" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79 #, java-format msgid "The key ''{0}'' and all its values are going to be removed" msgstr "Ключ ''{0}'' и все его значения будут удалены" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84 #, java-format msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" @@ -4746,9 +4748,9 @@ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}." msgstr "" -"Ожидался параметр ''{0}'' с тегами для определённого ключа. Получено {1}." +"Ожидался параметр ''{0}'' с метками для определённого ключа. Получено {1}." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101 msgid "Tag collection doesn't include the selected value ''{0}''." -msgstr "набор тегов не содержит выделенное значение ''{0}''" +msgstr "набор меток не содержит выделенное значение ''{0}''" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136 @@ -4761,21 +4763,42 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49 msgid "Tags from nodes" -msgstr "Теги точек \"from\" (от)" +msgstr "Метки точек \"from\" (от)" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50 msgid "Tags from ways" -msgstr "Теги ролей \"from way\"" +msgstr "Метки ролей \"from way\"" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51 msgid "Tags from relations" -msgstr "Теги отношений" +msgstr "Метки отношений" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78 msgid "Conflicts in pasted tags" -msgstr "Конфликты в назначенных тегах" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472 +msgstr "Конфликты в назначенных метках" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "Paste ..." +msgstr "Вставить ..." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "From ..." +msgstr "Из ..." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 +msgid "To ..." +msgstr "В ..." + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:444 +#, java-format +msgid "{0} tag" +msgid_plural "{0} tags" +msgstr[0] "{0} метка" +msgstr[1] "{0} метки" +msgstr[2] "{0} меток" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 #, java-format @@ -4786,7 +4809,5 @@ msgstr[2] "{0} линий" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 #, java-format @@ -4797,27 +4818,4 @@ msgstr[2] "отношения для {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "Paste ..." -msgstr "Вставить ..." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "From ..." -msgstr "Из ..." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 -msgid "To ..." -msgstr "В ..." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425 -#, java-format -msgid "{0} tag" -msgid_plural "{0} tags" -msgstr[0] "{0} тег" -msgstr[1] "{0} тега" -msgstr[2] "{0} тегов" - #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 #, java-format @@ -4859,5 +4857,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:65 msgid "Tag modified relations with " -msgstr "Тег изменённых отношений с " +msgstr "Метка изменённых отношений с " #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:68 @@ -4885,4 +4883,15 @@ msgid "Decision" msgstr "Решение" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42 +#, fuzzy +msgid "Please select the values to keep for the following tags." +msgstr "" +"Пожалуйста, выберите пакеты изменений, которые хотите закрыть" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 +#, fuzzy +msgid "Show tags with conflicts only" +msgstr "Точки (с конфликтами)" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -4901,5 +4910,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 @@ -4935,5 +4944,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 msgid "Open a merge dialog of all selected items in the list above." -msgstr "Открыть диалоговое окно для слияния выбранных объектов." +msgstr "Открыть диалоговое окно для слияния выделенных объектов." #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 @@ -4942,5 +4951,5 @@ msgid "" "Set the selected elements on the map to the selected items in the list above." -msgstr "Выбрать на карте объекты, выбранные в списке вверху." +msgstr "Выделить на карте объекты, выбранные в списке вверху." #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:162 @@ -4998,5 +5007,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -5092,5 +5101,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317 msgid "Reload all currently selected objects and refresh the list." -msgstr "Перегрузить все выбранные объекты, и обновить список." +msgstr "Скачать заново все выделенные объекты, и обновить список." #. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh")); @@ -5118,5 +5127,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 msgid "Delete the selected layer." -msgstr "Удалить выбранный слой." +msgstr "Удалить выделенный слой." #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 @@ -5126,5 +5135,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 msgid "Toggle visible state of the selected layer." -msgstr "Показать/скрыть выбранный слой" +msgstr "Показать/скрыть выделенный слой" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 @@ -5134,5 +5143,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 msgid "Activate the selected layer" -msgstr "Включить текущий слой" +msgstr "Активировать выделенный слой" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 @@ -5152,6 +5161,6 @@ msgstr "Информация о слое" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323 #, java-format msgid "This will change up to {0} object." @@ -5161,22 +5170,22 @@ msgstr[2] "Это изменит до {0} объектов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149 msgid "An empty value deletes the key." msgstr "Пустое значение удаляет ключ." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108 msgid "" msgstr "<различные>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347 msgid "Change values?" msgstr "Изменить значения?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264 #, java-format msgid "Change properties of up to {0} object" @@ -5186,69 +5195,69 @@ msgstr[2] "Изменить параметры {0} объектов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 msgid "Please select a key" msgstr "Пожалуйста, выберите ключ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335 msgid "Please select a value" msgstr "Выберите значение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447 msgid "Please select the objects you want to change properties for." msgstr "Выберите объекты, для которых вы желаете изменить параметры." +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "Параметры/Участники" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 msgid "Properties for selected objects." msgstr "Параметры выделенных объектов." #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 msgid "Member Of" msgstr "Член группы" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576 msgid "Add Properties" msgstr "Добавить параметры" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 msgid "Add a new key/value pair to all objects" msgstr "Добавить новую пару ключ/значение для всех объектов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Edit Properties" msgstr "Изменить параметры" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 msgid "Edit the value of the selected key for all objects" msgstr "Изменить значение выбранного ключа для всех объектов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Свойств: {0} / Участников: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799 msgid "Properties / Memberships" msgstr "Параметры / Участники" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Change relation" msgstr "Изменить отношение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Вы действительно хотите удалить отмеченное из отношения {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860 msgid "Delete the selected key in all objects" -msgstr "Удалить выбранный ключ из всех объектов" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 +msgstr "Удалить выделенный ключ из всех объектов" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862 msgid "Delete Properties" msgstr "Удалить параметры" @@ -5290,7 +5299,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 -#, fuzzy msgid "Set the current selection to the list of selected relations" -msgstr "Изменить выбранное отношение" +msgstr "Установить текущий выбор на списке выделенных отношений" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5301,9 +5309,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 msgid "Open a selection list window." -msgstr "Показать окно со списком выбранных объектов." +msgstr "Показать окно со списком выделенных объектов." #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133 msgid "Zoom to selected element(s)" -msgstr "Масштаб по выбранным объектам" +msgstr "Масштаб по выделенным объектам" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 @@ -5331,9 +5339,9 @@ msgstr "Выбор: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307 msgid "Undock the panel" msgstr "Отсоединить панель" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5342,5 +5350,5 @@ "панели." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332 msgid "Click to minimize/maximize the panel content" msgstr "Щёлкните для уменьшения/увеличения содержимого панели" @@ -5381,5 +5389,5 @@ "Warning: only launching info browsers for the first {0} of {1} selected users" msgstr "" -"Внимание: открываются страницы информации о первых {0} из {1} выбранных " +"Внимание: открываются страницы информации о первых {0} из {1} выделенных " "пользователей" @@ -5408,5 +5416,5 @@ msgid "Edit the relation the currently selected relation member refers to." msgstr "" -"Редактировать отношение, к которому относится выбранный в настоящий момент " +"Редактировать отношение, к которому относится выделенный в настоящий момент " "участник." @@ -5468,5 +5476,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Tags and Members" -msgstr "Теги и члены" +msgstr "Метки и участники" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 @@ -5593,5 +5601,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909 msgid "Move the currently selected members up" -msgstr "Переместить выбранных членов отношения вверх" +msgstr "Переместить выделенных членов отношения вверх" #. putValue(NAME, tr("Move Up")); @@ -5602,5 +5610,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928 msgid "Move the currently selected members down" -msgstr "Переместить выбранных членов отношения вниз" +msgstr "Переместить выделенных членов отношения вниз" #. putValue(NAME, tr("Move Down")); @@ -5667,5 +5675,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174 msgid "Add an empty tag" -msgstr "Добавить пустой тег" +msgstr "Добавить пустую метку" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 @@ -5683,5 +5691,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208 msgid "Sets a role for the selected members" -msgstr "Задать роль для выбранных членов" +msgstr "Задать роль для выделенных членов" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211 @@ -5714,5 +5722,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303 msgid "Edit the relation the currently selected relation member refers to" -msgstr "Выбранный, при редактировании отношения, участник относится к" +msgstr "Выделенный, при редактировании отношения, участник относится к" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192 @@ -5876,5 +5884,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118 msgid "Null pointer exception, possibly some missing tags." -msgstr "Пустой указатель исключение, возможно есть отсутствующие теги" +msgstr "Пустой указатель исключение, возможно есть отсутствующие метки" #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168 @@ -6812,5 +6820,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 #: build/trans_presets.java:67 build/trans_presets.java:103 #: build/trans_presets.java:143 build/trans_presets.java:180 @@ -7226,7 +7234,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -#, fuzzy msgid "Save/Upload and Exit" -msgstr "Сохранить и выйти" +msgstr "Сохранить/Передать на сервер и Выйти" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 @@ -7237,7 +7244,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354 -#, fuzzy msgid "Save/Upload and Delete" -msgstr "Сохранить и Удалить" +msgstr "Сохранить/Передать на сервер и Удалить" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355 @@ -7252,11 +7258,10 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481 -#, fuzzy msgid "" "An upload and/or save operation of one layer with modifications
was " "cancelled or has failed." msgstr "" -"Операция загрузки на сервер или сохранения одного изменённого " -"слоя
была отменена или не удалась." +"Операция передачи на сервер и/или сохранения одного слоя с " +"правками
было отменено или не удалось." #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491 @@ -7344,5 +7349,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:921 msgid "Tags of new changeset" -msgstr "Теги нового пакета изменений" +msgstr "Метки нового пакета изменений" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221 @@ -7452,5 +7457,5 @@ #, java-format msgid "Tags of changeset {0}" -msgstr "Теги пакета изменений {0}" +msgstr "Метки пакета изменений {0}" #. putValue(NAME, tr("Reload")); @@ -7466,5 +7471,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7823,10 +7828,10 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 -#, fuzzy, java-format +#, java-format msgid "There was {0} conflict detected." msgid_plural "There were {0} conflicts detected." -msgstr[0] "За время импорта произошло {0} конфликт(ов)" -msgstr[1] "За время импорта произошло {0} конфликт(ов)" -msgstr[2] "За время импорта произошло {0} конфликт(ов)" +msgstr[0] "Обнаружен {0} конфликт." +msgstr[1] "Обнаружено {0} конфликта." +msgstr[2] "Обнаружено {0} конфликтов." #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 @@ -7839,11 +7844,16 @@ "on the server." msgstr[0] "" +"{0} объект был очищен в локальном наборе данных, потому что он удалён на " +"сервере." msgstr[1] "" +"{0} объекта было очищено в локальном наборе данных, потому что они удалены " +"на сервере." msgstr[2] "" +"{0} объектов было очищено в локальном наборе данных, потому что они удалены " +"на сервере." #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 -#, fuzzy msgid "Conflicts detected" -msgstr "Обнаружен конфликт" +msgstr "Обнаружены конфликты" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 @@ -7988,5 +7998,5 @@ "track you were playing (after the first marker)." msgstr "" -"Вам необходимо перетащить значёк играющей головы рядом с от GPX трэком с " +"Вам необходимо перетащитьзначок лапки проигрывателя рядом с GPX треком, с " "которым связана звуковая дорожка (после первого маркера)." @@ -8204,5 +8214,5 @@ msgstr "Калибровка звукозаписи" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Цвет" @@ -8261,9 +8271,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42 msgid "Force lines if no segments imported." -msgstr "Отображать линии, даже если не импортировано сегментов." +msgstr "Отображать линии, даже если нет импортированых сегментов." #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43 msgid "Draw large GPS points." -msgstr "Отображать крупные точки GPS" +msgstr "Отображать GPS большими точками" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44 @@ -8293,5 +8303,5 @@ #: build/trans_presets.java:1377 msgid "Car" -msgstr "Авто" +msgstr "Автомобиль" #. item "Barriers/Bollard" check "Foot" @@ -8376,6 +8386,6 @@ msgid "Only interesting direction hints (e.g. with oneway tag)." msgstr "" -"Показывать только полезные указатели направления (например, для " -"односторонних дорог)." +"Показывать только полезные подсказки направления (например - с меткой дороги " +"с односторонним движением)." #. only on the head of a way @@ -8436,5 +8446,5 @@ msgid "" "Force drawing of lines if the imported data contain no line information." -msgstr "Отображать линии, даже если не импортировано информации о линиях." +msgstr "Отображать линии, даже если нет импортированой информации о линиях." #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129 @@ -8490,5 +8500,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193 msgid "Track and Point Coloring" -msgstr "Разцветить трэки и точки" +msgstr "Раскрасить треки и точки" #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202 @@ -8722,5 +8732,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78 msgid "Proxy server username" -msgstr "Имя пользователя" +msgstr "Имя пользователя прокси-сервера" #: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80 @@ -8819,5 +8829,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51 msgid "Tagging Presets" -msgstr "Предустановки тегов" +msgstr "Предустановки меток" #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:182 @@ -9006,9 +9016,9 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 msgid "Add a new tag" -msgstr "Добавить новый тег" +msgstr "Добавить новую метку" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 msgid "Delete the selection in the tag table" -msgstr "Удалить отмеченнгое в таблице тегов" +msgstr "Удалить отмеченное в таблице меток" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:429 @@ -9048,5 +9058,5 @@ #, java-format msgid "Could not read tagging preset source: {0}" -msgstr "Не удалось прочитать помеченные настройки исходника: {0}" +msgstr "Не удалось прочитать источник предустановок меток: {0}" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:629 @@ -9072,9 +9082,9 @@ #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" -msgstr "Ничего не выбрано!" +msgstr "Ничего не выделено!" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705 msgid "Selection unsuitable!" -msgstr "Элементы выбраны неверно!" +msgstr "Неудачный выбор!" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:713 @@ -9113,5 +9123,5 @@ #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58 msgid "NullPointerException, possibly some missing tags." -msgstr "Ошибка! Возможно отсутствуют теги." +msgstr "Ошибка! Возможно отсутствуют метки." #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69 @@ -9214,5 +9224,5 @@ msgstr "Парсинг файла \"{0}\" потерпел неудачу" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313 msgid "Parse error: invalid document structure for GPX document." msgstr "Ошибка разбора: неправильная структура документа gpx" @@ -9399,14 +9409,14 @@ msgstr "OK - пробуем ещё раз." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 #, java-format msgid "Starting retry {0} of {1}." msgstr "Попытка {0} из {1}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 msgid "Current changeset is null. Can't upload data." msgstr "Текущий пакет изменений пуст. Невозможно загрузить данные." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." @@ -9414,5 +9424,5 @@ "Требуется, чтобы ID текущего пакета изменений был > 0. Текущий ID: {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9518,5 +9528,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180 msgid "Login" -msgstr "Идентификатор пользователя" +msgstr "Войти" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243 @@ -9539,5 +9549,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248 msgid "OSM username (e-mail)" -msgstr "Имя пользователя на OSM (e-mail)" +msgstr "Имя пользователя OSM (E-mail)" #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250 @@ -9657,11 +9667,11 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 -#, fuzzy, java-format +#, java-format msgid "" "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}''," "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." msgstr "" -"Отсутствует обязательный элемент атрибута ''bounds''. Получено " -"minlon=''{0}'',minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." +"Отсутствуют обязательные атрибуты элемента ''bounds'' (границы). Получено " +"minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''." #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 @@ -9789,5 +9799,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490 -#, fuzzy, java-format +#, java-format msgid "" "Relation with external id ''{0}'' refers to a missing primitive with " @@ -9872,5 +9882,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48 msgid "XML tag is missing." -msgstr "Отсутствует тег XML ." +msgstr "Отсутствует метка XML ." #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53 @@ -9880,5 +9890,5 @@ #, java-format msgid "Missing attribute ''{0}'' on XML tag ''{1}''." -msgstr "Отсутствует атрибут ''{0}'' на теге XML ''{1}''." +msgstr "Отсутствует атрибут ''{0}'' на метке XML ''{1}''." #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57 @@ -9888,5 +9898,5 @@ #, java-format msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}." -msgstr "Неверное значение атрибута ''{0}'' на теге XML ''{1}''. Получено {2}." +msgstr "Неверное значение атрибута ''{0}'' на метке XML ''{1}''. Получено {2}." #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:73 @@ -9916,7 +9926,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' must not be null" -msgstr "параметр ''{0}'' не должен быть null" +msgstr "Параметр ''{0}'' не должен быть пустым" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 @@ -10110,7 +10120,7 @@ msgid "Downloaded plugin information from {0} site" msgid_plural "Downloaded plugin information from {0} sites" -msgstr[0] "Скачать информацию о модуле с {0} сайта" -msgstr[1] "Скачать информацию о модуле с {0} сайтов" -msgstr[2] "Скачать информацию о модуле с {0} сайтов" +msgstr[0] "Список модулей загружен с {0} сайта" +msgstr[1] "Список модулей загружен с {0} сайтов" +msgstr[2] "Список модулей загружен с {0} сайтов" #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68 @@ -10353,4 +10363,8 @@ "check the servers address ''{1}'' for typos." msgstr "" +"The OSM server ''{0}'' doesn't know about an object
you tried to read, " +"update, or delete. Either the respective object
doesn''t exist on the " +"server or you''re using an invalid URL to access
it. Please carefully " +"check the servers address ''{1}'' for typos." #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:209 @@ -10571,18 +10585,18 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 msgid "Please enter Description about your trace." -msgstr "Пожалуйста введите описание вашего трэка" +msgstr "Пожалуйста введите описание вашего трека" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:145 msgid "Tags (comma delimited)" -msgstr "Теги (разделённые запятой)" +msgstr "Метки (разделённые запятой)" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:146 msgid "Please enter tags about your trace." -msgstr "Введите теги описывающие ваш трэк." +msgstr "Введите метки, описывающие ваш трек." #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:193 #, java-format msgid "Selected track: {0}" -msgstr "Выбранный трэк: {0}" +msgstr "Выделенный трек: {0}" #. Set progress dialog to indeterminate while connecting @@ -10597,5 +10611,5 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:249 msgid "Error while uploading" -msgstr "Ошибка во время загрузки на сервер" +msgstr "Ошибка во время передачи данных на сервер" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303 @@ -10696,58 +10710,63 @@ msgstr "Будет присоединено {0} дополнительных точек номеров домов" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381 msgid "City:" msgstr "Город:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382 msgid "State:" msgstr "Штат:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383 msgid "Post Code:" msgstr "Почтовый индекс:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384 msgid "Country:" msgstr "Страна:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385 msgid "Full Address:" msgstr "Полный адрес:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420 msgid "Optional Information:" msgstr "Дополнительная информация:" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600 msgid "Please select a street to associate with address interpolation way" msgstr "" "Пожалуйста, выберите улицу, чтобы связать её с интерполяцией адресов на линии" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613 msgid "Please select address interpolation way for this street" msgstr "Пожалуйста выберите интерполяцию адресов на линии для этой улицы" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719 msgid "Expected odd numbers for addresses" msgstr "Заявлены нечётные номера домов" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 msgid "Expected even numbers for addresses" msgstr "Заявлены чётные номера домов" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 msgid "Country code must be 2 letters" msgstr "Код страны должен состоять из 2 букв" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878 msgid "Please enter valid number for starting and ending address" msgstr "Пожалуйста, введите начальный и конечный номера домов" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896 msgid "Alphabetic address must end with a letter" msgstr "Алфавитные номера домов должны начинаться с буквы" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911 +#, fuzzy +msgid "Starting and ending numbers must be the same for alphabetic addresses" +msgstr "Начальный номер дома должен быть меньше, чем конечный номер дома" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917 msgid "Starting address letter must be less than ending address letter" msgstr "" @@ -10755,13 +10774,13 @@ "к началу алфавита, чем буква номера дома, находящегося в конце улицы" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933 msgid "Please enter valid number for starting address" msgstr "Пожалуйста, введите правильный номер для начала нумерации домов" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936 msgid "Please enter valid number for ending address" msgstr "Пожалуйста, введите правильный номер последнего дома" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943 msgid "Starting address number must be less than ending address number" msgstr "Начальный номер дома должен быть меньше, чем конечный номер дома" @@ -10769,9 +10788,9 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 msgid "AgPifoJ - Geotagged pictures" -msgstr "AgPifoJ - Изображения с геотегами" +msgstr "AgPifoJ - Изображения с геометками" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 msgid "Display geotagged photos" -msgstr "Показать изображения с геотегами" +msgstr "Показать изображения с геометками" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:70 @@ -10859,5 +10878,5 @@ #, java-format msgid "{0} were found to be gps tagged." -msgstr "{0} изображений имело теги GPS" +msgstr "{0} изображений имело метки GPS" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46 @@ -10979,5 +10998,5 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:555 msgid "Not yet tagged images" -msgstr "Картинки без ярлыков" +msgstr "Картинки без меток" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 @@ -10999,5 +11018,5 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:592 msgid "No selected GPX track" -msgstr "Не выбрано трека GPX" +msgstr "Трек GPX не выделен" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:604 @@ -11030,5 +11049,5 @@ #, java-format msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "Надено {0} совпадений из {1} в GPX трэке {2}" +msgstr "Надено {0} совпадений из {1} в GPX треке {2}" #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:662 @@ -11335,5 +11354,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:79 msgid "Auto-tag source added:" -msgstr "Добавлены авто-теги к источнику:" +msgstr "Добавлен источник авто-метки:" #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:84 @@ -11681,5 +11700,5 @@ #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 msgid "Splits an area by an untagged way." -msgstr "Разрезает область на линии без тегов." +msgstr "Разрезает область на линии без меток." #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:76 @@ -11741,5 +11760,5 @@ #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93 msgid "Layer for editing GPX tracks" -msgstr "Слой для редактирования GPX трэков" +msgstr "Слой для редактирования GPX треков" #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215 @@ -11749,5 +11768,5 @@ #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46 msgid "edit gpx tracks" -msgstr "Редактировать GPX трэки" +msgstr "Редактировать GPX треки" #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85 @@ -11981,5 +12000,5 @@ #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:189 msgid "Display non-geotagged photos" -msgstr "Показать фотографии без геотегов" +msgstr "Показать фотографии без геометок" #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:74 @@ -12186,5 +12205,5 @@ #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58 msgid "Tag ways as" -msgstr "Тег линии" +msgstr "Пометить линии, как" #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60 @@ -12263,5 +12282,5 @@ msgid "Tag ways as water, coastline, land or nothing. Default is water." msgstr "" -"Назначить тег на линии: water (вода), coastline (берега), land (земли) или " +"Назначить метки на линии: water (вода), coastline (берега), land (земли) или " "ничего. По умолчанию - вода." @@ -12726,5 +12745,5 @@ #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:72 msgid "No relation is selected" -msgstr "Нет выбранного отношеня" +msgstr "Нет выделенного отношения" #. Add menu @@ -12863,5 +12882,5 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47 msgid "Auto zoom: " -msgstr "Авто приближени: " +msgstr "Авто приближение: " #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51 @@ -12897,5 +12916,5 @@ #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39 msgid "AutoSave LiveData" -msgstr "Автосохраниени ЖивыхДанных" +msgstr "Автосохранение редактируемых данных" #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38 @@ -12961,5 +12980,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:59 msgid "Edit tags" -msgstr "Редактировать теги" +msgstr "Редактировать метки" #. TODO: set "tag-editor" and add /images/tag-editor.png to distrib @@ -12967,9 +12986,9 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:64 msgid "Launches the tag editor dialog" -msgstr "Запуск диалога тег редактора" +msgstr "Открывает диалог редактора меток" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158 msgid "JOSM Tag Editor Plugin" -msgstr "Модуль редактирования тегов JOSM" +msgstr "Модуль редактирования меток JOSM" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 @@ -13008,5 +13027,5 @@ #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25 msgid "Tagging Preset Tester" -msgstr "Тестирование Настроек Тегов" +msgstr "Анализатор предустановленных меток" #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23 @@ -13014,10 +13033,12 @@ "Open the tagging preset test tool for previewing tagging preset dialogs." msgstr "" -"Откройте настройки инструментов для установки тегов для предварительного " -"просмотра диалога настроек тегов." +"Откройте средство анализа предустановленных меток, чтобы воспользоваться " +"диалогом просмотра этих меток." #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34 msgid "You have to specify tagging preset sources in the preferences first." -msgstr "В первую очередь Вы должны указать источник настроек тегов." +msgstr "" +"В первую очередь Вы должны указать в настройках источники предустановленных " +"меток." #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:36 @@ -13074,5 +13095,5 @@ #: ../plugins/terracer/src/terracer/TerracerAction.java:475 msgid "Optional" -msgstr "Необъязательно" +msgstr "Необязательно" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100 @@ -13100,5 +13121,5 @@ "Are you really sure to continue?" msgstr "" -"Выбранные линии содержат точки, находящиеся за пределами\n" +"Выделенные линии содержат точки, находящиеся за пределами\n" "скачанной области. Некоторые точки могут быть случайно\n" "удалены. Вы действительно хотите продолжить?" @@ -13158,5 +13179,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311 msgid "Fix tag conflicts" -msgstr "Инсправить конфликт тегов" +msgstr "Исправить конфликт меток" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461 @@ -13174,5 +13195,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853 msgid "Remove tags from inner ways" -msgstr "Удалить теги у внутренних линий" +msgstr "Удалить метки у внутренних линий" #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882 @@ -13385,5 +13406,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:110 msgid "Fix the selected errors." -msgstr "Исправить выбранные ошибки." +msgstr "Исправить выделенные ошибки." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114 @@ -13393,5 +13414,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115 msgid "Ignore the selected errors next time." -msgstr "Игнорировать выбранные ошибки в будущем." +msgstr "Игнорировать выделенные ошибки в будущем." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197 @@ -13493,5 +13514,5 @@ "coordinates." msgstr "" -"Этот тест проверяет - есть ли линии с одними и теми же тегами и одинаковыми " +"Этот тест проверяет - есть ли линии с одними и теми же метками и одинаковыми " "координатами точек." @@ -13592,5 +13613,5 @@ #, java-format msgid "Invalid tagchecker line - {0}: {1}" -msgstr "Неправильно просталенныех тегов линиий - {0}: {1}" +msgstr "Неправильная линия анализатора меток - {0}: {1}" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295 @@ -13612,5 +13633,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436 msgid "Illegal tag/value combinations" -msgstr "Неправильная комбинация тегов/значений тегов" +msgstr "Неправильная комбинация меток/значений" #. passing translated text also to original string, as we already @@ -13627,5 +13648,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462 msgid "Tags with empty values" -msgstr "Пустые значения тегов" +msgstr "Метки с пустыми значениями" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468 @@ -13669,5 +13690,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595 msgid "Check property keys." -msgstr "Проверьте ключи свойств." +msgstr "Проверить корректность ключей." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:596 @@ -13681,5 +13702,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604 msgid "Validate property values and tags using complex rules." -msgstr "Проверка собственных значений и использование сложных правил тегов." +msgstr "Проверка корректности значений и меток, использующих сложные правила." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625 @@ -13689,5 +13710,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665 msgid "TagChecker source" -msgstr "Исходники TagChecker" +msgstr "Источник средства проверки меток" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688 @@ -13696,6 +13717,7 @@ "org/index.php/User:JLS/speller) or tag checking data files." msgstr "" -"Источником (URL или имя файла) проверки правописания (см. http://wiki." -"openstreetmap.org/index.php/User:JLS/speller) или тег проверки файлов данных." +"Источники (URL или имя файла) проверки правописания (см. http://wiki." +"openstreetmap.org/index.php/User:JLS/speller) или метка проверки файлов " +"данных." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689 @@ -13713,5 +13735,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713 msgid "Check property values." -msgstr "Проверьте правильно значений" +msgstr "Проверить корректность значений" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714 @@ -13747,10 +13769,10 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741 msgid "Use default tag ignore file." -msgstr "Использовать по умолчанию файл с игнориованными тегами." +msgstr "Использовать по умолчанию файл с игнориованными метками." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:742 msgid "Use the default tag ignore file (recommended)." msgstr "" -"Использовать по умолчанию файл с игнориованными тегами (рекомендовано)." +"Использовать по умолчанию файл с игнориованными метками (рекомендовано)." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 @@ -13974,18 +13996,18 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92 msgid "Untagged and unconnected nodes" -msgstr "Непомеченные тегами и не соединённые точки" +msgstr "Непомеченные метками и не соединённые точки" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:38 msgid "This test checks for untagged nodes that are not part of any way." -msgstr "Этот тест ищет точки, не имеющие тегов, и не являющиеся частью линий." +msgstr "Этот тест ищет точки, не имеющие меток, и не являющиеся частью линий." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59 msgid "Untagged, empty and one node ways." -msgstr "Линии без тегов, пустые и состоящие из одной точки." +msgstr "Линии без меток, пустые и состоящие из одной точки." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60 msgid "This test checks for untagged, empty and one node ways." msgstr "" -"Данный тест ищет линии без тегов, пустые, и линии, состоящие из одной точки" +"Данный тест ищет линии без меток, пустые, и линии, состоящие из одной точки" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:91 @@ -13999,5 +14021,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:100 msgid "Untagged ways" -msgstr "Линии без тегов" +msgstr "Линии без меток" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:105 @@ -14084,5 +14106,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20 msgid "help" -msgstr "справка" +msgstr "Справка" #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20 @@ -14470,6 +14492,6 @@ "import EXIF geotagged pictures." msgstr "" -"Геотег модуль для JOSM. Совмещает фотографии с GPS треками или импортирует " -"геотеги из EXIF фотографий." +"Модуль геометки для JOSM. Совмещает фотографии с GPS треками или импортирует " +"геометки из EXIF фотографий." #. Plugin cadastre-fr @@ -14559,5 +14581,5 @@ msgstr "" "Модуль для совмещения изображения с путевыми точками GPX трека. Совмещение " -"будет произведено, когда аттрибуты тегов 'name', 'cmt' или 'desc' путевой " +"будет произведено, когда аттрибут меток 'name', 'cmt' или 'desc' путевой " "точки, будет совпадать с именем файла изображения." @@ -14675,5 +14697,5 @@ #: build/trans_plugins.java:63 msgid "Provides a dialog for editing tags in a tabular grid." -msgstr "Показывает окно для редактирования тегов в табличной сетке." +msgstr "Показывает окно для редактирования меток в табличной сетке." #. Plugin tagging-preset-tester @@ -14684,6 +14706,6 @@ "the jar-file as standalone as well." msgstr "" -"Добавляет предустановленные теги к меню помощи, которое поможет вам " -"разработке предустановленных тегов (быстрый просмотр в диалоге, который " +"Добавляет предустановленные метки к меню помощи, которое поможет вам в " +"разработке предустановленных меток(быстрый просмотр в диалоге, который " "появляется во всплывающем окне). Вы можете запустить JAR-файл в автономном " "режиме." @@ -14711,5 +14733,5 @@ "Инспектор OSM данных. Он проверяет наличие проблем в данных, а также " "предлагает исправить некоторые известные общие проблемы. Проверяет " -"правописание для комплексных имён тегов." +"правописание имён меток." #. Plugin walkingpapers @@ -15922,5 +15944,5 @@ #: build/trans_presets.java:1042 msgid "Motorcar" -msgstr "Автомобиль" +msgstr "Кар" #: build/trans_presets.java:332 @@ -15945,5 +15967,5 @@ #: build/trans_presets.java:337 build/trans_presets.java:375 msgid "Max. weight (tonnes)" -msgstr "Макс. масса (т)" +msgstr "Макс. вес (тонны)" #. item "Streets/Road Restrictions" text "Max. weight (tonnes)" @@ -16020,9 +16042,9 @@ #: build/trans_style.java:555 msgid "motorway" -msgstr "motorway" +msgstr "проезжая часть" #: build/trans_presets.java:350 msgid "motorway_link" -msgstr "motorway_link" +msgstr "съезд с дороги" #. color motorway @@ -16045,9 +16067,9 @@ #: build/trans_style.java:571 msgid "trunk" -msgstr "Автострада" +msgstr "автострада" #: build/trans_presets.java:350 msgid "trunk_link" -msgstr "Съезд с автострады" +msgstr "cъезд с автострады" #. color trunk @@ -16070,9 +16092,9 @@ #: build/trans_style.java:587 msgid "primary" -msgstr "Основная" +msgstr "главная дорога" #: build/trans_presets.java:350 msgid "primary_link" -msgstr "Съезд с основной" +msgstr "съезд с основной дороги" #. color primary @@ -16095,5 +16117,5 @@ #: build/trans_style.java:603 msgid "secondary" -msgstr "Вторичная" +msgstr "второстепенная дорога" #. color secondary @@ -16107,9 +16129,9 @@ #: build/trans_presets.java:350 build/trans_style.java:611 msgid "tertiary" -msgstr "Третичная" +msgstr "дорога третьего порядка" #: build/trans_presets.java:350 msgid "unclassified" -msgstr "Неклассифицировано" +msgstr "неклассифицированная дорога" #. color green @@ -16123,9 +16145,9 @@ #: build/trans_presets.java:350 build/trans_style.java:3151 msgid "residential" -msgstr "местного значения" +msgstr "дорога местного значения" #: build/trans_presets.java:350 msgid "living_street" -msgstr "Жилая" +msgstr "жилая улица" #. color street @@ -16156,9 +16178,9 @@ #: build/trans_style.java:4252 msgid "service" -msgstr "Служебная" +msgstr "служебный проезд" #: build/trans_presets.java:350 msgid "bus_guideway" -msgstr "bus_guideway" +msgstr "автобусный рельс" #. color turningcircle @@ -16189,5 +16211,5 @@ #: build/trans_style.java:3216 build/trans_style.java:3217 msgid "construction" -msgstr "Строительство" +msgstr "строящаяся дорога" #. item @@ -18751,5 +18773,5 @@ #: build/trans_presets.java:1782 msgid "Other Information Points" -msgstr "Другие Информационные точки" +msgstr "Другие справочные бюро" #. item @@ -20504,24 +20526,20 @@ #. item "Man Made/Tower" text "Name" #: build/trans_presets.java:2296 -#, fuzzy msgid "Tower type" -msgstr "Тип маршрута" +msgstr "Тип вышки" #. item "Man Made/Tower" combo "Tower type" #: build/trans_presets.java:2296 -#, fuzzy msgid "communication" -msgstr "соединяющий" +msgstr "связная" #: build/trans_presets.java:2296 -#, fuzzy msgid "observation" -msgstr "Возвышение" +msgstr "наблюдательная" #. #: build/trans_presets.java:2298 -#, fuzzy msgid "Height (meters)" -msgstr "Макс. Высота (метры)" +msgstr "Высота (в метрах)" #. item "Man Made/Tower" text "Operator" @@ -20581,7 +20599,6 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "oil" -msgstr "энергия сгорания топлива" +msgstr "нефтяная" #: build/trans_presets.java:2330 build/trans_presets.java:2372 @@ -20590,27 +20607,22 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "sewage" -msgstr "использование" +msgstr "канализационная" #: build/trans_presets.java:2330 -#, fuzzy msgid "heat" -msgstr "здоровье" +msgstr "для нагрева воды" #: build/trans_presets.java:2330 -#, fuzzy msgid "any substance" -msgstr "А - По дистанции" +msgstr "любого назначения" #: build/trans_presets.java:2331 -#, fuzzy msgid "underwater" -msgstr "вода" +msgstr "подводная" #: build/trans_presets.java:2331 -#, fuzzy msgid "overground" -msgstr "подземная" +msgstr "надземная" #: build/trans_presets.java:2333 @@ -20755,17 +20767,14 @@ #. item "Man Made/Power Tower" combo "Type" #: build/trans_presets.java:2398 -#, fuzzy msgid "tower" -msgstr "Башня" +msgstr "вышка" #: build/trans_presets.java:2398 -#, fuzzy msgid "pole" -msgstr "Роль" +msgstr "столб" #: build/trans_presets.java:2399 -#, fuzzy msgid "Tower reference" -msgstr "электролиния" +msgstr "Ссылка вышки" #. item "Man Made/Power Tower" text "Tower reference" @@ -20783,18 +20792,15 @@ #. item "Man Made/Power Line" label "Edit Power Line" #: build/trans_presets.java:2405 -#, fuzzy msgid "Line type" -msgstr "Тип лыжня" +msgstr "Тип линии" #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2405 -#, fuzzy msgid "line" -msgstr "присоединенный" +msgstr "линия" #: build/trans_presets.java:2405 -#, fuzzy msgid "minor_line" -msgstr "motorway_link" +msgstr "minor_line" #. item "Man Made/Power Line" text "Line reference" @@ -20805,33 +20811,28 @@ #. item "Man Made/Power Line" text "Voltage" #: build/trans_presets.java:2409 -#, fuzzy msgid "Amount of Cables" -msgstr "Количество кабелей" +msgstr "Напряжение на кабелях" #. item "Man Made/Power Line" text "Amount of Cables" #: build/trans_presets.java:2410 msgid "Number of wires (better: conductors) per power cable" -msgstr "" +msgstr "Количество проводов (точнее: жил) внутри кабеля" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" #: build/trans_presets.java:2410 -#, fuzzy msgid "single" -msgstr "Угол" +msgstr "одножильный" #: build/trans_presets.java:2410 -#, fuzzy msgid "double" -msgstr "Рубин" +msgstr "двухжильный" #: build/trans_presets.java:2410 -#, fuzzy msgid "triple" -msgstr "Мостик" +msgstr "трёхжильный" #: build/trans_presets.java:2410 -#, fuzzy msgid "quad" -msgstr "квакер" +msgstr "четырёхжильный" #: build/trans_presets.java:2413 @@ -21632,5 +21633,5 @@ #: build/trans_presets.java:2757 msgid "(Use international code, like +12-345-67890)" -msgstr "(Используйте международный код, как например +12-345-67890)" +msgstr "(Используйте международный код, например: +7-916-0857403)" #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" @@ -22523,5 +22524,5 @@ #: build/trans_presets.java:3168 build/trans_style.java:1206 msgid "subway" -msgstr "subway" +msgstr "линия метро" #. item "Relations/Route" text "Reference" @@ -23411,5 +23412,5 @@ #: build/trans_style.java:972 build/trans_style.java:980 msgid "highway_track" -msgstr "highway_track" +msgstr "трек автодороги" #. color foot @@ -23838,5 +23839,5 @@ #: build/trans_style.java:1172 msgid "railwaypoint" -msgstr "railwaypoint" +msgstr "ж/д точка" #. color rail @@ -23944,5 +23945,5 @@ #: build/trans_style.java:1341 msgid "aeroway" -msgstr "aeroway" +msgstr "воздушная трасса" #. color aeroway @@ -23976,5 +23977,5 @@ #: build/trans_style.java:1325 build/trans_style.java:1333 msgid "aeroway_dark" -msgstr "aeroway_dark" +msgstr "тёмная воздушная трасса" #. color aeroway @@ -23988,5 +23989,5 @@ #: build/trans_style.java:1349 msgid "aeroway_light" -msgstr "aeroway_light" +msgstr "светлая воздушная трасса" #. color aeroway_light @@ -24043,5 +24044,5 @@ #: build/trans_style.java:1398 msgid "aerialway" -msgstr "aerialway" +msgstr "канатная дорога" #. color aerialway @@ -25056,5 +25057,5 @@ #: build/trans_style.java:3302 msgid "light_water" -msgstr "легкая вода" +msgstr "прозрачная_вода" #. color amenity_light @@ -25490,5 +25491,5 @@ #: build/trans_style.java:2819 msgid "shop" -msgstr "Магазин" +msgstr "магазин" #. color shop @@ -25666,5 +25667,5 @@ #: build/trans_style.java:2958 build/trans_style.java:2980 msgid "tourism" -msgstr "туризм" +msgstr "туристический" #. color tourism @@ -26490,5 +26491,5 @@ #: build/trans_surveyor.java:60 msgid "Camping" -msgstr "Кэмпинг" +msgstr "Кемпинг" #.