Index: applications/editors/josm/i18n/po/he.po =================================================================== --- applications/editors/josm/i18n/po/he.po (revision 19979) +++ applications/editors/josm/i18n/po/he.po (revision 20008) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-12 15:42+0100\n" +"POT-Creation-Date: 2010-02-14 22:20+0100\n" "PO-Revision-Date: 2010-01-23 21:36+0000\n" "Last-Translator: Tsvi Mostovicz \n" @@ -16,9 +16,9 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-02-12 14:02+0000\n" +"X-Launchpad-Export-Date: 2010-02-14 20:57+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. FIXME why is help not a JosmAction? -#: ../core/src/org/openstreetmap/josm/Main.java:204 +#: ../core/src/org/openstreetmap/josm/Main.java:210 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482 @@ -31,12 +31,12 @@ msgstr "עזרה" -#: ../core/src/org/openstreetmap/josm/Main.java:396 +#: ../core/src/org/openstreetmap/josm/Main.java:402 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "מתעלם מ-URL לא תקין לקובץ: \"{0}\"" -#: ../core/src/org/openstreetmap/josm/Main.java:397 -#: ../core/src/org/openstreetmap/josm/Main.java:430 -#: ../core/src/org/openstreetmap/josm/Main.java:498 +#: ../core/src/org/openstreetmap/josm/Main.java:403 +#: ../core/src/org/openstreetmap/josm/Main.java:436 +#: ../core/src/org/openstreetmap/josm/Main.java:504 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133 @@ -45,6 +45,9 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:142 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:101 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150 @@ -57,7 +60,7 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:451 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:457 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:153 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 @@ -66,10 +69,10 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:291 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:638 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:747 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237 @@ -92,9 +95,9 @@ msgstr "אזהרה" -#: ../core/src/org/openstreetmap/josm/Main.java:429 +#: ../core/src/org/openstreetmap/josm/Main.java:435 msgid "Parameter \"downloadgps\" does not accept file names or file URLs" msgstr "" -#: ../core/src/org/openstreetmap/josm/Main.java:497 +#: ../core/src/org/openstreetmap/josm/Main.java:503 #, java-format msgid "Ignoring malformed URL: \"{0}\"" @@ -233,4 +236,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:116 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:158 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44 @@ -242,5 +246,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372 @@ -256,5 +260,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:600 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:598 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -265,10 +269,6 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:104 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 @@ -390,7 +390,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716 @@ -400,6 +400,4 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NativePasswordManagerPlugin.java:123 -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NativePasswordManagerPlugin.java:161 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110 @@ -440,14 +438,11 @@ #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53 @@ -471,6 +466,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245 @@ -539,21 +534,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191 msgid "Nothing selected to zoom to." msgstr "לא נבחר פריט להתקרבות." +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102 -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:103 #, java-format msgid "Zoom to {0}" msgstr "התקרב אל {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101 #, java-format msgid "Zoom the view to {0}." msgstr "קרב את התצוגה לכדי {0}." -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23 @@ -563,5 +558,5 @@ msgstr "תצוגה: {0}" -#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191 msgid "No conflicts to zoom to" msgstr "אין התנגשויות להתמקד בהם" @@ -591,9 +586,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:30 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:88 #, java-format msgid "File: {0}" @@ -691,12 +686,11 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:97 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:99 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:600 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:598 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:231 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134 @@ -818,5 +812,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367 msgid "Duplicate" msgstr "שכפל" @@ -938,5 +932,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152 -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:79 msgid "The selected way has nodes outside of the downloaded data region." msgid_plural "" @@ -946,15 +940,13 @@ #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155 -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:84 msgid "This can lead to nodes being deleted accidentally." msgstr "" #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:69 msgid "Are you really sure to continue?" msgstr "" #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:70 msgid "Please abort if you are not sure" msgstr "בטל אם אינך בטוח" @@ -1194,30 +1186,53 @@ msgstr "צור מפה חדשה." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:46 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:47 msgid "Open..." msgstr "פתח..." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:46 msgid "Open a file." msgstr "פתח קובץ." -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:77 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:81 msgid "Opening files" msgstr "פותח קבצים" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120 -msgid "Cannot open directory.
Please select a file!" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:100 +#, java-format +msgid "" +"Cannot open {0} file with the file importer ''{1}''. Skipping the following " +"files:" +msgid_plural "" +"Cannot open {0} files with the file importer ''{1}''. Skipping the following " +"files:" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:127 +#, java-format +msgid "" +"Cannot open {0} file because no suitable file importer is available. " +"Skipping the following files:" +msgid_plural "" +"Cannot open {0} files because no suitable file importer is available. " +"Skipping the following files:" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:178 +#, java-format +msgid "Cannot open directory ''{0}''.
Please select a file." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:179 msgid "Open file" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:227 msgid "Opening 1 file..." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:229 #, java-format msgid "Opening {0} file..." @@ -1226,5 +1241,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:237 #, java-format msgid "Opening file ''{0}'' ..." @@ -1439,5 +1454,4 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:45 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:60 -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399 @@ -1448,5 +1462,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:628 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:626 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348 @@ -1470,11 +1484,4 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153 -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:156 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 @@ -1613,13 +1620,13 @@ msgstr "עזרה: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:119 msgid "Status Report" msgstr "דו\"ח מצב" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Copy to clipboard and close" msgstr "העתק ללוח הגזירים וסגור" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408 @@ -1627,35 +1634,75 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 msgid "Close" msgstr "סגור" -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:37 msgid "Simplify Way" msgstr "פשט דרך" -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:37 msgid "Delete unnecessary nodes from a way." msgstr "מחק נקודות מיותרות מדרך" +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:64 +msgid "Yes, delete nodes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:66 +msgid "Delete nodes outside of downloaded data regions" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:70 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215 +msgid "No, abort" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:118 +msgid "Cancel operation" +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85 +msgid "Do you want to delete them anyway?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:87 +msgid "Delete nodes outside of data regions?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:100 msgid "Please select at least one way to simplify." msgstr "בחר לפחות דרך אחת לפישוט" -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:89 -#, java-format -msgid "The selection contains {0} way. Are you sure you want to simplify it?" -msgid_plural "" +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:110 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 +msgid "Yes" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:112 +msgid "Simplify all selected ways" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:125 +#, java-format +msgid "" "The selection contains {0} ways. Are you sure you want to simplify them all?" -msgstr[0] "הבחירה מכילה דרך {0}. האם אתה בטוח שאתה רוצה לפשט אותה?" -msgstr[1] "הבחירה מכילה {0} דרכים. האם אתה בטוח שאתה רוצה לפשט את כולן?" - -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:92 -msgid "Are you sure?" -msgstr "האם אתה בטוח?" - -#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:139 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:128 +msgid "Simplify ways?" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:179 +#, java-format +msgid "Simplify {0} way" +msgid_plural "Simplify {0} ways" +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:250 #: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66 #, java-format @@ -1902,10 +1949,10 @@ msgstr "בחירה ריקה" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:88 msgid "Upload data" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87 msgid "Upload all changes in the active data layer to the OSM server" msgstr "" @@ -1914,9 +1961,9 @@ #, java-format msgid "" -"There are unresolved conflicts in layer ''{0}''.
You have to " -"resolve them first." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128 +"The data to be uploaded participates in unresolved conflicts of layer " +"''{0}''.
You have to resolve them first." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:152 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1924,5 +1971,5 @@ msgstr "אין שינויים להעלאה." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:184 msgid "Nothing to upload. Get some data first." msgstr "אין מה להעלות. קבל כמה נתונים תחילה." @@ -1936,14 +1983,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:267 msgid "Checking parents for deleted objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:317 +#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:326 #, java-format msgid "Reading parents of ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:323 +#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:332 msgid "Checking for deleted parents in the local dataset" msgstr "" @@ -2380,37 +2427,41 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:27 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:27 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:27 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:27 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:28 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:27 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:28 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:27 +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:28 +msgid "" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:29 msgid "" msgstr "" @@ -2596,6 +2647,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:49 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51 @@ -2670,41 +2721,45 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:253 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:295 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:442 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:625 #, java-format msgid "Unexpected token: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:634 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:636 msgid "Missing parameter for OR" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658 #, java-format msgid "Unexpected token. Expected {0}, found {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Missing operator for NOT" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:668 +msgid "Primitive id expected" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:715 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:717 #, java-format msgid "" @@ -2713,9 +2768,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:722 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:727 msgid "Wrong number of parameters for nodes operator." msgstr "מספר שגוי של פרמטרים עבור פעולה על נקודה." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:724 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:729 #, java-format msgid "" @@ -2724,15 +2779,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:731 -#, java-format -msgid "Incorrect value of id operator: {0}. Number is expected." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:737 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:736 #, java-format msgid "Incorrect value of changeset operator: {0}. Number is expected." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:744 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:743 #, java-format msgid "Incorrect value of version operator: {0}. Number is expected." @@ -2879,5 +2929,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1110 msgid "Double conflict" msgstr "" @@ -3059,5 +3109,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68 #, java-format msgid "Undelete {0} primitive" @@ -3345,5 +3395,5 @@ msgstr "מזרח" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:207 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:218 #, java-format msgid "" @@ -3351,5 +3401,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:660 #, java-format msgid "" @@ -3399,17 +3449,17 @@ #. translators notes must be in front #. column header: enable filter +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141 +msgctxt "filter" +msgid "E" +msgstr "" + +#. column header: hide filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142 msgctxt "filter" -msgid "E" -msgstr "" - -#. column header: hide filter +msgid "H" +msgstr "" + +#. column header: filter text #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143 -msgctxt "filter" -msgid "H" -msgstr "" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 msgctxt "filter" msgid "Text" @@ -3417,18 +3467,18 @@ #. column header: apply filter for children +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144 +msgctxt "filter" +msgid "C" +msgstr "" + +#. column header: inverted filter #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145 msgctxt "filter" -msgid "C" -msgstr "" - -#. column header: inverted filter +msgid "I" +msgstr "" + +#. column header: filter mode #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146 msgctxt "filter" -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147 -msgctxt "filter" msgid "M" msgstr "" @@ -3436,24 +3486,24 @@ #. translators notes must be in front #. filter mode: replace +#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209 +msgctxt "filter" +msgid "R" +msgstr "" + +#. filter mode: add #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210 msgctxt "filter" -msgid "R" -msgstr "" - -#. filter mode: add +msgid "A" +msgstr "" + +#. filter mode: remove #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211 msgctxt "filter" -msgid "A" -msgstr "" - -#. filter mode: remove +msgid "D" +msgstr "" + +#. filter mode: in selection #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212 msgctxt "filter" -msgid "D" -msgstr "" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213 -msgctxt "filter" msgid "F" msgstr "" @@ -3494,5 +3544,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:108 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:577 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50 @@ -3514,6 +3564,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:577 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72 @@ -3552,77 +3602,77 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:266 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:267 msgid "More than one \"from\" way found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:272 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:273 msgid "More than one \"to\" way found." msgstr "יותר מ-\"to\" אחד נמצא." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:278 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:292 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:279 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293 msgid "More than one \"via\" found." msgstr "יותר מ-\"via\" אחד נמצא." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:297 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:284 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:298 #, java-format msgid "Unknown role ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:300 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:301 #, java-format msgid "Unknown member type for ''{0}''." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:306 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307 msgid "No \"from\" way found." msgstr "אף דרך \"from\" לא נמצאה." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:310 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:311 msgid "No \"to\" way found." msgstr "אף דרך \"to\" לא נמצאה." -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:314 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:315 msgid "No \"via\" node or way found." msgstr "לא נמצאה אף נקודה או דרך מסוג \"via\"" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:323 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:324 msgid "The \"from\" way does not start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:327 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:328 msgid "The \"to\" way does not start or end at a \"via\" node." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:358 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:359 msgid "The \"from\" way does not start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:362 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:363 msgid "The \"to\" way does not start or end at the \"via\" way." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:456 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:457 #, java-format msgid "Style for restriction {0} not found." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:528 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:529 #, java-format msgid "Style for inner way ''{0}'' equals multipolygon." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:556 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:557 #, java-format msgid "Style for outer way ''{0}'' mismatches." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:754 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:755 #, java-format msgid "Error: {0}" msgstr "שגיאה: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:754 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:755 #, java-format msgid "Warning: {0}" @@ -3650,5 +3700,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:181 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:183 msgid "background" msgstr "רקע" @@ -3792,6 +3842,7 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:84 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:285 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82 #, java-format @@ -3799,38 +3850,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:125 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217 msgid "incomplete" msgstr "לא גמור" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339 msgid "highway" msgstr "כביש ראשי" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340 #: build/trans_presets.java:3219 msgid "railway" msgstr "מסילת רכבת" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:341 msgid "waterway" msgstr "נתיב מים" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:342 msgid "landuse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:147 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:347 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:345 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513 #, java-format msgid "{0} node" @@ -3839,10 +3890,10 @@ msgstr[1] "{0} נקודות" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167 msgid "public transport" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:207 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:392 #, java-format msgid "{0} member" @@ -3851,5 +3902,5 @@ msgstr[1] "{0} חברים" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3861,29 +3912,29 @@ msgstr "הפרת תנאי מקדים" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:103 msgid "Security exception" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:127 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:121 msgid "Network exception" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:145 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:139 msgid "IO Exception" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:178 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:172 msgid "Internal Server Error" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:194 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:188 msgid "Bad Request" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:210 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:204 msgid "Not Found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:219 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 @@ -3892,21 +3943,21 @@ msgstr "התנגשות" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:249 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:243 msgid "Authentication Failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:259 msgid "Authorisation Failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275 msgid "Authentication failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:299 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:293 msgid "Unknown host" msgstr "מארח לא ידוע" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:407 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:401 msgid "Object deleted" msgstr "" @@ -4003,5 +4054,4 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165 -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:87 msgid "Username" msgstr "שם משתמש" @@ -4009,5 +4059,4 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173 -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:90 msgid "Password" msgstr "סיסמא" @@ -4137,5 +4186,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 @@ -4385,5 +4434,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 -#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:494 +#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:504 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" @@ -4473,26 +4522,31 @@ msgstr "פתרון התנגשות" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:334 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 #, java-format msgid "{0} more..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:336 -#, java-format -msgid "Following primitives could not be added because they are deleted: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:604 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:628 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 +msgid "" +"The following primitives could not be copied to the target " +"primitive
because they are deleted in the target dataset:" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335 +msgid "Merging deleted primitives failed" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:626 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:650 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:777 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:799 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:791 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:813 #, java-format msgid "Item {0} not found in list." @@ -4595,5 +4649,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:643 -msgid "Use all mine elements" +msgid "Use all my elements" msgstr "" @@ -4603,5 +4657,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:109 msgid "Up" msgstr "מעלה" @@ -4612,5 +4666,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:120 msgid "Down" msgstr "מטה" @@ -4853,10 +4907,4 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633 msgid "Yes, reset the id" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215 -msgid "No, abort" msgstr "" @@ -4938,5 +4986,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:78 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18 @@ -4951,5 +4999,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:85 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -5023,5 +5071,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 msgid "Apply" msgstr "" @@ -5113,6 +5161,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:266 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:518 #, java-format msgid "{0} way" @@ -5123,5 +5171,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:349 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 #, java-format msgid "{0} relation" @@ -5302,5 +5350,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5391,13 +5439,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:49 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:195 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108 @@ -5408,41 +5455,41 @@ msgstr "הוסף" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:72 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:84 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:99 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:109 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:120 msgid "Move filter down." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 msgid "Enable filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 msgid "Hide elements" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137 msgid "Apply also for children" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 msgid "Inverse filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 msgid "Filter mode" msgstr "" @@ -5562,5 +5609,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1364 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5619,14 +5666,14 @@ msgstr "בחירה: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Undock the panel" msgstr "\"שחרר\" את הפאנל" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:373 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:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:384 msgid "Click to minimize/maximize the panel content" msgstr "לחץ כדי למזער \\ למקסם את תוכן הפאנל" @@ -7293,5 +7340,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1093 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7318,6 +7365,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:430 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:532 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:110 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:110 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format msgid "Warning: ignoring exception because task is cancelled. Exception: {0}" @@ -7361,5 +7408,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571 msgid "" "There is at least one member in this relation referring
to the " @@ -7368,14 +7415,14 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:578 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:578 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:601 #, java-format msgid "" @@ -7385,9 +7432,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629 #, java-format msgid "" @@ -7397,15 +7444,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:670 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:696 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:723 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7413,5 +7460,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:757 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7419,20 +7466,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:789 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:792 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:826 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:836 #, java-format msgid "" @@ -7441,80 +7488,80 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:860 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:880 msgid "Sort the relation members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:882 +msgid "Sort" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 -msgid "Sort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903 msgid "Reverse the order of the relation members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905 +msgid "Reverse" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 -msgid "Reverse" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members up" msgstr "הזז את החברים הנבחרים מעלה" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Move the currently selected members down" msgstr "הזז מטה את החברים שנבחרו" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:983 msgid "Delete the currently edited relation" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1072 +msgid "Yes, create a conflict and close" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1074 -msgid "Yes, create a conflict and close" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 msgid "Click to create a conflict and close this relation editor" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 +msgid "No, continue editing" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 -msgid "No, continue editing" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7523,5 +7570,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1106 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1104 #, java-format msgid "" @@ -7530,47 +7577,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1118 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1151 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1185 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1202 msgid "Add an empty tag" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215 +msgid "Download all incomplete members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 -msgid "Download all incomplete members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 msgid "Download Members" msgstr "הורד חברים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 msgid "Relation Editor: Download Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 msgid "Download selected incomplete members" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 +msgid "Sets a role for the selected members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1291 -msgid "Sets a role for the selected members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1307 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1305 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7579,25 +7626,25 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1308 +msgid "This is equal to deleting the roles of these primitives." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310 -msgid "This is equal to deleting the roles of these primitives." +msgid "Do you really want to apply the new role?" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 -msgid "Do you really want to apply the new role?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1315 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1313 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -8123,10 +8170,10 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:272 +msgid "History not initialized yet. Failed to set reference primitive." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:274 -msgid "History not initialized yet. Failed to set reference primitive." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 #, java-format msgid "" @@ -8134,5 +8181,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:279 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:277 #, java-format msgid "" @@ -8140,9 +8187,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302 msgid "History not initialized yet. Failed to set current primitive." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307 #, java-format msgid "" @@ -8308,5 +8355,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 msgid "Conflicts detected" msgstr "" @@ -8472,5 +8519,4 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145 -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:97 msgid "Save user and password (unencrypted)" msgstr "שמור את המשתמש והסיסמא (לא מוצפנים)" @@ -8492,5 +8538,4 @@ #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242 -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:93 msgid "Warning: The password is transferred unencrypted." msgstr "אזהרה: הסיסמא נשלחת בצורה לא מוצפנת." @@ -8555,9 +8600,4 @@ #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 msgid "Select filename" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 -msgid "Yes" msgstr "" @@ -9363,5 +9403,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:642 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225 @@ -9427,18 +9467,18 @@ msgstr "שכבת נתונים {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:187 msgid "outside downloaded area" msgstr "מחוץ לשטח שהורד" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:269 #, java-format msgid "version {0}" msgstr "גירסה {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -9447,5 +9487,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:347 #, java-format msgid "" @@ -9459,5 +9499,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 #, java-format msgid "" @@ -9470,11 +9510,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:525 #, java-format msgid "{0} deleted" @@ -9483,32 +9523,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:528 #, java-format msgid "{0} consists of:" msgstr "{0} מורכב מ-:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:532 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:532 #, java-format msgid "API version: {0}" msgstr "גירסת API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:639 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222 msgid "Convert to GPX layer" msgstr "המר לשכבת GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:738 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741 msgid "Following problems found:" msgstr "" @@ -9559,14 +9599,8 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:130 msgid "GPX Files (*.gpx *.gpx.gz)" msgstr "קבצי GPX‏ (*.gpx *.gpx.gz)" #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151 #, java-format msgid "File {0} is loaded yet under the name \"{1}\"" @@ -9574,7 +9608,4 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:175 #, java-format msgid "Error while parsing {0}" @@ -9582,7 +9613,4 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184 #, java-format msgid "Could not read \"{0}\"" @@ -9590,7 +9618,4 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223 msgid "" "Take a photo of your GPS receiver while it displays the time." @@ -9600,21 +9625,12 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:241 msgid "Photo time (from exif):" msgstr "זמן צילום (מ-EXIF)" #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:256 msgid "Gps time (read from the above photo): " msgstr "זמן GPS (נקרא מהצילום למעלה): " #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:268 msgid " [dd/mm/yyyy hh:mm:ss]" msgstr " [dd/mm/yyyy hh:mm:ss]" @@ -9626,9 +9642,4 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340 -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:339 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:375 msgid "No date" msgstr "אין תאריך" @@ -9639,14 +9650,8 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:389 msgid "Synchronize time from a photo of the GPS receiver" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:403 msgid "" "Error while parsing the date.\n" @@ -9655,28 +9660,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:405 msgid "Invalid date" msgstr "תאריך שגוי" #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:448 msgid "" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:454 msgid "GPX track: " msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:459 msgid "Open another GPX trace" msgstr "" @@ -9688,7 +9681,4 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 msgid "Auto-Guess" msgstr "" @@ -9717,14 +9707,8 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:475 msgid "Timezone: " msgstr "אזור זמן: " #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:497 msgid "Offset:" msgstr "היסט:" @@ -9744,28 +9728,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:575 msgid "Correlate images with GPX track" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577 msgid "Correlate" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 msgid "Invalid timezone" msgstr "אזור זמן שגוי" #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 msgid "Invalid offset" msgstr "היסט שגוי" @@ -9780,7 +9752,4 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:774 #, java-format msgid "Timezone: {0}" @@ -9788,7 +9757,4 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:775 #, java-format msgid "Minutes: {0}" @@ -9796,7 +9762,4 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776 #, java-format msgid "Seconds: {0}" @@ -9811,7 +9774,4 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:865 msgid "" "An error occurred while trying to match the photos to the GPX track. You can " @@ -9820,14 +9780,8 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867 msgid "Matching photos to track failed" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:883 msgid "Adjust timezone and offset" msgstr "" @@ -9848,28 +9802,16 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:729 msgid "GPX Track has no time information" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:587 msgid "You should select a GPX track" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588 msgid "No selected GPX track" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1265 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:600 #, java-format msgid "" @@ -9881,7 +9823,4 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1335 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:613 #, java-format msgid "" @@ -9893,14 +9832,8 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107 msgid "Extracting GPS locations from EXIF" msgstr "מחלץ מיקומי GPS מ-EXIF" #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113 msgid "Starting directory scan" msgstr "מתחיל סריקת ספרייה" @@ -9912,16 +9845,8 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127 msgid "Read photos..." msgstr "קורא תמונות..." #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139 #, java-format msgid "Reading {0}..." @@ -9929,7 +9854,4 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181 #, java-format msgid "Unable to get canonical path for directory {0}\n" @@ -9937,7 +9859,4 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193 #, java-format msgid "Scanning directory {0}" @@ -9945,7 +9864,4 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198 #, java-format msgid "Found null file in directory {0}\n" @@ -9953,27 +9869,18 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201 #, java-format msgid "Error while getting files from directory {0}\n" msgstr "שגיאה בזמן קבלת קבצים מהסיפריה {0}\n" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:274 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:63 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67 msgid "Geotagged Images" msgstr "תמונות בעלות גאותגיות" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:298 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:296 msgid "Correlate to GPX" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:326 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324 #, java-format msgid "{0} image loaded." @@ -9982,5 +9889,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:327 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:325 #, java-format msgid "{0} was found to be GPS tagged." @@ -9989,10 +9896,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:599 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:105 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103 msgid "Delete image file from disk" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:602 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:600 #, java-format msgid "" @@ -10001,101 +9908,74 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:625 msgid "Image file could not be deleted." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:436 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432 msgid "No image" msgstr "ללא תמונה" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:488 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:446 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442 #, java-format msgid "Loading {0}" msgstr "טוען {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:490 -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:518 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:448 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:475 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471 #, java-format msgid "Error on file {0}" msgstr "שגיאה בקובץ {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:63 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67 msgid "Display geotagged images" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:83 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:70 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:70 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106 msgid "Previous" msgstr "קודמת" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:87 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85 msgid "Show previous Image" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:87 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:99 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:109 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118 #, java-format msgid "Geoimage: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:94 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:78 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92 msgid "Remove photo from layer" msgstr "הסר תמונה משכבה" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107 msgid "Delete File from disk" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:116 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:86 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127 msgid "Next" msgstr "הבאה" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118 msgid "Show next Image" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:127 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125 msgid "Center view" msgstr "מרכז תצוגה" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:130 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:102 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:102 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128 msgid "Zoom best fit and 1:1" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:133 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131 msgid "Move dialog to the side pane" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:243 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:166 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241 #, java-format msgid "" @@ -10106,8 +9986,5 @@ "רום: {0} מ''" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:246 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244 #, java-format msgid "" @@ -10119,7 +9996,4 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java:31 -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 msgid "JPEG images (*.jpg)" msgstr "תמונות JPEG (*.jpg)" @@ -11432,5 +11306,5 @@ msgid "" "

Furthermore, the shortcuts are activated when the actions are assigned to " -"a menu entry of button for the first time. So some of your changes may " +"a menu entry of a button for the first time. So some of your changes may " "become active even without restart --- but also without collision handling. " "This is another reason to restart JOSM after making any changes here." @@ -11442,33 +11316,29 @@ "

You may notice that the key selection list on the next page lists all " "keys that exist on all kinds of keyboards Java knows about, not just those " -"keys that exist on your keyboard. Please use only those values that " -"correspond to a real key on your keyboard. So if your keyboard has no " -"''Copy'' key (PC keyboard do not have them, Sun keyboards do), then do not " -"use it. Also there will be ''keys'' listed that correspond to a shortcut on " -"your keyboard (e.g. '':''/Colon). Please also do not use them, use the base " -"key ('';''/Semicolon on US keyboards, ''.''/Period on German keyboards, ...) " -"instead. Not doing so may result in conflicts, as there is no way for JOSM " -"to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US " -"keyboard...

" +"keys that exist on your keyboard. Please only use values that correspond to " +"a real key on your keyboard. If your keyboard has no ''Copy'' key (PC " +"keyboard do not have them, Sun keyboards do), then do not use it. Also there " +"are ''keys'' listed that correspond to a shortcut on your keyboard (e.g. " +"'':''/Colon). Please do not use them either, use the base key ('';''/" +"Semicolon on US keyboards, ''.''/Period on German keyboards, etc.) instead. " +"Not doing so may result in conflicts, as there is no way for JOSM to know " +"that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard." msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177 -msgid "

Thank you for your understanding

" -msgstr "

תודה על ההבנה

" +msgid "

Modifier Groups

" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178 -msgid "

Modifier Groups

" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179 msgid "" "

The last page lists the modifier keys JOSM will automatically assign to " "shortcuts. For every of the four kinds of shortcuts there are three " "alternatives. JOSM will try those alternatives in the listed order when " -"managing a conflict. If all alternatives would result in shortcuts that are " +"managing a conflict. If all alternatives result in shortcuts that are " "already taken, it will assign a random shortcut instead.

" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182 msgid "" "

The pseudo-modifier ''disabled'' will disable the shortcut when " @@ -11477,66 +11347,66 @@ #. scroll up -#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185 msgid "Read First" msgstr "קרא קודם" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206 msgid "Use default" msgstr "השתמש בברירת המחדל" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216 msgid "Disable" msgstr "נטרל" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224 msgid "Key:" msgstr "מפתח:" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239 msgid "Attention: Use real keyboard keys only!" msgstr "שים לב: השתמש רק במקשי מקלדת אמיתיים!" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246 msgid "Keyboard Shortcuts" msgstr "קיצורי מקלדת" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253 msgid "Edit Shortcuts" msgstr "ערוך קיצורים" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325 msgid "Primary modifier:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331 msgid "Secondary modifier:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315 -#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337 msgid "Tertiary modifier:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276 msgid "Menu Shortcuts" msgstr "קיצורי תפריט" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299 msgid "Hotkey Shortcuts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322 msgid "Subwindow Shortcuts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360 +#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359 msgid "Modifier Groups" msgstr "" @@ -12071,10 +11941,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69 -#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 -msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:58 +msgid "multiple" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:431 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -12084,10 +11953,10 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:183 +msgid "Delete the selection in the tag table" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:278 msgid "Add a new tag" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163 -msgid "Delete the selection in the tag table" msgstr "" @@ -12359,12 +12228,12 @@ #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:62 -#, fuzzy, java-format +#, java-format msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "אין אפשרות לקרוא קובץ''{0}''.
הודעת שגיאה:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:76 -#, fuzzy, java-format +#, java-format msgid "Could not read files.
Error is:
{0}" -msgstr "אין אפשרות לקרוא קובץ''{0}''.
הודעת שגיאה:
{1}" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:41 @@ -13049,5 +12918,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:498 #, java-format msgid "" @@ -13056,18 +12925,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:513 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:522 #, java-format msgid "Deleted member {0} is used by relation {1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:540 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:548 msgid "Prepare OSM data..." msgstr "מכין נתוני OSM..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:541 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549 msgid "Parsing OSM data..." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:546 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:554 msgid "Preparing data set..." msgstr "" @@ -13385,7 +13254,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:556 -#, fuzzy msgid "Removing unmaintained plugins..." -msgstr "מוריד נקודות כפולות..." +msgstr "" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:580 @@ -14202,163 +14070,4 @@ msgid "Starting address number must be less than ending address number" msgstr "" - -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -msgid "AgPifoJ - Geotagged pictures" -msgstr "" - -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48 -#, fuzzy -msgid "Display geotagged photos" -msgstr "הצג תמונות ללא תיוג גיאוגרפי" - -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118 -msgid "One of the selected files was null !!!" -msgstr "" - -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284 -msgid "image" -msgid_plural "images" -msgstr[0] "תמונה" -msgstr[1] "תמונות" - -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285 -#, java-format -msgid "{0} were found to be gps tagged." -msgstr "" - -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:46 -msgid "Open images with AgPifoJ..." -msgstr "פותח תמונות ב-AgPifoJ..." - -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:48 -#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47 -msgid "Load set of images as a new layer." -msgstr "פתח סט תמונות כשכבה חדשה." - -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:276 -#, fuzzy -msgid "I'm in the timezone of: " -msgstr "אני באזור זמן: " - -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:348 -#, fuzzy -msgid "Open an other photo" -msgstr "פתח תמונה אחרת" - -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:509 -msgid "I can take a picture of my GPS receiver.
Can this help?" -msgstr "" - -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:526 -msgid "Update position for: " -msgstr "" - -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:535 -msgid "All images" -msgstr "כל התמונות" - -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:545 -msgid "Images with no exif position" -msgstr "תמונות ללא מיקום exif" - -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:555 -msgid "Not yet tagged images" -msgstr "תמונות שעדיין לא תויגו" - -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:657 -#, java-format -msgid "Found {0} matches of {1} in GPX track {2}" -msgstr "" - -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658 -msgid "GPX Track loaded" -msgstr "" - -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:693 -#, fuzzy -msgid "The selected photos don't contain time information." -msgstr "הדרך הבחורה אינה מכילה את הנקודה הבחורה." - -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694 -msgid "Photos don't contain time information" -msgstr "" - -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:728 -#, fuzzy -msgid "" -"The selected GPX track doesn't contain timestamps. Please select another one." -msgstr "הדרך הבחורה אינה מכילה את הנקודה הבחורה." - -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:793 -#, java-format -msgid "Matched {0} of {1} photos to GPX track." -msgstr "" - -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:796 -#, fuzzy, java-format -msgid "(Time difference of {0} days)" -msgstr "הפרש אזורי הזמן: " - -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:803 -#, java-format -msgid "Offset between track and photos: {0}m {1}s" -msgstr "" - -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887 -#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885 -#, fuzzy -msgid "Default Values" -msgstr "ברירת מחדל" - -#: ../plugins/agpifoj -#: fst/src/org/openstreetmap/josm/plugins/agpifoj/ImageDisplay.java:478 -#, fuzzy -msgid "No image -dsffs" -msgstr "ללא תמונה" #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104 @@ -15265,4 +14974,8 @@ msgstr "פתח תמונות עם ImageWayPoint" +#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47 +msgid "Load set of images as a new layer." +msgstr "פתח סט תמונות כשכבה חדשה." + #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69 msgid "Direction index '{0}' not found" @@ -15753,101 +15466,4 @@ msgstr "" -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:37 -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:55 -msgid "Native Password Manager Plugin: " -msgstr "" - -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:37 -#, java-format -msgid "lookup {0} (" -msgstr "" - -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:55 -#, fuzzy, java-format -msgid "store {0} (" -msgstr "סוג ספורט {0}" - -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:85 -msgid "Incorrect password or username." -msgstr "סיסמא או שם משתמש שגויים." - -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:103 -msgid "Enter Password" -msgstr "הכנס סיסמא" - -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:104 -msgid "Login" -msgstr "התחברות" - -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:161 -#, fuzzy -msgid "show" -msgstr "חנות" - -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:175 -#, fuzzy -msgid "Login name (e-mail) to the OSM account." -msgstr "שם כניסה (אי-מייל) לחשבון OSM." - -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:176 -msgid "" -"Login password to the OSM account. Leave blank to not store any password." -msgstr "סיסמת כניסה לחשבון OSM. השאר ריק כדי לא לשמור אף סיסמא." - -#. Main.pref.get("osm-server.url", "http://api.openstreetmap.org/api")); -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:219 -msgid "The base URL for the OSM server (REST API)" -msgstr "" - -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:220 -msgid "Base Server URL" -msgstr "" - -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:227 -#, fuzzy -msgid "OSM username (e-mail)" -msgstr "שם תפריט (ברירת מחדל)" - -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:229 -#, fuzzy -msgid "OSM password" -msgstr "סיסמת OSM." - -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NPMCredentialsManager.java:335 -msgid "" -"WARNING: The password is stored in plain text in the preferences file." -"
The password is transferred in plain text to the server, encoded in the " -"URL.
Do not use a valuable Password." -msgstr "" - -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NativePasswordManagerPlugin.java:107 -msgid "" -"No native password managers could be found.
Make sure you have one " -"of the following applications
installed and running:" -"

  • gnomekeyring
  • KWallet 3
  • KWallet 4
Your password is still " -"saved to a plain text file!" -msgstr "" - -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NativePasswordManagerPlugin.java:114 -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NativePasswordManagerPlugin.java:122 -msgid "Native password manager plugin" -msgstr "" - -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NativePasswordManagerPlugin.java:123 -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NativePasswordManagerPlugin.java:161 -msgid "don't change my settings" -msgstr "" - -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NativePasswordManagerPlugin.java:125 -#, java-format -msgid "" -"{0} was detected.\n" -"Do you like to have your password saved by this password manager?" -msgstr "" - -#: ../plugins/native_password_manager/src/org/openstreetmap/josm/plugins/native_password_manager/NativePasswordManagerPlugin.java:143 -msgid "More than one native password manager has been detected. Please choose:" -msgstr "" - #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46 msgid "OpenLayers" @@ -16140,31 +15756,27 @@ msgstr "תחבורה ציבורית" -#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:479 +#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:489 msgid "Route patterns ..." msgstr "" -#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:480 +#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:490 msgid "Edit Route patterns for public transport" msgstr "" -#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:492 -#, fuzzy +#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:502 msgid "Overview" -msgstr "שכתוב" - -#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:496 -#, fuzzy +msgstr "" + +#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:506 msgid "Itinerary" -msgstr "שלישוני" - -#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:498 -#, fuzzy +msgstr "" + +#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:508 msgid "Stops" -msgstr "עצור" - -#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:500 -#, fuzzy +msgstr "" + +#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:510 msgid "Meta" -msgstr "השכרה" +msgstr "" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27 @@ -16515,4 +16127,8 @@ msgstr "" +#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72 +msgid "" +msgstr "" + #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370 #, java-format @@ -17903,18 +17519,11 @@ msgstr "" -#. Plugin AgPifoJ -#: build/trans_plugins.java:5 build/trans_plugins.java:7 -msgid "" -"Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " -"import EXIF geotagged pictures." -msgstr "" - #. Plugin cadastre-fr -#: build/trans_plugins.java:9 +#: build/trans_plugins.java:5 msgid "A special handler for the French land registry WMS server." msgstr "" #. Plugin colorscheme -#: build/trans_plugins.java:11 +#: build/trans_plugins.java:7 msgid "" "Allows the user to create different color schemes and to switch between " @@ -17926,21 +17535,21 @@ #. Plugin Create_grid_of_ways +#: build/trans_plugins.java:9 +msgid "Create a grid of ways." +msgstr "" + +#. Plugin czechaddress +#: build/trans_plugins.java:11 +msgid "" +"Creating and handling address nodes and buildings within Czech Republic." +msgstr "" + +#. Plugin dataimport #: build/trans_plugins.java:13 -msgid "Create a grid of ways." -msgstr "" - -#. Plugin czechaddress +msgid "Allows to import various file formats into JOSM directly." +msgstr "" + +#. Plugin DirectUpload #: build/trans_plugins.java:15 -msgid "" -"Creating and handling address nodes and buildings within Czech Republic." -msgstr "" - -#. Plugin dataimport -#: build/trans_plugins.java:17 -msgid "Allows to import various file formats into JOSM directly." -msgstr "" - -#. Plugin DirectUpload -#: build/trans_plugins.java:19 msgid "" "This plugin directly upload GPS Traces from current active layer in JOSM to " @@ -17949,10 +17558,10 @@ #. Plugin Duplicate-Way -#: build/trans_plugins.java:21 +#: build/trans_plugins.java:17 msgid "Duplicate Ways with an offset" msgstr "" #. Plugin editgpx -#: build/trans_plugins.java:23 +#: build/trans_plugins.java:19 msgid "" "Allows the user to anonymize timestamps and delete parts of huge GPX tracks " @@ -17961,20 +17570,20 @@ #. Plugin globalsat +#: build/trans_plugins.java:21 +msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." +msgstr "" + +#. Plugin graphview +#: build/trans_plugins.java:23 +msgid "Visualizes routing information as a routing graph." +msgstr "" + +#. Plugin grid #: build/trans_plugins.java:25 -msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM." -msgstr "" - -#. Plugin graphview +msgid "Provide a background layer that displays a map grid" +msgstr "" + +#. Plugin ImageWayPoint #: build/trans_plugins.java:27 -msgid "Visualizes routing information as a routing graph." -msgstr "" - -#. Plugin grid -#: build/trans_plugins.java:29 -msgid "Provide a background layer that displays a map grid" -msgstr "" - -#. Plugin ImageWayPoint -#: build/trans_plugins.java:31 msgid "" "Another plugin to match images to the waypoints in a GPX file. A match is " @@ -17984,16 +17593,16 @@ #. Plugin lakewalker +#: build/trans_plugins.java:29 +msgid "Helps vectorizing WMS images." +msgstr "" + +#. Plugin livegps +#: build/trans_plugins.java:31 +msgid "" +"Support live GPS input (moving dot) through a connection to gpsd server." +msgstr "" + +#. Plugin measurement #: build/trans_plugins.java:33 -msgid "Helps vectorizing WMS images." -msgstr "" - -#. Plugin livegps -#: build/trans_plugins.java:35 -msgid "" -"Support live GPS input (moving dot) through a connection to gpsd server." -msgstr "" - -#. Plugin measurement -#: build/trans_plugins.java:37 msgid "" "Provide a measurement dialog and a layer to measure length and angle of " @@ -18003,10 +17612,10 @@ #. Plugin michigan_left -#: build/trans_plugins.java:39 +#: build/trans_plugins.java:35 msgid "Adds no left turn for sets of 4 or 5 ways" msgstr "" #. Plugin multipoly -#: build/trans_plugins.java:41 +#: build/trans_plugins.java:37 msgid "" "Create multipolygons by one click, much easier than standard way with " @@ -18014,15 +17623,6 @@ msgstr "" -#. Plugin native_password_manager -#: build/trans_plugins.java:43 -msgid "" -"(Linux only.) Let the native password management system store the osm login " -"password and username rather than putting it unencrypted in a plain text " -"file. Currently only Unix-like operating systems are supported. (Using gnome-" -"keyring or KWallet.)" -msgstr "" - #. Plugin nearclick -#: build/trans_plugins.java:45 +#: build/trans_plugins.java:39 msgid "" "Simulates a click when you do a small and short drag. This is useful for " @@ -18032,27 +17632,27 @@ #. Plugin openlayers +#: build/trans_plugins.java:41 +msgid "Displays an OpenLayers background image" +msgstr "" + +#. Plugin openstreetbugs +#: build/trans_plugins.java:43 +msgid "Imports issues from OpenStreetBugs" +msgstr "" + +#. Plugin openvisible +#: build/trans_plugins.java:45 +msgid "" +"Allows opening gpx/osm files that intersect the currently visible screen area" +msgstr "" + +#. Plugin osmarender #: build/trans_plugins.java:47 -msgid "Displays an OpenLayers background image" -msgstr "" - -#. Plugin openstreetbugs +msgid "" +"Launches FireFox to display the current visible screen as a nice SVG image." +msgstr "" + +#. Plugin photo_geotagging #: build/trans_plugins.java:49 -msgid "Imports issues from OpenStreetBugs" -msgstr "" - -#. Plugin openvisible -#: build/trans_plugins.java:51 -msgid "" -"Allows opening gpx/osm files that intersect the currently visible screen area" -msgstr "" - -#. Plugin osmarender -#: build/trans_plugins.java:53 -msgid "" -"Launches FireFox to display the current visible screen as a nice SVG image." -msgstr "" - -#. Plugin photo_geotagging -#: build/trans_plugins.java:55 msgid "" "Write gps position info to the image file header. Run this feature from the " @@ -18061,5 +17661,5 @@ #. Plugin PicLayer -#: build/trans_plugins.java:57 +#: build/trans_plugins.java:51 msgid "" "This plugin allows to display any picture as a background in the editor and " @@ -18068,21 +17668,21 @@ #. Plugin plastic_laf +#: build/trans_plugins.java:53 +msgid "The great JGoodies Plastic Look and Feel." +msgstr "" + +#. Plugin public_transport +#: build/trans_plugins.java:55 +msgid "" +"This plugin simplifies the mapping and editing of public transport routes." +msgstr "" + +#. Plugin remotecontrol +#: build/trans_plugins.java:57 +msgid "Let other applications send commands to JOSM." +msgstr "" + +#. Plugin routes #: build/trans_plugins.java:59 -msgid "The great JGoodies Plastic Look and Feel." -msgstr "" - -#. Plugin public_transport -#: build/trans_plugins.java:61 -msgid "" -"This plugin simplifies the mapping and editing of public transport routes." -msgstr "" - -#. Plugin remotecontrol -#: build/trans_plugins.java:63 -msgid "Let other applications send commands to JOSM." -msgstr "" - -#. Plugin routes -#: build/trans_plugins.java:65 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -18091,10 +17691,10 @@ #. Plugin routing -#: build/trans_plugins.java:67 +#: build/trans_plugins.java:61 msgid "Provides routing capabilities." msgstr "" #. Plugin slippymap -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:63 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -18103,15 +17703,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:65 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:67 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:69 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -18121,10 +17721,10 @@ #. Plugin terracer -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:71 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin Tracer -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:73 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -18133,5 +17733,5 @@ #. Plugin validator -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:75 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -18140,5 +17740,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:77 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -18147,10 +17747,17 @@ #. Plugin waydownloader -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:79 msgid "Easy downloading along a long set of interconnected ways" msgstr "" +#. Plugin wms-turbo-challenge2 +#: build/trans_plugins.java:81 +msgid "" +"Drive a race car from point A to point B over aerial imagery, leave cacti " +"behind." +msgstr "" + #. Plugin wmsplugin -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:83 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -30733,4 +30340,9 @@ #~ msgstr "אין נתוני שעה במבנה EXIF בתוך הקובץ \"{0}\"." +#~ msgid "image" +#~ msgid_plural "images" +#~ msgstr[0] "תמונה" +#~ msgstr[1] "תמונות" + #~ msgid "Unsaved Changes" #~ msgstr "שינויים לא שמורים" @@ -30847,4 +30459,10 @@ #~ msgid "Preparing..." #~ msgstr "מכין..." + +#~ msgid "Incorrect password or username." +#~ msgstr "סיסמא או שם משתמש שגויים." + +#~ msgid "Enter Password" +#~ msgstr "הכנס סיסמא" #~ msgid "Transfer aborted due to error (will wait for 5 seconds):" @@ -30986,4 +30604,19 @@ #~ msgstr "שגיאה בבקשת עדכון" +#~ msgid "Are you sure?" +#~ msgstr "האם אתה בטוח?" + +#~ msgid "Open images with AgPifoJ..." +#~ msgstr "פותח תמונות ב-AgPifoJ..." + +#~ msgid "Not yet tagged images" +#~ msgstr "תמונות שעדיין לא תויגו" + +#~ msgid "Images with no exif position" +#~ msgstr "תמונות ללא מיקום exif" + +#~ msgid "All images" +#~ msgstr "כל התמונות" + #~ msgid "Please select some data" #~ msgstr "בחר נתונים" @@ -31001,6 +30634,13 @@ #~ msgstr "מצטער, לא עובד עם משתמשים אנונימיים" +#~ msgid "

Thank you for your understanding

" +#~ msgstr "

תודה על ההבנה

" + #~ msgid "GPS unit timezone (difference to photo)" #~ msgstr "אזור זמן של יחידת GPS (הבדל מתמונה)" + +#~ msgid "" +#~ "Login password to the OSM account. Leave blank to not store any password." +#~ msgstr "סיסמת כניסה לחשבון OSM. השאר ריק כדי לא לשמור אף סיסמא." #~ msgid "Open the OpenStreetBugs window and activate the automatic download" @@ -31126,4 +30766,7 @@ #~ msgstr "מדלג על דרך כי היא מכילה נקודה שאינה קיימת: {0}\n" +#~ msgid "Login" +#~ msgstr "התחברות" + #~ msgid "Merge Anyway" #~ msgstr "מזג בכל זאת" @@ -31142,4 +30785,12 @@ #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading." #~ msgstr "נסיוני. שמור את עבודתך וודא לפני העלאה." + +#~ msgid "" +#~ "The selection contains {0} way. Are you sure you want to simplify it?" +#~ msgid_plural "" +#~ "The selection contains {0} ways. Are you sure you want to simplify them " +#~ "all?" +#~ msgstr[0] "הבחירה מכילה דרך {0}. האם אתה בטוח שאתה רוצה לפשט אותה?" +#~ msgstr[1] "הבחירה מכילה {0} דרכים. האם אתה בטוח שאתה רוצה לפשט את כולן?" #~ msgid "citymap"