Index: applications/editors/josm/i18n/po/ja.po =================================================================== --- applications/editors/josm/i18n/po/ja.po (revision 18656) +++ applications/editors/josm/i18n/po/ja.po (revision 18773) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-17 17:14+0100\n" -"PO-Revision-Date: 2009-11-15 18:25+0000\n" -"Last-Translator: nazotoko \n" +"POT-Creation-Date: 2009-11-24 10:29+0100\n" +"PO-Revision-Date: 2009-11-23 06:45+0000\n" +"Last-Translator: higa4 \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-11-17 16:08+0000\n" +"X-Launchpad-Export-Date: 2009-11-24 08:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,20 +27,20 @@ #: ../core/src/org/openstreetmap/josm/Main.java:217 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 msgid "Help" msgstr "ヘルプ" -#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:430 #, java-format msgid "Ignoring malformed URL: \"{0}\"" msgstr "不正な形式のURLの\"{0}\"を無視します。" -#: ../core/src/org/openstreetmap/josm/Main.java:432 -#: ../core/src/org/openstreetmap/josm/Main.java:452 +#: ../core/src/org/openstreetmap/josm/Main.java:431 +#: ../core/src/org/openstreetmap/josm/Main.java:451 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119 @@ -61,21 +61,19 @@ #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:347 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193 -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:379 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:281 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:355 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:739 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234 @@ -83,6 +81,6 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163 @@ -94,12 +92,22 @@ #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:67 -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:141 msgid "Warning" msgstr "警告" -#: ../core/src/org/openstreetmap/josm/Main.java:451 +#: ../core/src/org/openstreetmap/josm/Main.java:450 #, java-format msgid "Ignoring malformed file URL: \"{0}\"" msgstr "不正な形式のファイルURL\"{0}\"を無視します。" + +#: ../core/src/org/openstreetmap/josm/Main.java:463 +#: ../core/src/org/openstreetmap/josm/Main.java:471 +#: ../core/src/org/openstreetmap/josm/Main.java:502 +#: ../core/src/org/openstreetmap/josm/Main.java:510 +#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 +#, java-format +msgid "Could not read file ''{0}''.
Error is:
{1}" +msgstr "" +"ファイル ''{0}'' が読み込めません。
エラー内容:
{1}" #: ../core/src/org/openstreetmap/josm/Main.java:464 @@ -107,18 +115,8 @@ #: ../core/src/org/openstreetmap/josm/Main.java:503 #: ../core/src/org/openstreetmap/josm/Main.java:511 -#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96 -#, java-format -msgid "Could not read file ''{0}''.
Error is:
{1}" -msgstr "" -"ファイル ''{0}'' が読み込めません。
エラー内容:
{1}" - -#: ../core/src/org/openstreetmap/josm/Main.java:465 -#: ../core/src/org/openstreetmap/josm/Main.java:473 -#: ../core/src/org/openstreetmap/josm/Main.java:504 -#: ../core/src/org/openstreetmap/josm/Main.java:512 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -126,8 +124,8 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441 -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113 @@ -137,21 +135,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:90 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:137 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:390 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:809 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84 @@ -175,8 +173,11 @@ #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186 -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:29 -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70 @@ -189,6 +190,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:77 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:228 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:236 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:433 msgid "Error" msgstr "エラー" @@ -209,6 +210,6 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646 #: ../core/src/org/openstreetmap/josm/gui/MapView.java:648 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:650 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68 msgid "Java OpenStreetMap Editor" @@ -309,5 +310,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88 -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 @@ -316,27 +317,27 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1163 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:516 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188 @@ -354,5 +355,5 @@ #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Cancel" msgstr "キャンセル" @@ -364,19 +365,19 @@ "さい。" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67 msgid "Please select the target layer." msgstr "対象のレイヤーを選択してください。" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71 msgid "Select target layer" msgstr "対象のレイヤーを選択する。" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465 msgid "Merge" msgstr "マージ" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85 #, java-format msgid "" @@ -387,5 +388,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87 +#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86 msgid "No target layers" msgstr "対象のレイヤーがありません。" @@ -498,13 +499,13 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:137 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251 @@ -602,20 +603,20 @@ #: ../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:120 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 #, java-format msgid "File: {0}" msgstr "ファイル: {0}" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64 msgid "There are no open changesets" msgstr "開かれた変更セットはありません" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65 msgid "No open changesets" msgstr "開かれた変更セットはありません" -#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43 msgid "Downloading open changesets ..." @@ -652,10 +653,10 @@ "ウェイを結合できません（これらをノードの一列として統合することができません）" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "{0}ウェイを結合" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "結合するウェイを少なくとも二つ選択してください。" @@ -701,10 +702,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:382 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133 @@ -723,11 +724,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208 msgid "Overwrite" msgstr "上書きする" #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:58 -#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:210 +#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209 msgid "File exists. Overwrite?" msgstr "ファイルが存在します。上書きしますか？" @@ -775,5 +776,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237 -#: ../core/src/org/openstreetmap/josm/command/Command.java:67 +#: ../core/src/org/openstreetmap/josm/command/Command.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88 @@ -782,6 +783,6 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:59 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:55 -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:882 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:921 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83 @@ -797,7 +798,6 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190 #, java-format msgid "There were {0} conflicts during import." @@ -825,5 +825,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 msgid "Duplicate" msgstr "複製" @@ -847,30 +847,30 @@ msgstr "アプリケーションを終了します。" -#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236 +#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:235 msgid "All Formats" msgstr "全てのフォーマット" +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 msgid "Export to GPX..." msgstr "GPXにエクスポート..." -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286 msgid "Export the data to GPX file." msgstr "データをGPXファイルにエクスポートします。" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48 msgid "Nothing to export. Get some data first." msgstr "エクスポートするものがありません。最初にデータを取得してください。" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:297 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38 @@ -878,13 +878,13 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:31 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:881 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:922 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:924 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:69 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:297 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:66 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:310 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:73 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:75 @@ -903,8 +903,8 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77 @@ -912,7 +912,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:76 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235 @@ -935,9 +935,9 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:111 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75 @@ -949,5 +949,5 @@ msgstr "パラメータ ''{0}'' はヌルであってはなりません。" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57 #, java-format @@ -957,5 +957,5 @@ "''{0}''。" -#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74 msgid "Export GPX file" msgstr "GPX ファイルをエクスポート" @@ -1103,6 +1103,6 @@ #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:434 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:431 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:623 msgid "New" msgstr "新規" @@ -1234,5 +1234,5 @@ #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292 msgid "Paste" msgstr "貼り付け" @@ -1319,11 +1319,11 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29 -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 msgid "Save" msgstr "保存" #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256 msgid "Save the current data." msgstr "最新データを保存します。" @@ -1380,10 +1380,10 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:273 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 msgid "Save As..." msgstr "名前をつけて保存..." #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25 -#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272 +#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271 msgid "Save the current data to a new file." msgstr "現在のデータを新規ファイルに保存" @@ -1402,29 +1402,29 @@ "ジェクトも選択します。" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37 -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43 msgid "Show Status Report" msgstr "状況報告を見る" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41 msgid "Show status report with useful information that can be attached to bugs" msgstr "バグに添付できる有用な情報と一緒にステータスレポートを表示する" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42 #, java-format msgid "Help: {0}" msgstr "ヘルプ: {0}" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120 msgid "Status Report" msgstr "状況報告" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 msgid "Copy to clipboard and close" msgstr "クリップボードにコピーして閉じる" -#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1012 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:886 @@ -1589,5 +1589,5 @@ msgstr "ノードを引き離す" -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368 #, java-format msgid "Dupe into {0} nodes" @@ -1595,5 +1595,5 @@ #. only one changeCommand for a way, else garbage will happen -#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:393 +#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392 #, java-format msgid "Dupe {0} nodes into {1} nodes" @@ -1640,23 +1640,22 @@ #. #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:944 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:943 msgid "Download data" msgstr "データのダウンロード" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81 msgid "No current dataset found" msgstr "現在のデータセットが見つかりません" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:84 #, java-format msgid "Didn''t find an object with id {0} in the current dataset" msgstr "現在のデータセットには ID {0} のオブジェクトがありません" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92 msgid "Update selection" msgstr "選択を更新" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94 msgid "" "Updates the currently selected objects from the server (re-downloads data)" @@ -1664,32 +1663,30 @@ "サーバから（再ダウンロードデータ）現在選択されたオブジェクトを更新します" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95 +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:96 msgid "Update Selection" msgstr "選択を更新" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 msgid "There are no selected objects to update." -msgstr "更新用に選択されたプリミティブがありません。" - -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127 +msgstr "更新するオブジェクトが選択されていません" + +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:128 msgid "Selection empty" msgstr "選択は空です" -#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:147 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:154 msgid "Update objects" -msgstr "オブジェクトを削除" - +msgstr "オブジェクトを更新" + +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120 msgid "Upload data" msgstr "データをアップロード" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:118 msgid "Upload all changes in the active data layer to the OSM server" msgstr "OSMサーバへの有効なデータレイヤーの全ての変更をアップロード" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141 #, java-format msgid "" @@ -1700,5 +1697,5 @@ "さい。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126 @@ -1706,29 +1703,29 @@ msgstr "アップロードする変更はありません。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185 msgid "Nothing to upload. Get some data first." msgstr "アップロードするものがありません。最初にデータを取得してください。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230 #, java-format msgid "Synchronize node {0} only" msgstr "ノード {0} だけを同期" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231 #, java-format msgid "Synchronize way {0} only" msgstr "ウェイ {0} だけを同期" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232 #, java-format msgid "Synchronize relation {0} only" msgstr "リレーション {0} だけを同期" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290 msgid "Synchronize entire dataset" msgstr "データセット全体を同期" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254 #, java-format msgid "" @@ -1750,11 +1747,11 @@ "してください。
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Conflicts detected" msgstr "競合が検出されました" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302 #, java-format msgid "" @@ -1770,5 +1767,5 @@ "さい。
" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330 #, java-format msgid "" @@ -1781,22 +1778,22 @@ "に開いている変更セットをアップロードしてください。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338 msgid "Changeset closed" msgstr "変更セットは閉じられました" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:350 msgid "Prepare conflict resolution" msgstr "競合解決の準備" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352 #, java-format msgid "Click to download all parent ways for node {0}" msgstr "クリックしてノード {0}用の全ての親ウェイをダウンロード" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358 msgid "Click to cancel and to resume editing the map" msgstr "クリックしてキャンセル後に地図編集を再開" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362 #, java-format msgid "" @@ -1811,19 +1808,19 @@ "グで解決できる競合として作成します。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373 msgid "Node still in use" msgstr "ノードはまだ使用中です" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413 -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:428 #, java-format msgid "Warning: error header \"{0}\" did not match with an expected pattern" msgstr "警告: エラーヘッダ \"{0}\" は想定されたパターンに一致しません" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:523 msgid "Updating primitive" msgstr "プリミティブ更新中" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580 #, java-format msgid "Uploading data for layer ''{0}''" @@ -1832,5 +1829,5 @@ #. we tried to delete an already deleted primitive. #. -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:611 #, java-format msgid "" @@ -1841,5 +1838,5 @@ "トをスキップしてもう一度アップロードします。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612 #, java-format msgid "Object ''{0}'' is already deleted. Skipping object in upload." @@ -1848,10 +1845,10 @@ "キップします。" -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:629 #, java-format msgid "Uploading {0} objects ..." msgstr "{0} オブジェクトをアップロード中 ..." -#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656 +#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:649 #, java-format msgid "Ignoring caught exception because upload is canceled. Exception is: {0}" @@ -1963,17 +1960,17 @@ msgstr "ゆっくり再生" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49 msgid "Downloading GPS data" msgstr "GPSデータをダウンロード中" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76 msgid "Downloaded GPX Data" msgstr "ダウンロードされたGPXデータ" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:80 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81 msgid "Downloading data" msgstr "データをダウンロード中" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:92 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93 #, java-format msgid "" @@ -1981,5 +1978,5 @@ msgstr "ダウンロードがキャンセルされたので例外を無視します。例外の内容: {0}" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:139 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140 msgid "No data found in this area." msgstr "この範囲ではデータは見つかりません" @@ -2040,9 +2037,9 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252 -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91 msgid "Errors during Download" msgstr "ダウンロード中にエラーです。" -#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116 +#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114 msgid "Errors during download" msgstr "ダウンロード中にエラー" @@ -2060,5 +2057,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30 #, java-format @@ -2066,5 +2063,5 @@ msgstr "モード: {0}" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:272 msgid "" "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes " @@ -2160,7 +2157,6 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418 -#, fuzzy msgid "Move a segment along its normal, then release the mouse button." -msgstr "任意の大きさの四角形を描いて、マウスボタンを離してください。" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420 @@ -2169,9 +2165,8 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422 -#, fuzzy msgid "" "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along " "its normal." -msgstr "ドラッグして、ウェイのセグメントで長方形を作成します。" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2185,5 +2180,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:352 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -2202,17 +2197,17 @@ msgstr[0] "仮の新規ノードを {0}本のウェイに追加し、動かしてください。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470 msgid "Move elements" msgstr "要素を移動" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Move them" msgstr "これらを移動する。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471 msgid "Undo move" msgstr "移動を取り消す" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:474 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473 #, java-format msgid "" @@ -2225,13 +2220,13 @@ "本当に移動しますか？" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477 msgid "Always move and don't show dialog again" msgstr "常に移動し、ダイアログ表示は不要" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546 msgid "Release the mouse button to select the objects in the rectangle." msgstr "矩形範囲でオブジェクトを選択し、マウスボタンを離してください。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548 msgid "" "Release the mouse button to stop moving. Ctrl to merge with nearest node." @@ -2240,9 +2235,9 @@ "マージします。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550 msgid "Release the mouse button to stop rotating." msgstr "回転を止めるには、マウスボタンを放します。" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552 msgid "" "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-" @@ -2252,15 +2247,15 @@ "え);Shft-Ctrlで選択を回転。;選択を変更。" +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48 -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418 msgid "Zoom" msgstr "ズーム" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom and move map" msgstr "ズームと地図の移動" -#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73 msgid "" "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; " @@ -2270,10 +2265,10 @@ "移動; 右ドラッグによるズーム" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49 msgid "Search..." msgstr "検索..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search for objects." @@ -2282,60 +2277,59 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a filter string." msgstr "フィルター文字列を入力してください。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77 msgid "Please enter a search string." msgstr "検索文字列を入力してください" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 msgid "Enter the search expression" -msgstr "正規表現検索" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90 msgid "replace selection" msgstr "セレクションを置換" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91 msgid "add to selection" msgstr "セレクションに加える" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92 msgid "remove from selection" msgstr "セレクションの削除" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93 msgid "find in selection" msgstr "選択範囲の中から見つける" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "case sensitive" msgstr "大/小文字を区別する" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "regular expression" msgstr "正規表現検索" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +msgid "Baker Street - 'Baker' and 'Street' in any key or name." +msgstr "" +"ベイカー ストリート - 任意のキーや名前の 'ベイカー' と 'ストリート'。" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 -msgid "Baker Street - 'Baker' and 'Street' in any key or name." -msgstr "" -"ベイカー ストリート - 任意のキーや名前の 'ベイカー' と 'ストリート'。" +msgid "\"Baker Street\" - 'Baker Street' in any key or name." +msgstr "" +"\"ベイカー ストリート\" - 任意のキーや名前の 'ベイカー ストリート'。" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 -msgid "\"Baker Street\" - 'Baker Street' in any key or name." -msgstr "" -"\"ベイカー ストリート\" - 任意のキーや名前の 'ベイカー ストリート'。" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "name:Bak - 'Bak' その名前のどこか。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "type=route - key 'type' with value exactly 'route'." msgstr "type=route - 正確に 'route'の値を持つキー 'type'です。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2345,35 +2339,35 @@ "type=, *=*, *=もできます。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121 msgid "-name:Bak - not 'Bak' in the name." msgstr "-name:Bak - その名前の内 'Bak' でない。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122 msgid "foot: - key=foot set to any value." msgstr "foot: - key=任意の値を入力してください." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123 msgid "Special targets:" msgstr "特殊なターゲット:" +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124 +msgid "" +"type: - type of the object (node, way, relation)" +msgstr "" +"type: - オブジェクトの型 (node, way, relation)" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125 -msgid "" -"type: - type of the object (node, way, relation)" -msgstr "" -"type: - オブジェクトの型 (node, way, relation)" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 msgid "user:... - all objects changed by user" msgstr "user:... - 該当ユーザに変更された全オブジェクト" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - オブジェクトに与えられた ID (0 は新しいオブジェクト)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 msgid "nodes:... - object with given number of nodes" msgstr "nodes:... - 指定されたノード番号のオブジェクト" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2381,43 +2375,43 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 msgid "modified - all changed objects" msgstr "変更済み - 変更されたオブジェクトすべて" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 msgid "selected - all selected objects" msgstr "選択- 選択されたオブジェクトすべて" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "incomplete - all incomplete objects" msgstr "不完全 - すべての不完全なオブジェクト" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 msgid "untagged - all untagged objects" msgstr "タグなし - すべてのタグなしオブジェクト" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133 msgid "" "child expr - all children of objects matching the expression" msgstr "child 式 - 式にマッチしたオブジェクトの全ての子" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134 msgid "" "parent expr - all parents of objects matching the expression" msgstr "parent 式 - 式にマッチしたオブジェクトの全ての親" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135 msgid "Use | or OR to combine with logical or" msgstr "| や ORを、論理和をとるために使う" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "\" を演算子をくくるために使ってください。（例：キーが：を含む)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Use ( and ) to group expressions" msgstr "グループの分類のために ( と ) を使用する。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2427,51 +2421,51 @@ msgstr "フィルター" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:147 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140 msgid "Search" msgstr "検索" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Submit filter" msgstr "フィルターを登録" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 msgid "Start Search" msgstr "検索開始" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269 #, java-format msgid "No match found for ''{0}''" msgstr "\"{0}\"にマッチするものが見つからない" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:271 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "''{0}''を検索することにより、何も選択肢に加えられませんでした。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:273 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "''{0}''を検索することにより、何も選択肢から除かれませんでした。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:275 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "''{0}'' を探しましたがセレクションの中には見つかりませんでした" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 #, java-format msgid "Found {0} matches" msgstr "{0} の一致が見つかりました" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:313 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314 msgid "RX" msgstr "RX" @@ -2489,5 +2483,5 @@ "{2}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:176 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:194 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" @@ -2495,10 +2489,10 @@ "ださい: key=value" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:236 #, java-format msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!" msgstr "パターン文法エラー: {1} 内のパターン {0} は正しくありません！" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:358 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:382 #, java-format msgid "Unknown primitive type: {0}. Allowed values are node, way or relation" @@ -2507,26 +2501,26 @@ "\"relation\"です。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:571 #, java-format msgid "Unexpected token: {0}" msgstr "予想外のトークン: {0}" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:591 msgid "Missing arguments for or." msgstr "orに引数がありません。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:601 msgid "Missing argument for not." msgstr "not に引数がありません。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:611 msgid "Expected closing parenthesis." msgstr "閉じ括弧があるはずです。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:673 msgid "Wrong number of parameters for tags operator." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:675 #, java-format msgid "" @@ -2535,9 +2529,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:685 msgid "Wrong number of parameters for nodes operator." msgstr "間違った数のパラメータが、ノード演算子に渡されました。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:687 #, java-format msgid "" @@ -2548,5 +2542,5 @@ "い、例えば ノード: 10-20" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:694 #, java-format msgid "Incorrect value of id operator: {0}. Number is expected." @@ -2653,7 +2647,7 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201 @@ -2764,5 +2758,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 msgid "Double conflict" msgstr "二重の競合" @@ -2791,5 +2785,5 @@ "です。" -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in coordinates in {0}" @@ -2797,6 +2791,6 @@ #. should not happen -#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 +#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 msgid "Cannot resolve undecided conflict." msgstr "未決の競合を解決できません" @@ -2811,8 +2805,12 @@ msgid "At least one object to delete required, got empty collection" msgstr "" +"削除するオブジェクトが少なくともひとつは必要です、空のコレクションを受け取り" +"ました" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106 msgid "At least one object to delete requird, got empty collection" msgstr "" +"削除するオブジェクトが少なくともひとつは必要です、空のコレクションを受け取り" +"ました" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178 @@ -2862,18 +2860,8 @@ msgstr "削除確認" -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46 #, java-format msgid "Resolve conflicts in deleted state in {0}" msgstr "{0} 内の削除済み状態の競合を解決" - -#. in case #3892 happens again -#. -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:97 -msgid "null detected in node list" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:98 -msgid "unexpected null value for n.getEastNorth(). id of n is" -msgstr "" #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121 @@ -2907,10 +2895,10 @@ msgstr "リレーション {0} からリファレンスを削除する" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57 #, java-format msgid "Resolve conflicts in member list of relation {0}" msgstr "リレーション {0} のメンバーリスト内の競合を解決" -#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90 +#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89 msgid "" "Can't undo command ''{0}'' because layer ''{1}'' is not present any more" @@ -2943,20 +2931,20 @@ msgstr "シーケンス" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:66 #, java-format msgid "Resolve {0} tag conflicts in node {1}" msgstr "ノード {1} の {0} タグ競合を解決" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67 #, java-format msgid "Resolve {0} tag conflicts in way {1}" msgstr "ウェイ {1} の {0} タグ競合を解決" -#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71 +#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68 #, java-format msgid "Resolve {0} tag conflicts in relation {1}" msgstr "リレーション {1} の {0} タグ競合を解決" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:62 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61 #, java-format msgid "Undelete {0} primitives" @@ -2978,10 +2966,10 @@ msgstr "リレーション {0} のバージョン競合を解決" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "ウェイ {0} のノードリスト中の競合を解決" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 #, java-format msgid "Main dataset does not include node {0}" @@ -3025,5 +3013,5 @@ #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 msgid "New value" msgstr "新しい値" @@ -3070,7 +3058,7 @@ #: ../core/src/org/openstreetmap/josm/data/Bounds.java:101 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:103 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0.0 exptected, got {1}" -msgstr "パラメータ {0} > 0 が必須です。 {1} を受け取りました。" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:289 @@ -3079,10 +3067,10 @@ msgstr "警告: プレセットの設定を ''{0}''とするのに失敗しました。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393 #, java-format msgid "Malformed config file at lines {0}" msgstr "不正な設定がファイルの{0}行目にあります。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402 #, java-format msgid "" @@ -3093,5 +3081,5 @@ "ありません。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405 #, java-format msgid "" @@ -3102,5 +3090,5 @@ "ではありません。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413 #, java-format msgid "" @@ -3110,5 +3098,5 @@ "警告: 設定を初期化するのに失敗しました。作成に失敗した設定ディレクトリ: {0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416 #, java-format msgid "" @@ -3119,5 +3107,5 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427 #, java-format msgid "" @@ -3127,5 +3115,5 @@ "す。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431 #, java-format msgid "" @@ -3135,5 +3123,5 @@ "警告: 既存の設定ファイル ''{0}'' をデフォルトの設定ファイルで置き換えます。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439 #, java-format msgid "" @@ -3144,5 +3132,5 @@ "トできません" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 #, java-format msgid "" @@ -3153,5 +3141,5 @@ "
に取って、新しい初期設定ファイルを作ります。" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462 #, java-format msgid "" @@ -3162,10 +3150,10 @@ "に失敗" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 +#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498 #, java-format msgid "" @@ -3222,9 +3210,9 @@ msgid "" "Warning: unexpected JOSM version number in revison file, value is ''{0}''" -msgstr "" +msgstr "警告: リビジョンファイルに予期せぬJOSMバージョン番号、値は ''{0}''" #: ../core/src/org/openstreetmap/josm/data/Version.java:140 msgid "Warning: the revision file ''/REVISION'' is missing." -msgstr "" +msgstr "警告: リビジョンファイル ''/REVISION'' がありません。" #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77 @@ -3248,25 +3236,25 @@ #. short symbol for South -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74 msgid "S" msgstr "南" #. short symbol for North -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75 msgid "N" msgstr "北" #. short symbol for West -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:88 msgid "W" msgstr "西" #. short symbol for East -#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90 +#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89 msgid "E" msgstr "東" -#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:209 +#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62 #, java-format @@ -3274,11 +3262,11 @@ msgstr "変更セット {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184 #, java-format msgid "" "Unable to add primitive {0} to the dataset because it's already included" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:634 +msgstr "プリミティブ {0} をデータセットに追加できません、既に含まれています" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:629 #, java-format msgid "" @@ -3288,26 +3276,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:191 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:175 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:174 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:203 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:202 +#, java-format msgid "Missing merge target for node with id {0}" -msgstr "not に引数がありません。" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 -#, fuzzy, java-format +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#, java-format msgid "Missing merge target for relation with id {0}" -msgstr "リレーション {0} の履歴" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:224 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:222 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3316,6 +3304,6 @@ #. should not happen #. -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:256 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:254 +#, java-format msgid "" "Target object with id {0} and version {1} is visible although source object " @@ -3323,7 +3311,4 @@ "Keeping target object. " msgstr "" -"ID {0} バージョン {1} の自分のプリミティブは表示されますが、低いバージョン " -"{2} の相手のプリミティブは表示されません。この不整合を解決できません。自分の" -"プリミティブを残します。 " #. translators notes must be in front @@ -3380,24 +3365,24 @@ msgstr "F" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:205 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:235 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "ID >= 0 である必要があります。 {0} を受け取りました" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:337 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:367 msgid "A primitive with ID = 0 can't be invisible." msgstr "id=0 のプリミティブは非表示にできません" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:394 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:424 #, java-format msgid "ID > 0 expected. Got {0}." msgstr "ID > 0 である必要があります。 {0} を受け取りました" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:396 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:426 #, java-format msgid "Version > 0 expected. Got {0}." msgstr "バージョン > 0 である必要があります。 {0} を受け取りました" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:884 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:923 msgid "" "Can''t merge because either of the participating primitives is new and the " @@ -3405,5 +3390,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:886 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:925 #, java-format msgid "" @@ -3436,10 +3421,10 @@ "す。" -#: ../core/src/org/openstreetmap/josm/data/osm/User.java:58 +#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59 msgid "User with the same uid but different name found" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305 +msgstr "同じuidで異なる名前のユーザが見つかりました" + +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:282 +#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:304 #, java-format msgid "Cannot add node {0} to incomplete way {1}." @@ -3450,7 +3435,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected, got {1}" -msgstr "パラメータ {0} > 0 が必須です。 {1} を受け取りました。" +msgstr "パラメータ ''{0}'' > 0 が期待されています。入力値 {1}" #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:218 @@ -3470,7 +3455,7 @@ #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:114 -#, fuzzy, java-format +#, java-format msgid "Can''t compare primitive with ID ''{0}'' to primitive with ID ''{1}''." -msgstr "id ''{0}'' のプリミティブと id ''{1}'' のプリミティブを比較できません" +msgstr "ID ''{0}'' のプリミティブとID ''{1}'' のプリミティブを比較できません。" #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89 @@ -3605,10 +3590,10 @@ msgstr "エリアテキスト" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Error: {0}" msgstr "Error: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1641 +#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1640 #, java-format msgid "Warning: {0}" @@ -3620,6 +3605,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49 msgid "node" @@ -3628,5 +3613,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61 msgid "way" @@ -3635,6 +3620,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71 msgid "relation" @@ -3651,6 +3636,6 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176 msgid "background" msgstr "背景" @@ -3668,24 +3653,36 @@ msgstr "ガウス-ラボルド会議1947" -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110 -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:117 -msgid "" -"IMPORTANT : data positioned far away from\n" -"the current Lambert zone limits.\n" -"Do not upload any data after this message.\n" -"Undo your last action, save your work\n" -"and start a new layer on the new zone." -msgstr "" -"重要：データは、現在のランベルト図法のゾーン制限\n" -"の外にあります。\n" -"このメッセージ以降、データのアップロードを中止します。\n" -"最後に行った操作を取り消して、作業内容を保存し、\n" -"新しいレイヤーを新しいゾーンで開始してください。" - -#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:133 msgid "Lambert 4 Zones (France)" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:240 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:241 +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:242 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:172 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:173 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:174 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:175 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:176 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180 +#, java-format +msgid "{0} ({1} to {2} degrees)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:243 +#, java-format +msgid "{0} (Corsica)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251 +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:188 +#, fuzzy +msgid "Lambert CC Zone" +msgstr "ランベルトゾーン" + +#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133 msgid "Lambert CC9 Zone (France)" msgstr "" @@ -3699,27 +3696,56 @@ msgstr "メルカトル" -#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90 +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:62 +msgid "PUWG (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:95 +#, fuzzy +msgid "PUWG Zone" +msgstr "Zone" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:155 +msgid "PUWG 1992 (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:208 +#, java-format +msgid "PUWG 2000 Zone {0} (Poland)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88 msgid "Swiss Grid (Switzerland)" msgstr "スイスグリッド (スイス)" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:351 msgid "UTM" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391 +#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:387 msgid "UTM Zone" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35 -msgid "UTM20N Guadeloupe Fort-Marigot 1949" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25 +#, fuzzy +msgid "Guadeloupe Fort-Marigot 1949" msgstr "UTM20N (仏領)グアドループ海外県 マリゴ市 1949" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Ste_Anne.java:35 -msgid "UTM20N Guadeloupe Ste-Anne 1948" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26 +#, fuzzy +msgid "Guadeloupe Ste-Anne 1948" msgstr "UTM20N (仏領)グアドループ海外県 Sainte-Anne 市 1948" -#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Martinique_Fort_Desaix.java:35 -msgid "UTM20N Martinique Fort Desaix 1952" +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27 +#, fuzzy +msgid "Martinique Fort Desaix 1952" msgstr "UTM20N (仏領)マルティニーク海外県 Fort Desaix 市 1952" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:381 +msgid "UTM 20N (France)" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:393 +msgid "UTM20 North Geodesic system" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -3734,10 +3760,10 @@ msgstr "ブックマークを書き込めません。
{0}" -#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174 -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:40 +#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:173 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39 msgid "Do not show again" msgstr "今後は表示しない" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:78 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81 #, java-format @@ -3745,32 +3771,32 @@ msgstr " [id: {0}]" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:92 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:117 -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153 msgid "incomplete" msgstr "不完全" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127 msgid "highway" msgstr "道路" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128 #: build/trans_presets.java:3186 msgid "railway" msgstr "鉄道" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129 msgid "waterway" msgstr "水路" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:132 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130 msgid "landuse" msgstr "土地利用" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507 #, java-format msgid "{0} node" @@ -3778,5 +3804,5 @@ msgstr[0] "{0}ノード" -#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:192 +#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:186 #, java-format msgid "{0} member" @@ -3813,6 +3839,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 msgid "Conflict" msgstr "競合" @@ -3822,11 +3848,11 @@ msgstr "不明なホスト" -#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 +#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:344 msgid "Object deleted" msgstr "オブジェクトは削除されました" -#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440 +#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -3843,5 +3869,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82 msgid "Click to close the dialog" -msgstr "" +msgstr "クリックしてダイアログを閉じる" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38 @@ -4033,11 +4059,11 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:467 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:657 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37 @@ -4152,5 +4178,5 @@ msgstr "描きたい新規ウェイセグメントの長さ" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:198 msgid "" "Middle click again to cycle through.
Hold CTRL to select directly from " @@ -4160,18 +4186,18 @@ "ウスでこの表から直接選べます。" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:291 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 msgid "(no object)" msgstr "(オブジェクトなし)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:426 msgid "User:" msgstr "ユーザ:" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:313 -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:330 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328 msgid "Layer not in list." msgstr "レイヤーがリストにありません。" -#: ../core/src/org/openstreetmap/josm/gui/MapView.java:530 +#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528 #, java-format msgid "Layer ''{0}'' must be in list of layers" @@ -4180,5 +4206,5 @@ #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50 msgid "Click to cancel the current operation" -msgstr "" +msgstr "クリックして現在の操作をキャンセル" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86 @@ -4297,50 +4323,50 @@ msgstr "ロール {0} は比較ペア {1} に参加していません" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Properties" msgstr "プロパティ" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:133 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:226 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227 msgid "Tags" msgstr "タグ" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:140 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 msgid "Nodes" msgstr "ノード" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265 -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:143 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:262 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "メンバー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164 msgid "No pending tag conflicts to be resolved" msgstr "解決が必要な保留中のタグ競合はありません" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167 #, java-format msgid "Tags({0} conflicts)" msgstr "タグ({0} 競合)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168 #, java-format msgid "{0} pending tag conflicts to be resolved" msgstr "解決待ちの保留中タグ競合 {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 msgid "Nodes(resolved)" msgstr "ノード(解決済み)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4349,17 +4375,17 @@ "合はありません。" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179 msgid "Nodes(with conflicts)" msgstr "ノード(競合あり)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180 msgid "Pending conflicts in the node list of this way" msgstr "このウェイのノードリスト内の保留中競合" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 msgid "Members(resolved)" msgstr "メンバー(解決済み)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4369,68 +4395,68 @@ "保留中の競合はありません。" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 msgid "Members(with conflicts)" msgstr "メンバー(競合あり)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Pending conflicts in the member list of this relation" msgstr "このリレーションのメンバーリスト内の保留中競合" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "No pending property conflicts" msgstr "保留中のプロパティ競合はありません" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Properties(with conflicts)" msgstr "プロパティ(競合あり)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending property conflicts to be resolved" msgstr "解決が必要な保留中競合プロパティ" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:279 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:278 msgid "Conflict Resolution" msgstr "競合の解決" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:373 #, java-format msgid "Parameter current out of range. Got {0}." msgstr "現在のパラメータは範囲外です: {0} を受け取りました" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:591 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:615 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:585 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:609 #, java-format msgid "List in role {0} is currently not participating in a compare pair." msgstr "ロール {0} のリストは現在比較ペアに参加していません" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:758 #, java-format msgid "Unexpected value of parameter ''index''. Got {0}." msgstr "パラメータ \"index\" に予期せぬ値。入力値: {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:772 #, java-format msgid "Item {0} not found in list." msgstr "アイテム {0} はリストに見つかりません" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:220 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218 msgid "lock scrolling" msgstr "スクロールをロック" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:228 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226 msgid "Compare " msgstr "比較 " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78 msgid "My version" msgstr "自分のバージョン" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262 msgid "List of elements in my dataset, i.e. the local dataset" msgstr "自分のデータセットの要素リスト、例：ローカルデータセット" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137 @@ -4438,5 +4464,5 @@ msgstr "結合したバージョン" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268 msgid "" "List of merged elements. They will replace the my elements when the merge " @@ -4446,30 +4472,30 @@ "るでしょう。" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90 msgid "Their version" msgstr "相手のバージョン" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:276 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274 msgid "List of elements in their dataset, i.e. the server dataset" msgstr "相手のデータセットの要素リスト、例：サーバデータセット" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:409 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406 msgid "> top" msgstr "> 先頭" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:411 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408 msgid "Copy my selected nodes to the start of the merged node list" msgstr "選択したノードを結合されたノードリストの先頭にコピー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:436 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433 msgid "> bottom" msgstr "> 最後" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:438 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435 msgid "Copy my selected elements to the end of the list of merged elements." msgstr "選択した要素を結合された要素リストの最後にコピー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462 msgid "" "Copy my selected elements before the first selected element in the list of " @@ -4478,5 +4504,5 @@ "選択した要素を、結合された要素リストから選択している最初の要素の前にコピー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:499 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496 msgid "" "Copy my selected elements after the first selected element in the list of " @@ -4485,14 +4511,14 @@ "選択した要素を、結合された要素リストから選択している最初の要素の後にコピー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:529 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525 msgid "" "Copy their selected element to the start of the list of merged elements." msgstr "相手の選択した要素を、結合された要素リストの先頭にコピー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:552 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547 msgid "Copy their selected elements to the end of the list of merged elements." msgstr "相手の選択した要素を、結合された要素リストの最後にコピー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569 msgid "" "Copy their selected elements before the first selected element in the list " @@ -4501,5 +4527,5 @@ "相手の選択した要素を、結合された要素リストの最初に選択された要素の前にコピー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598 msgid "" "Copy their selected element after the first selected element in the list of " @@ -4508,54 +4534,54 @@ "相手の選択した要素を、結合された要素リストの最初に選択された要素の後にコピー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 msgid "Up" msgstr "上" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627 msgid "Move up the selected elements by one position." msgstr "同じ位置で選択した要素を上に移動" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114 msgid "Down" msgstr "下" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659 msgid "Move down the selected entries by one position." msgstr "同じ位置で選択したエントリを下に移動" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:446 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:636 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64 msgid "Remove" msgstr "削除" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691 msgid "Remove the selected entries from the list of merged elements." msgstr "結合された要素のリストから選択したエントリを削除" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:727 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:764 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757 msgid "Freeze" msgstr "固定" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:765 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758 msgid "Freeze the current list of merged elements." msgstr "結合された要素の現在のリストを固定" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753 msgid "Unfreeze" msgstr "固定解除" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:761 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754 msgid "Unfreeze the list of merged elements and start merging." msgstr "結合された要素のリスト固定を解除して結合をはじめる" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:788 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781 #, java-format msgid "" @@ -4566,5 +4592,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:793 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786 #, java-format msgid "" @@ -4575,5 +4601,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:812 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804 #, java-format msgid "My version ({0} entry)" @@ -4581,5 +4607,5 @@ msgstr[0] "自分のバージョン ({0} エントリ)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:815 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807 #, java-format msgid "Merged version ({0} entry)" @@ -4587,5 +4613,5 @@ msgstr[0] "結合したバージョン ({0} エントリ)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:818 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810 #, java-format msgid "Their version ({0} entry)" @@ -4593,6 +4619,6 @@ msgstr[0] "相手のバージョン ({0} エントリ)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:884 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79 #, java-format msgid "" @@ -4602,6 +4628,6 @@ "調整可能な {0} がまだ登録されていません。同期された調整に参加設定できません。" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899 -#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:96 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890 +#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94 #, java-format msgid "Adjustable {0} not registered yet." @@ -4612,5 +4638,5 @@ msgstr "ノード" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:70 msgid "Merged nodes not frozen yet. Can't build resolution command." msgstr "結合したノードがまだ固定されていません。解決コマンドをビルドできません" @@ -4622,5 +4648,5 @@ msgstr "予期せぬカラムインデックス。入力値: {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419 #, java-format msgid "" @@ -4629,19 +4655,19 @@ msgstr "サーバとの通信中にエラー発生
詳細: {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:423 msgid "Communication with server failed" msgstr "サーバとの通信失敗" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:465 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:494 msgid "Yes, undelete them too" msgstr "はい、これも削除を取り消します" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:466 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:495 msgid "No, cancel operation" msgstr "いいえ、操作をキャンセルします" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470 #, java-format msgid "" @@ -4652,9 +4678,9 @@ "す。

これらのノードも復活させたいですか?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:475 msgid "Undelete additional nodes?" msgstr "追加のノードの削除を取り消しますか？" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:501 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:499 #, java-format msgid "" @@ -4666,5 +4692,5 @@ "ミティブがあります。

これらも復活させたいですか?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504 msgid "Undelete dependent primitives?" msgstr "依存するプリミティブの削除を取り消しますか？" @@ -4690,84 +4716,84 @@ msgstr "座標:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182 msgid "Deleted State:" msgstr "削除済み状態:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:258 msgid "Visible State:" msgstr "表示状態:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:338 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:350 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:359 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:368 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28 msgid "(none)" msgstr "(なし)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "削除しました" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 msgid "not deleted" msgstr "削除されていません" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361 msgid "visible (on the server)" msgstr "表示(サーバ上)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363 msgid "not visible (on the server)" msgstr "非表示(サーバ上)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370 msgid "Keep a clone of the local version" msgstr "ローカルバージョンのクローンを残す" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372 msgid "Physically delete from local dataset" msgstr "ローカルデータセットから物理的に削除" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:471 msgid "Keep my coordiates" msgstr "自分の座標を残す" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:486 msgid "Keep their coordiates" msgstr "相手の座標を残す" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:501 msgid "Undecide conflict between different coordinates" msgstr "異なる座標間の競合を未決にする" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:516 msgid "Keep my deleted state" msgstr "自分の削除済み状態を残す" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:531 msgid "Keep their deleted state" msgstr "相手の削除済み状態を残す" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:546 msgid "Undecide conflict between deleted state" msgstr "削除済み状態間の競合を未決にする" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:561 msgid "Keep my visible state" msgstr "自分の表示状態を残す" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:576 msgid "Yes, reset the id" msgstr "はい、id をリセットします" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:207 msgid "No, abort" msgstr "いいえ、異常終了します" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:581 #, java-format msgid "" @@ -4780,17 +4806,17 @@ "いidを割り当てます。
よろしいですか？" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 msgid "Reset id to 0" msgstr "id を0 にリセット" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:602 msgid "Keep their visible state" msgstr "相手の表示状態を残す" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:617 msgid "Yes, purge it" msgstr "はい、破棄します" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:622 #, java-format msgid "" @@ -4801,9 +4827,9 @@ "しなければなりません。
よろしいですか？" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627 msgid "Remove from dataset" msgstr "データセットから削除" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:641 msgid "Undecide conflict between visible state" msgstr "表示状態間の競合を未決にする" @@ -4818,19 +4844,19 @@ msgstr "結合したノードはまだ固定されていません。解決コマンドをビルドできません" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:40 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:54 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:57 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59 msgid "" msgstr "<未定義>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:41 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:58 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56 #, java-format msgid "The merged dataset will not include a tag with key {0}" @@ -4846,10 +4872,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64 #: ../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 @@ -4859,10 +4885,10 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:264 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78 @@ -4890,27 +4916,27 @@ msgstr "相手のバージョン (サーバデータセット)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:284 msgid ">" msgstr ">" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:257 msgid "Keep the selected key/value pairs from the local dataset" msgstr "ローカルデータセットから選択されたキー/値のペアを残す" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:288 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286 msgid "Keep the selected key/value pairs from the server dataset" msgstr "サーバデータセットから選択されたキー/値のペアを残す" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:378 msgid "Undecide" msgstr "未決" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:380 msgid "Mark the selected tags as undecided" msgstr "選択されたタグを未決にマーク" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:61 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60 #, java-format msgid "Their dataset does not include a tag with key {0}" @@ -4935,22 +4961,22 @@ msgstr "解決が必要な競合はありません" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:348 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "競合解決をキャンセル" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:363 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "解決済み競合を適用" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1096 msgid "Apply" msgstr "適用" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21 @@ -4958,5 +4984,5 @@ msgstr "なし" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174 #: build/trans_presets.java:2301 msgid "all" @@ -5048,6 +5074,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 #, java-format msgid "{0} way" @@ -5057,5 +5083,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517 #, java-format msgid "{0} relation" @@ -5068,21 +5094,21 @@ msgstr "pos {0} は、範囲外です。現在のメンバーの数: {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31 msgid "Remove this relation member from the relation" msgstr "このリレーションメンバーをこのリレーションから除きます。" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34 +msgid "Keep" +msgstr "保持" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35 -msgid "Keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36 msgid "Keep this relation member for the target object" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 +msgstr "ターゲットのオブジェクト用にこのリレーションメンバーを保持" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38 msgid "Undecided" msgstr "未決定" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39 msgid "Not decided yet" msgstr "未決定です" @@ -5090,5 +5116,5 @@ #. --- role editing #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510 msgid "Role:" msgstr "ロール:" @@ -5116,4 +5142,5 @@ msgid "Enter a tag key, i.e. fixme" msgstr "" +"タグキーを入力してください、例）fixme" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109 @@ -5125,4 +5152,6 @@ "Enter a tag value, i.e. check members" msgstr "" +"タグの値を入力してください、例）check members" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123 @@ -5175,10 +5204,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67 @@ -5198,17 +5227,17 @@ msgstr "指示の集積: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119 msgid "Resolve conflicts." msgstr "競合を解決" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329 msgid "Resolve" msgstr "解決" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:333 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330 msgid "Open a merge dialog of all selected items in the list above." msgstr "上記リストの全てのアイテムを結合するダイアログを開く" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:353 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106 @@ -5217,25 +5246,25 @@ msgstr "マップ上の選択した要素を、上記リストの選択したアイテムに設定します。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168 msgid "Cancel conflict resolution and close the dialog" msgstr "競合の解決をキャンセルしてダイアログを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201 msgid "Apply resolved conflicts and close the dialog" msgstr "解決済みの競合を適用してダイアログを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:205 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202 msgid "Apply Resolution" msgstr "解決を適用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214 msgid "Close anyway" msgstr "強制的に閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:218 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215 msgid "Continue resolving" msgstr "解決を続ける" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:220 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217 #, java-format msgid "" @@ -5247,13 +5276,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:228 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Conflict not resolved completely" msgstr "競合は完全には解決されていません" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262 msgid "Resolve conflicts" msgstr "競合を解決" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:267 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264 #, java-format msgid "Resolve conflicts for ''{0}''" @@ -5265,8 +5294,8 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121 -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107 @@ -5333,5 +5362,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:142 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:512 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95 msgid "Reload" @@ -5365,34 +5394,34 @@ msgstr "全ての読み込んだレイヤーのリストを開きます" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293 msgid "Delete the selected layer." msgstr "選択したレイヤーの削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363 msgid "Show/Hide" msgstr "表示/非表示" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374 msgid "Toggle visible state of the selected layer." msgstr "選択したレイヤーの表示状態を切り替え" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489 msgid "Activate" msgstr "有効化" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416 msgid "Activate the selected layer" msgstr "選択されたレイヤーを有効化" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471 msgid "Merge this layer into another layer" msgstr "このレイヤーを他のレイヤーに結合" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577 msgid "Move the selected layer one row up." msgstr "選択したレイヤーを一つ上に上げます。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596 msgid "Move the selected layer one row down." msgstr "選択したレイヤーを一つ下に移動します。" @@ -5402,17 +5431,17 @@ msgstr "レイヤーについての情報" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 -#, fuzzy, java-format +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152 +#, java-format msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "これは、最大{0}このオブジェクトが変更されます。" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 -#, fuzzy +msgstr[0] "" +msgstr[1] "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154 msgid "An empty value deletes the tag." -msgstr "空の値でキーを削除。" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249 +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522 @@ -5421,10 +5450,10 @@ msgstr "<差異あり>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352 msgid "Change values?" msgstr "値を変更しますか?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269 #, java-format msgid "Change properties of up to {0} object" @@ -5432,5 +5461,5 @@ msgstr[0] "{0}このオブジェクトのプロパティーの変更" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328 #, java-format msgid "This will change up to {0} object." @@ -5438,9 +5467,9 @@ msgstr[0] "これは、最大{0}このオブジェクトが変更されます。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330 msgid "Please select a key" msgstr "キーを選択してください" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340 msgid "Please select a value" msgstr "値を選択してください" @@ -5464,104 +5493,100 @@ msgstr "メンバー" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569 msgid "Add Properties" msgstr "プロパティの追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791 +#, java-format +msgid "Properties: {0} / Memberships: {1}" +msgstr "プロパティ: {0} / メンバー: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794 +msgid "Properties / Memberships" +msgstr "プロパティ/メンバー" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836 +msgid "Change relation" +msgstr "関連の変更" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837 +msgid "Delete from relation" +msgstr "関連から削除" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#, java-format +msgid "Really delete selection from relation {0}?" +msgstr "本当に関連{0}から選択分を削除しますか？" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857 +msgid "Delete the selected key in all objects" +msgstr "すべてのオブジェクトの選択したキーの削除" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +msgid "Delete Properties" +msgstr "プロパティの削除" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890 msgid "Add a new key/value pair to all objects" msgstr "すべてのオブジェクトに新しいキー/値をペアで追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589 -msgid "Edit Properties" -msgstr "プロパティの編集" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902 msgid "Edit the value of the selected key for all objects" msgstr "すべてのオブジェクトの選択したキーの値の編集" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803 -#, java-format -msgid "Properties: {0} / Memberships: {1}" -msgstr "プロパティ: {0} / メンバー: {1}" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806 -msgid "Properties / Memberships" -msgstr "プロパティ/メンバー" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846 -msgid "Change relation" -msgstr "関連の変更" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847 -msgid "Delete from relation" -msgstr "関連から削除" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849 -#, java-format -msgid "Really delete selection from relation {0}?" -msgstr "本当に関連{0}から選択分を削除しますか？" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867 -msgid "Delete the selected key in all objects" -msgstr "すべてのオブジェクトの選択したキーの削除" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869 -msgid "Delete Properties" -msgstr "プロパティの削除" - #. item "Land use/Quarry" text "Name" #. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:84 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:177 #: build/trans_presets.java:3151 msgid "Relations" msgstr "リレーション" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82 msgid "Open a list of all relations." msgstr "全てのリレーションのリストを開く" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:175 #, java-format msgid "Relations: {0}" msgstr "リレーション: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:269 msgid "Open an editor for the selected relation" msgstr "選択したリレーションの編集画面を開く" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:310 msgid "Delete the selected relation" msgstr "選択したリレーションを削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:348 msgid "Create a new relation" msgstr "新規リレーション作成" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:385 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289 msgid "Create a copy of this relation and open it in another editor window" msgstr "このリレーションのコピーを作成し、他の編集ウィンドウで開く" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:502 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:423 msgid "Set the current selection to the list of selected relations" msgstr "現在の選択を選択したリレーションのリストへセットする" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:450 msgid "Select the members of all selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:531 +msgstr "全ての選択済リレーションのメンバーを選択" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:452 msgid "Select members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:558 +msgstr "メンバーを選択" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:482 msgid "Download all members of the selected relations" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:559 +msgstr "選択済リレーションの全メンバーをダウンロード" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483 msgid "Download members" -msgstr "" +msgstr "メンバーをダウンロード" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5588,5 +5613,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5598,9 +5623,9 @@ msgstr "選択: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:334 msgid "Undock the panel" msgstr "パネルの取り外し" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:348 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." @@ -5609,5 +5634,5 @@ "ます。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359 msgid "Click to minimize/maximize the panel content" msgstr "クリックすることでパネルの内容を最小化/最大化" @@ -5690,12 +5715,12 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:447 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1383 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1390 msgid "Download relation members" msgstr "リレーションメンバーをダウンロード" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483 msgid "Conflicts in data" msgstr "データ内の競合" @@ -5714,5 +5739,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:518 #, java-format msgid "Downloading relation {0}" @@ -5720,5 +5745,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:528 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1476 #, java-format @@ -5726,18 +5751,18 @@ msgstr "警告: タククがキャンセルされたために例外を無視します。例外: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158 msgid "Tags and Members" msgstr "タグとメンバ－" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168 msgid "Parent Relations" msgstr "親リレーション" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161 msgid "Child Relations" msgstr "子リレーション" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "" "There is at least one member in this relation referring
to the " @@ -5749,14 +5774,14 @@ "参照をどうしますか？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591 msgid "Remove them, clean up relation" msgstr "削除し、リレーションをクリーンナップ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590 msgid "Ignore them, leave relation as is" msgstr "無視し、リレーションはそのまま" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613 #, java-format msgid "" @@ -5769,9 +5794,9 @@ "か？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623 msgid "Multiple members referring to same primitive" msgstr "複数のメンバーが同じプリミティブを参照しています" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641 #, java-format msgid "" @@ -5783,5 +5808,5 @@ "起こすので薦められません。
リレーション ''{0}'' をスキップします。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -5789,5 +5814,5 @@ "現在のデータセット内で選択された全プリミティブを最初のメンバーの前に追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -5795,5 +5820,5 @@ "現在のデータセット内で選択された全プリミティブを最後のメンバーの後に追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -5803,5 +5828,5 @@ "に追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:769 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -5811,20 +5836,20 @@ "に追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:801 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:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:804 msgid "Relation Editor: Remove Selected" msgstr "リレーション編集画面: 削除が選択されました" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "現在の選択の中でプリミティブを参照しているリレーションメンバーを選択" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:848 #, java-format msgid "" @@ -5834,66 +5859,66 @@ "現在の選択の中で {0} プリミティブを参照しているリレーションメンバーを選択" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872 msgid "Select primitives for selected relation members" msgstr "選択されたリレーションメンバーのプリミティブを選択" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:892 msgid "Sort the relation members" msgstr "リレーションメンバーをソート" #. putValue(NAME, tr("Sort")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895 msgid "Relation Editor: Sort" msgstr "リレーション編集画面: ソート" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Move the currently selected members up" msgstr "現在選択したメンバーを一つ上に移動します" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Move Up" msgstr "リレーション編集画面: 上へ移動" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926 msgid "Move the currently selected members down" msgstr "選択したメンバーを一つ下に移動します" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929 msgid "Relation Editor: Move Down" msgstr "リレーション編集画面: 下へ移動" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945 msgid "Remove the currently selected members from this relation" msgstr "このリレーションから現在選択されたメンバーを削除" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948 msgid "Relation Editor: Remove" msgstr "リレーション編集画面: 削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964 msgid "Delete the currently edited relation" msgstr "現在編集されたリレーションを削除" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048 msgid "Yes, create a conflict and close" msgstr "はい、競合を作成して閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050 msgid "Click to create a conflict and close this relation editor" msgstr "クリックして競合を作成し、このリレーションエディタを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054 msgid "No, continue editing" msgstr "いいえ、編集を続ける" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056 msgid "" "Click to to return to the relation editor and to resume relation editing" msgstr "クリックしてリレーションエディタに戻り、リレーション編集を再開" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1063 msgid "" "This relation has been changed outside of the editor.
You can't " @@ -5904,9 +5929,9 @@ "集を続けることはできません

競合を作成してエディタを閉じますか？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067 msgid "Conflict in data" msgstr "データ中に競合" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080 #, java-format msgid "" @@ -5917,41 +5942,41 @@ "最初にこの競合を解決してからやり直してください。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094 msgid "Apply the current updates" msgstr "現在の更新を適用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127 msgid "Apply the updates and close the dialog" msgstr "更新を適用してダイアログを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161 msgid "Cancel the updates and close the dialog" msgstr "更新をキャンセルしてダイアログを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1178 msgid "Add an empty tag" msgstr "空のタグを追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 msgid "Download all incomplete ways and nodes in relation" msgstr "リレーション中の全ての不完全なウェイとノードをダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1193 msgid "Download Members" msgstr "メンバーのダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194 msgid "Relation Editor: Download Members" msgstr "リレーション編集画面: メンバーをダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217 msgid "Sets a role for the selected members" msgstr "選択されたメンバーにロールをセット" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1220 msgid "Apply Role" msgstr "ロールを適用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1233 #, java-format msgid "" @@ -5963,19 +5988,26 @@ "ルを削除することになります。
新しいロールを本当に適用しますか？" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1237 msgid "Yes, apply it" msgstr "はい、適用します" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1238 msgid "No, don't apply" msgstr "いいえ、適用しません" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244 msgid "Confirm empty role" msgstr "空のロールを確認" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "Edit the relation the currently selected relation member refers to" msgstr "現在選択中のリレーションメンバーが参照しているリレーションを編集" + +#. download the relation +#. +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1427 +#, fuzzy, java-format +msgid "Downloading relation ''{0}''" +msgstr "リレーション {0} をダウンロード中" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:190 @@ -5985,7 +6017,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220 -#, fuzzy msgid "Zoom to the object the first selected member refers to" -msgstr "最初に選択されたメンバーが参照しているプリミティブにズーム" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:211 @@ -5997,11 +6028,7 @@ msgstr "選択されたメンバーが無いのでズームは無効化されました" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:25 msgid "Refers to" msgstr "参照先" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32 -msgid "Linked" -msgstr "リンク済み" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75 @@ -6014,5 +6041,5 @@ msgstr "child.getId() の値 > 0 であるべきです。入力値: {1}。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198 #, java-format msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}" @@ -6082,9 +6109,9 @@ msgstr "ブックマーク" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147 msgid "There is currently no download area selected." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150 +msgstr "現在、ダウンロードするエリアが選択されていません。" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149 #, java-format msgid "" @@ -6093,52 +6120,54 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178 msgid "Create bookmark" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181 +msgstr "ブックマークを作成" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180 msgid "Add a bookmark for the currently selected download area" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188 +msgstr "現在選択中のダウンロードエリアをブックマークに追加" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187 msgid "" "Currently, there is no download area selected. Please select an area first." msgstr "" +"現在はダウンロードエリアが選択されていません。最初にエリアを選択してくださ" +"い。" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250 +msgid "Please enter a name for the bookmarked download area." +msgstr "ブックマークされたエリアの名前を入力してください。" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251 -msgid "Please enter a name for the bookmarked download area." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198 -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252 msgid "Name of location" msgstr "ロケーション名" -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213 +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212 msgid "Remove the currently selected bookmarks" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239 +msgstr "現在選択中のブックマークを削除" + +#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238 msgid "Rename the currently selected bookmark" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95 +msgstr "現在選択中のブックマークをリネーム" + +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 msgid "min lat" msgstr "最小緯度" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106 msgid "min lon" msgstr "最小経度" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108 msgid "max lat" msgstr "最大緯度" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110 msgid "max lon" msgstr "最大経度" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113 msgid "" "URL from www.openstreetmap.org (you can paste an URL here to download the " @@ -6148,52 +6177,52 @@ "ることができます。）" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145 msgid "Bounding Box" msgstr "境界囲み" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211 -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251 #, java-format msgid "The string ''{0}'' isn''t a valid double value." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223 msgid "Value for latitude in range [-90,90] required." msgstr "緯度の値は、[-90,90]の範囲にある必要があります。" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255 msgid "Value for longitude in range [-180,180] required." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296 +#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294 msgid "Paste URL from clipboard" msgstr "" #. adding the download tasks -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:88 msgid "Data Sources and Types" msgstr "データソースと型" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89 msgid "OpenStreetMap data" msgstr "OpenStreetMapデータ" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90 msgid "Select to download OSM data in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:92 msgid "Raw GPS data" msgstr "生のGPSデータ" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93 msgid "Select to download GPS traces in the selected download area." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:113 msgid "Download as new layer" msgstr "新しいレイヤーとしてダウンロードする" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114 msgid "" "Select to download data into a new data layer.
Unselect to download " @@ -6201,38 +6230,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:118 msgid "Download Area" msgstr "エリアをダウンロードする" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167 -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:166 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:380 msgid "Download" msgstr "ダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:206 msgid "No area selected yet" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:209 msgid "Download area too large; will probably be rejected by server" msgstr "ダウンロードするエリアが広すぎます; サーバから拒否されるでしょう" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212 msgid "Download area ok, size probably acceptable to server" msgstr "ダウンロード領域はOKです。指定のサイズはサーバに受け入れられるでしょう" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365 msgid "Click to close the dialog and to abort downloading" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382 msgid "Click do download the currently selected area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389 msgid "Please select a download area first." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400 +#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398 #, java-format msgid "" @@ -6254,21 +6283,21 @@ #. SAXException does not chain correctly -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:219 msgid "Null pointer exception, possibly some missing tags." msgstr "ヌルポインタ例外です。失われたタグがあるのでしょう。" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255 msgid "Search ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:257 msgid "Click to start searching for places" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:296 msgid "Querying name server" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:324 msgid "Querying name server ..." msgstr "" @@ -7007,8 +7036,8 @@ #. #. -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69 #: build/trans_presets.java:78 build/trans_presets.java:114 #: build/trans_presets.java:154 build/trans_presets.java:191 @@ -7181,5 +7210,5 @@ #. item "Land use/Wood" text "Name" #. item "Land use/Forest" text "Name" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:405 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402 #: build/trans_presets.java:361 build/trans_presets.java:660 #: build/trans_presets.java:800 build/trans_presets.java:1148 @@ -7191,5 +7220,5 @@ msgstr "タイプ" -#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413 +#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410 msgid "Near" msgstr "" @@ -7241,5 +7270,5 @@ msgstr "JOSM ヘルプブラウザ" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:189 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:188 #, java-format msgid "" @@ -7253,5 +7282,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:211 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:210 #, java-format msgid "" @@ -7262,5 +7291,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:313 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:312 #, java-format msgid "" @@ -7269,19 +7298,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:318 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:317 msgid "Failed to open URL" msgstr "URLを開けません" #. putValue(NAME, tr("Open in Browser")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:351 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:350 msgid "Open the current help page in an external browser" msgstr "現在のヘルプページを外部ブラウザで開く" #. putValue(NAME, tr("Edit")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:363 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:362 msgid "Edit the current help page" msgstr "現在のヘルプページを編集" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:370 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:369 #, java-format msgid "" @@ -7291,32 +7320,32 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:392 msgid "Reload the current help page" msgstr "現在のヘルプページを再ロード" #. putValue(NAME, tr("Back")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:408 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:407 msgid "Go to the previous page" msgstr "前のページへ" #. putValue(NAME, tr("Forward")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:428 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:427 msgid "Go to the next page" msgstr "次のページへ" #. putValue(NAME, tr("Home")); -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:443 msgid "Go to the JOSM help home page" msgstr "JOSM ヘルプホームページへ" -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:475 +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:474 msgid "Warning: bad location in HTML document. Exception was: " msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524 +msgid "Failed to open help page. The target URL is empty." +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:525 -msgid "Failed to open help page. The target URL is empty." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:526 msgid "Failed to open help page" msgstr "" @@ -7338,5 +7367,5 @@ msgstr "経度 : " -#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:137 +#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" msgstr "座標" @@ -7400,12 +7429,12 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:65 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' > 0 expected. Got {1}." -msgstr "パラメータ {0} > 0 が必須です。 {1} を受け取りました。" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:83 -#, fuzzy, java-format +#, java-format msgid "id in parameter ''{0}'' > 0 expected, got {1}." -msgstr "ID パラメータ ''{0}'' > 0 必須です。 {1} を受け取りました" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:128 @@ -7430,33 +7459,31 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77 #, java-format msgid "Node {0}" msgstr "ノード {0}" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 +msgid "Zoom to node" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196 -#, fuzzy -msgid "Zoom to node" -msgstr "問題へズーム" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:197 msgid "Zoom to this node in the current data layer" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 +msgid "Show history" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242 -#, fuzzy -msgid "Show history" -msgstr "履歴をロード" - -#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:243 msgid "Open a history browser with the history of this node" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78 #, java-format msgid "Way {0}" msgstr "ウェイ {0}" -#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81 +#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 #, java-format msgid "Relation {0}" @@ -7465,7 +7492,6 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60 -#, fuzzy msgid "not present" -msgstr "プリセットメニューの並び替え" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:52 @@ -7483,7 +7509,6 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178 -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:184 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:294 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86 #: build/trans_presets.java:335 build/trans_presets.java:336 @@ -7511,21 +7536,19 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:90 -#, fuzzy, java-format +#, java-format msgid "" "Version {0} currently edited in layer ''{1}''" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96 +#, java-format +msgid "" +"Version {0} created on {1}" +msgstr "" "バージョン {0} 作成日 {1}" -#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:96 -#, java-format -msgid "" -"Version {0} created on {1}" -msgstr "" -"バージョン {0} 作成日 {1}" - #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 -#, fuzzy msgid "anonymous" -msgstr "<匿名>" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118 @@ -7553,17 +7576,16 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:106 -#, fuzzy, java-format +#, java-format msgid "Version {0} in editor" -msgstr "バージョン{0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108 -#, fuzzy msgid "[deleted]" -msgstr "削除しました" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118 -#, fuzzy, java-format +#, java-format msgid "Version {0} currently edited in data layer ''{1}''" -msgstr "バージョン {0} 作成日: {1} 作成者: {2}" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 @@ -7616,10 +7638,10 @@ msgstr "変更セット {0} を閉じています" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926 msgid "Launch a file chooser to select a file" msgstr "ファイルを選ぶためにファイル選択を起動してください" -#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148 +#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146 msgid "Select filename" msgstr "ファイル名を選択" @@ -7840,5 +7862,5 @@ #. item "Water/Water/River" text "Name" #. item "Transport/Railway/Bus Guideway" check "Embankment" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20 #: build/trans_presets.java:79 build/trans_presets.java:96 #: build/trans_presets.java:115 build/trans_presets.java:134 @@ -7861,17 +7883,17 @@ msgstr "レイヤー" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28 msgid "Should upload?" msgstr "アップロードしますか？" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36 msgid "Should save?" msgstr "保存しますか？" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44 msgid "Filename" msgstr "ファイル名" -#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54 +#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203 msgid "Upload" @@ -7887,7 +7909,7 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:870 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:939 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 msgid "Tags of new changeset" msgstr "新しい変更セットのタグ" @@ -7928,29 +7950,29 @@ msgstr[0] "{0} 個のオブジェクトを削除:" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:483 msgid "Upload Changes" msgstr "変更のアップロード" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:485 msgid "Upload the changed primitives" msgstr "変更されたプリミティブをアップロード" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:491 msgid "Please enter a comment for this upload changeset (min. 3 characters)" msgstr "このアップロード変更セットにコメントを入力してください（3文字以上）" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:492 msgid "Illegal upload comment" msgstr "不正なアップロードコメント" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:518 msgid "Cancel the upload and resume editing" msgstr "アップロードをキャンセルして編集に戻る" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:624 msgid "Upload all changes in one request" msgstr "ひとつのリクエストで全ての変更をアップロード" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 msgid "" "Enable to upload all changes in one request, disable to use one request per " @@ -7960,38 +7982,38 @@ "ティブごとにリクエストするには、無効にする。" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:625 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:635 msgid "Provide a brief comment for the changes you are uploading:" msgstr "アップロードする変更の概略コメントを入力してください。" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:637 msgid "Enter an upload comment (min. 3 characters)" msgstr "アップロード用コメントを入力(最小3文字)" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:695 msgid "Open a new changeset" msgstr "新しい変更セットを開く" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:696 msgid "Open a new changeset and use it in the next upload" msgstr "新しい変更セットを開き、次回アップロードで使用" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:703 msgid "Use an open changeset" msgstr "開かれた変更セットを使用" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:704 msgid "Upload data to an already opened changeset" msgstr "既に開かれた変更セットにデータをアップロード" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:744 msgid "Close changeset after upload" msgstr "アップロード後に変更セットを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:745 msgid "Select to close the changeset after the next upload" msgstr "次回アップロード後に閉じる「変更セット」を選択" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926 -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:957 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:981 #, java-format msgid "Tags of changeset {0}" @@ -7999,16 +8021,16 @@ #. putValue(NAME, tr("Reload")); -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:969 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1000 msgid "Load the list of your open changesets from the server" msgstr "自分の開いた変更セットのリストをサーバからロード" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:983 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1014 msgid "Close the currently selected open changeset" msgstr "現在選択済みの開かれた変更セットを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1035 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 +#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1066 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:639 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -8058,24 +8080,24 @@ msgstr "アップロードを続ける" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281 #, java-format msgid "Images for {0}" msgstr "{0} のイメージ" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286 msgid "Read GPX..." msgstr "GPXの読み込み…" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307 #, java-format msgid "No time for point {0} x {1}" msgstr "地点 {0} x {1}に時刻がありません" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "時刻 \"{0}\"を地点 {1}×{2} から読み取ることができませんでした" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:147 #, java-format @@ -8083,33 +8105,33 @@ msgstr "{0}を読み込んでいます ..." -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:354 msgid "No images with readable timestamps found." msgstr "読み取り可能な時刻のついた画像が見つかりませんでした。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:413 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:276 msgid "Geotagged Images" msgstr "ジオタグのついた画像" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:598 #, java-format msgid "GPS start: {0}" msgstr "GPS開始: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:599 #, java-format msgid "GPS end: {0}" msgstr "GPS終了: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601 #, java-format msgid "current delta: {0}s" msgstr "現在の差分: {0} 秒" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602 msgid "timezone difference: " msgstr "タイムゾーンの違い: " -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314 msgid "image" @@ -8117,14 +8139,14 @@ msgstr[0] "画像" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:628 #, java-format msgid "{0} within the track." msgstr "トラック内に {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687 msgid "Sync clock" msgstr "時計の同期" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:698 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37 @@ -8132,32 +8154,32 @@ msgstr "JPEGイメージ(*.jpg)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "ファイル \"{0}\"中の日付が取得できません。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "ファイル\"{0}\"にEXIFの時刻情報がありません。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:761 msgid "Image" msgstr "画像" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:763 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "写真の日付を入力(mm/dd/yyyy HH:MM:SS)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766 msgid "GPS unit timezone (difference to photo)" msgstr "GPSユニットのタイムゾーン(写真の時間との違い)" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:778 msgid "Synchronize Time with GPS Unit" msgstr "時刻をGPSユニットと同期する" -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804 -#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:808 msgid "Time entered could not be parsed." msgstr "入力した時刻は、解釈できません" @@ -8247,5 +8269,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 #, java-format msgid "Description: {0}" @@ -8294,10 +8316,10 @@ msgstr[0] "{0} ウェイポイント" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:753 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:752 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61 msgid "Convert to data layer" msgstr "データレイヤーへ変換" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760 msgid "" "Upload of unprocessed GPS data as map data is considered harmful." @@ -8308,11 +8330,11 @@ "てください：" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 msgid "http://www.openstreetmap.org/traces" msgstr "http://www.openstreetmap.org/traces" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:630 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:785 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208 @@ -8322,29 +8344,29 @@ msgstr "{0}からのコンバート" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:834 -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:932 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:807 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:833 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:931 msgid "Download from OSM along this track" msgstr "このトラックに沿ってOSMからダウンロード" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:815 msgid "Download everything within:" msgstr "次の範囲内の全てをダウンロード:" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818 #, java-format msgid "{0} meters" msgstr "{0} メータ" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:822 msgid "Maximum area per request:" msgstr "リクエストあたりの最大面積：" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:826 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:825 #, java-format msgid "{0} sq km" msgstr "{0} 平方キロメートル" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:925 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:924 #, java-format msgid "" @@ -8355,9 +8377,9 @@ "すか？" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1036 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1035 msgid "No GPX track available in layer to associate audio with." msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1205 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1204 msgid "" "Some waypoints with timestamps from before the start of the track or after " @@ -8367,5 +8389,5 @@ "に変更又は移動されました。" -#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1212 +#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1211 msgid "" "Some waypoints which were too far from the track to sensibly estimate their " @@ -8375,23 +8397,23 @@ "外します。" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112 #, java-format msgid "Data Layer {0}" msgstr "データレイヤー {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180 msgid "outside downloaded area" msgstr "ダウンロード領域の外" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262 #, java-format msgid "version {0}" msgstr "バージョン {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "警告 : バージョン 0.5 に 0.5 と 0.6 のデータが混ざっている" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334 #, java-format msgid "There was {0} conflict detected." @@ -8399,5 +8421,5 @@ msgstr[0] "検出された競合が {0} 個あります" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340 #, java-format msgid "" @@ -8411,5 +8433,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349 #, java-format msgid "" @@ -8422,11 +8444,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516 +#: ../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 #, java-format msgid "{0} deleted" @@ -8435,22 +8457,35 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522 #, java-format msgid "{0} consists of:" msgstr "{0}は次からなります:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 msgid "unset" msgstr "設定解除" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526 #, java-format msgid "API version: {0}" msgstr "APIバージョン: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205 msgid "Convert to GPX layer" msgstr "GPXレイヤーの変換" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +msgid "Dataset consistency test" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730 +#, fuzzy +msgid "No problems found" +msgstr "\"from\"ウェイが見つかりません" + +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:733 +msgid "Following problems found:" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65 @@ -8543,9 +8578,9 @@ msgstr "このレイヤーには、開始オフセットを指すオーディオマーカーがありません。" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452 msgid "Show/Hide Text/Icons" msgstr "テキスト/アイコンの表示/非表示" -#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:454 +#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453 msgid "Toggle visible state of the marker text and icons." msgstr "マーカーテキストとアイコンの表示状態を切り替え" @@ -8611,5 +8646,5 @@ msgstr "不明なときの既定値(設定はまだ使われません）" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:660 @@ -8617,5 +8652,5 @@ msgstr "編集する列を選択してください。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:229 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195 #, java-format @@ -8623,5 +8658,5 @@ msgstr "新しい値は{0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683 @@ -8630,5 +8665,5 @@ msgstr "削除する列を選択してください。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269 +#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:268 msgid "Enter a new key/value pair" msgstr "新しいキー/値の組を入力" @@ -8763,40 +8798,40 @@ msgstr "ボイスレコーダの調整" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 msgid "Color" msgstr "色" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135 #, java-format msgid "Paint style {0}: {1}" msgstr "塗りつぶしスタイル{0}:{1}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142 #, java-format msgid "Layer: {0}" msgstr "レイヤー: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 msgid "Choose" msgstr "選択" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159 #, java-format msgid "Choose a color for {0}" msgstr "{0}の色を選択" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167 msgid "Set to default" msgstr "既定値に設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178 msgid "Set all to default" msgstr "全てを既定値に設定" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229 msgid "Colors used by different objects in JOSM." msgstr "JOSMの異なるオブジェクトが使う配色" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244 msgid "Colors" msgstr "色" @@ -9234,17 +9269,17 @@ msgstr "設定を有効にするにはJOSMを再起動する必要があります。" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:79 msgid "Display coordinates as" msgstr "座標を次の単位で表示" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:83 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:82 msgid "Projection method" msgstr "投影法" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:85 msgid "Projection code" msgstr "射影コード" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88 msgid "Bounds" msgstr "境界" @@ -9254,5 +9289,5 @@ msgstr "地図投影法" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:160 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:158 #, java-format msgid "The projection {0} could not be activated. Using Mercator" @@ -9310,81 +9345,81 @@ msgstr "ショートカット" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155 msgid "Active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:165 #, java-format msgid "Available styles (from {0})" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:171 msgid "Icon paths" msgstr "アイコンのパス" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "Short Description: {0}" msgstr "簡単な説明: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:407 #, java-format msgid "URL: {0}" msgstr "URL: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:409 #, java-format msgid "Author: {0}" msgstr "作者: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412 #, java-format msgid "Webpage: {0}" msgstr "ウェブページ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418 #, java-format msgid "Version: {0}" msgstr "バージョン: {0}" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432 msgid "Add a filename or an URL of an active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447 msgid "Remove the selected styles from the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468 msgid "Edit the filename or URL for the selected active style" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Add the selected available styles to the list of active styles" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 #, java-format msgid "Reloads the list of available styles from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624 msgid "Add a new icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637 msgid "Remove the selected icon paths" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658 msgid "Edit the selected icon path" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:703 #, java-format msgid "Loading style sources from ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:725 #, java-format msgid "" @@ -9393,6 +9428,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768 -#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:765 +#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:797 #, java-format msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''" @@ -9581,10 +9616,10 @@ msgstr "修飾グループ" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70 +#: ../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:407 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341 #, java-format @@ -9593,32 +9628,32 @@ msgstr[0] "{0} オブジェクトまで古いキーを削除" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134 msgid "Add a new tag" msgstr "新しいタグを追加" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159 msgid "Delete the selection in the tag table" msgstr "タグテーブルの選択を削除" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271 msgid "More information about this feature" -msgstr "この機能の詳細情報" +msgstr "この地物の詳細情報" #. space -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:473 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472 msgid "Optional Attributes:" msgstr "オプションの属性：" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562 msgid "closedway" msgstr "閉じたウェイ" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567 #, java-format msgid "Unknown type: {0}" msgstr "不明なタイプ: {0}" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63 @@ -9629,15 +9664,15 @@ msgstr "タグ付けプレセットのソース {0} を読み込めません。" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654 #, java-format msgid "Error parsing {0}: " msgstr "走査時にエラー: {0}: " -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:685 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684 #, java-format msgid "Elements of type {0} are supported." msgstr "タイプ{0}の要素がサポートされます" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:726 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725 #: ../plugins/terracer/src/terracer/TerracerAction.java:98 #, java-format @@ -9646,18 +9681,18 @@ msgstr[0] "{0}このオブジェクトを変更" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:729 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728 #: ../plugins/terracer/src/terracer/TerracerAction.java:100 msgid "Nothing selected!" msgstr "何も選択されていません！" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730 msgid "Selection unsuitable!" msgstr "選択が適切ではありません！" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738 msgid "Apply Preset" msgstr "プリセットの適用" -#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:814 +#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813 msgid "Change Properties" msgstr "プロパティを変更する" @@ -9673,6 +9708,6 @@ msgstr "プレセットグループ {0}" -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42 -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59 @@ -9681,8 +9716,21 @@ msgstr "OSMサーバに接続中..." -#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48 +#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 #, java-format msgid "Downloading points {0} to {1}..." msgstr "{1}にポイント{0}をダウンロード中..." + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:33 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110 +#, java-format +msgid "Failed to parse date ''{0}'' replied by server." +msgstr "サーバから返されたデータ ''{0}'' が解析できません" + +#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:37 +#, fuzzy, java-format +msgid "" +"Unexpected format of error header for conflict in changeset update. Got " +"''{0}''" +msgstr "予想外の形式のID がサーバから返されました。入力値: ''{0}''" #. SAXException does not chain correctly @@ -9799,5 +9847,5 @@ msgstr "不明なモード {0}。" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:115 #, java-format msgid "No primitive with id {0} in local dataset. Can't infer primitive type." @@ -9806,6 +9854,6 @@ "不明" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312 -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:337 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36 @@ -9815,40 +9863,40 @@ msgstr "OSMデータをダウンロード中..." -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:365 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361 #, java-format msgid "Fetching node with id {0} from ''{1}''" msgstr "id {0} のノードを ''{1}'' から取得中" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362 #, java-format msgid "Fetching way with id {0} from ''{1}''" msgstr "id {0} のウェイを ''{1}'' から取得中" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363 #, java-format msgid "Fetching relation with id {0} from ''{1}''" msgstr "id {0} のリレーションを ''{1}'' から取得中" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369 #, java-format msgid "Server replied with response code 404 for id {0}. Skipping." msgstr "ID {0} に対してサーバが404コードを返しました。スキップします。" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399 #, java-format msgid "Fetching a package of nodes from ''{0}''" msgstr "''{0}'' からノードのパッケージを取得中" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:400 #, java-format msgid "Fetching a package of ways from ''{0}''" msgstr "''{0}'' からウェイのパッケージを取得中" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:401 #, java-format msgid "Fetching a package of relations from ''{0}''" msgstr "''{0}'' からリレーションのパッケージを取得中" -#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416 +#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412 msgid "" "Server replied with response code 404, retrying with an individual request " @@ -9915,5 +9963,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322 #, java-format msgid "Unexpected format of ID replied by the server. Got ''{0}''." @@ -9928,66 +9976,66 @@ "''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314 msgid "Creating changeset..." msgstr "変更セットを作成しています..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:324 #, java-format msgid "Successfully opened changeset {0}" msgstr "変更セット {0} を開きました" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:351 msgid "Updating changeset..." msgstr "変更セットを更新中..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353 #, java-format msgid "Updating changeset {0}..." msgstr "変更セット {0} を更新中..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:389 msgid "Closing changeset..." msgstr "変更した設定を閉じています..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:410 msgid "No changeset present for diff upload." msgstr "diffアップロードのための変更セットを用意できませんでした。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417 msgid "Preparing..." msgstr "準備中..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:420 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:422 msgid "Uploading..." msgstr "アップロード中..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:437 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:439 msgid "Waiting 10 seconds ... " msgstr "10秒待機中 ... " -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:442 #, java-format msgid "Starting retry {0} of {1} in {2} seconds ..." msgstr "{2} 秒で {1} 分の {0} 回の再試行を開始 ..." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:448 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:450 msgid "OK - trying again." msgstr "OK - やり直しています。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:526 #, java-format msgid "Starting retry {0} of {1}." msgstr "{1} 分の {0} 回の再試行を開始。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:611 msgid "Current changeset is null. Can't upload data." msgstr "現在の変更セットはヌルです。データをアップロードできません。" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:613 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "現在の変更セットのID > 0 でなければなりません。現在のID: {0}." -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:641 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -10024,5 +10072,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:180 #, java-format msgid "Missing mandatory attribute ''{0}''." @@ -10049,5 +10097,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:176 #, java-format msgid "Missing mandatory attribute ''{0}'' of XML element {1}." @@ -10055,5 +10103,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183 #, java-format msgid "Unsupported version: {0}" @@ -10067,5 +10115,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:313 #, java-format msgid "Illegal value for attribute ''uid''. Got ''{0}''." @@ -10222,5 +10270,5 @@ msgstr "ファイル \"{0}\" はありません" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207 #, java-format msgid "" @@ -10231,39 +10279,39 @@ "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230 msgid "Found XML element not as direct child of element ." msgstr " 要素を直接引き継いでない XML 要素の が見つかった。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235 #, java-format msgid "Missing mandatory attribute ''{0}'' on of way {1}." msgstr "ウェイ {1} の上に必要な属性 ''{0}'' がありません。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241 #, java-format msgid "Illegal value of attribute ''ref'' of element . Got {0}." msgstr "要素 の属性 ''ref'' に不正な値。入力値: {0}。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:258 msgid "Found XML element not as direct child of element ." msgstr "" "要素 の直接の子要素でないXML 要素 が見つかりました。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:264 #, java-format msgid "Missing attribute ''ref'' on member in relation {0}." msgstr "リレーション {0} のメンバーに属性 ''ref'' がありません" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:269 #, java-format msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}" msgstr "リレーション {0} のメンバーの属性 ''ref'' に不正な値。入力値: {1}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:273 #, java-format msgid "Missing attribute ''type'' on member {0} in relation {1}." msgstr "リレーション {1} のメンバー {0} に属性 ''type'' がありません" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276 #, java-format msgid "" @@ -10272,19 +10320,19 @@ "リレーション {1} のメンバー {0} の属性 ''type'' に不正な値。入力値: {2}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283 msgid "Incomplete specification with ref=0" msgstr "ref=0の不完全な指定です。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:295 #, java-format msgid "Undefined element ''{0}'' found in input stream. Skipping." msgstr "入力ストリーム中に未定義の要素 ''{0}'' があります。スキップします。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:323 msgid "Illegal object with ID=0." msgstr "id=0の禁じられたオブジェクトです" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 #, java-format msgid "" @@ -10294,10 +10342,8 @@ #. default version in 0.5 files for existing primitives -#. default version in 0.5 files for new primitives -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375 -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:379 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:355 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:360 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377 #, java-format msgid "" @@ -10309,25 +10355,25 @@ #. should not happen. API version has been checked before -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368 #, java-format msgid "Unknown or unsupported API version. Got {0}." msgstr "不明なまたはサポートされない APIバージョン。入力値: {0}" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374 #, java-format msgid "Missing attribute ''version'' on OSM primitive with ID {0}." msgstr "ID {0} のOSM プリミティブ「の属性 ''version'' がありません" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399 #, java-format msgid "Missing required attribute ''{0}''." msgstr "必要な属性 ''{0}'' がありません。" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:402 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:404 #, java-format msgid "Illegal long value for attribute ''{0}''. Got ''{1}''." msgstr "属性 ''{0}'' に不正な長い値。入力値: ''{1}''" -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:426 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427 #, java-format msgid "" @@ -10808,5 +10854,5 @@ msgstr "(テキストはクリップボードにコピーされています。)" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39 #, java-format msgid "" @@ -10817,14 +10863,5 @@ "ンターネット接続をチェックしてください。" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53 -#, java-format -msgid "" -"Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " -"changeset will automatically be closed by the server after a timeout." -msgstr "" -"OSM サーバ ''{1}'' 上の変更セット ''{0}'' を閉じられませんでした。
" -"変更セットはタイムアウト後にサーバによって自動的に閉じられます。" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:56 #, java-format msgid "" @@ -10837,5 +10874,5 @@ "ン {0} への参照を削除し、再度アップロードしてください。" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:83 #, java-format msgid "" @@ -10847,10 +10884,5 @@ "タセットは前提条件に違反しています。
エラーメッセージ:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123 -#, java-format -msgid "Failed to parse date ''{0}'' replied by server." -msgstr "サーバから返されたデータ ''{0}'' が解析できません" - -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:115 #, java-format msgid "" @@ -10861,5 +10893,5 @@ "れています。" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:121 #, java-format msgid "" @@ -10870,5 +10902,5 @@ "閉じられています。" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130 #, java-format msgid "" @@ -10877,9 +10909,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136 msgid "The server reported that it has detected a conflict." msgstr "サーバから競合検出の連絡がありました。" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:151 +#, fuzzy, java-format +msgid "" +"Failed to upload to changeset {0}
because it has " +"already been closed on {1}." +msgstr "" +"変更セット{0}を閉じることができません。
{1} で既に" +"閉じられています。" + +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:191 #, java-format msgid "" @@ -10892,5 +10933,5 @@ "ドしていないためだと思われます。" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207 #, java-format msgid "" @@ -10901,5 +10942,5 @@ "チェックしてください。" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:224 #, java-format msgid "" @@ -10911,5 +10952,5 @@ "失敗しました。
詳細(原文): {1}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:240 #, java-format msgid "" @@ -10920,10 +10961,10 @@ "おそらく一時的な問題です。後ほどやり直してみてください。" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 #, java-format msgid "The OSM server ''{0}'' reported a bad request.
" msgstr "OSM サーバ ''{0}'' より不正リクエストの報告がありました。
" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257 msgid "" "The area you tried to download is too big or your request was too large." @@ -10935,10 +10976,10 @@ "ポートファイルを使用してください。" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260 #, java-format msgid "
Error message(untranslated): {0}" msgstr "
エラーメッセージ(未訳): {0}" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:274 #, java-format msgid "" @@ -10949,5 +10990,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:301 #, java-format msgid "" @@ -10960,5 +11001,5 @@ "てください。" -#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366 +#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:373 #, java-format msgid "" @@ -11713,5 +11754,5 @@ msgstr "ファイル{0}にエラー" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 #, java-format msgid "" @@ -11726,29 +11767,49 @@ #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true); #. this below is a temporary workaround to fix the "always on top" issue -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:97 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387 msgid "Select Feuille" msgstr "用紙選択" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137 -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:142 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:432 msgid "Error loading file" msgstr "ファイルの読み込みエラー" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:17 -msgid "Lambert Zone 1 cache file (.1)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20 +#, fuzzy, java-format +msgid "Lambert Zone {0} cache file (.{0})" msgstr "Lambert Zone 1 cache file (.1)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:18 -msgid "Lambert Zone 2 cache file (.2)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26 +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27 +#, fuzzy, java-format +msgid "Lambert CC9 Zone {0} cache file (.CC{0})" +msgstr "Lambert Zone 1 cache file (.1)" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19 +#, fuzzy +msgid "Guadeloupe Fort-Marigot cache file (.UTM1)" +msgstr "UTM20N (仏領)グアドループ海外県 マリゴ市 1949" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20 +#, fuzzy +msgid "Guadeloupe Ste-Anne cache file (.UTM2)" msgstr "Lambert Zone 2 cache file (.2)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:19 -msgid "Lambert Zone 3 cache file (.3)" +#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21 +#, fuzzy +msgid "Martinique Fort Desaix cache file (.UTM3)" msgstr "Lambert Zone 3 cache file (.3)" - -#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileFilter.java:20 -msgid "Lambert Zone 4 cache file (.4)" -msgstr "Lambert Zone 4 cache file (.4)" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:42 @@ -11779,13 +11840,13 @@ msgstr "選択..." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:137 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:142 msgid "Cadastre" msgstr "Cadastre" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:146 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:151 msgid "Auto sourcing" msgstr "自動ソーシング" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:206 msgid "" "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n" @@ -11797,13 +11858,13 @@ "F11 を取得アクションに戻しますか？" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:209 msgid "Restore grab shortcut F11" msgstr "F11 を取得ショートカットに戻す" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:214 msgid "JOSM is stopped for the change to take effect." msgstr "変更が実施されるようにJOSM を停止しました" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:276 #, java-format msgid "" @@ -12105,43 +12166,49 @@ msgstr "{0} ランベルト座標にセット" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:33 -msgid "Set manually the Lambert zone" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:44 -msgid "Zone" -msgstr "Zone" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:55 -msgid "Lambert zone" -msgstr "ランベルトゾーン" - -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:23 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24 msgid "Load location from cache (only if cache is enabled)" msgstr "キャッシュから位置を読み込む(もしキャッシュが可能な場合)" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:40 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44 #, java-format msgid "{0} not allowed with the current projection" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57 +#, fuzzy, java-format +msgid "" +"Cannot load cache {0} which is not compatible with current projection zone" +msgstr "" +"キャッシュのランベルトzone {0} は現在のランベルトzone {1} と互換がありません" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63 +#, java-format +msgid "" +"Selected file {0} is not a cache file from this plugin (invalid extension)" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70 +#, java-format +msgid "The location {0} is already on screen. Cache not loaded." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Change location" msgstr "ロケーションの変更" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:28 msgid "Set a new location for the next request" msgstr "次のリクエスト用に、新規の位置をセットしてください。" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47 msgid "Add a new layer" msgstr "新規レイヤーを追加" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49 #: build/trans_presets.java:2349 msgid "Location" msgstr "ロケーション" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:51 msgid "" "Enter the town,village or city name.
Use the syntax and punctuation " @@ -12151,5 +12218,5 @@ "cadastre.gouv.fr に従ってください。(フランス語の場合)" -#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:65 +#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66 msgid "Add new layer" msgstr "新規レイヤーを作成" @@ -12179,5 +12246,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34 -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 msgid "Adjust WMS" msgstr "WMSの調整" @@ -12207,5 +12274,5 @@ "最初にそのひとつを選んで、やり直してください" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:79 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185 @@ -12213,28 +12280,28 @@ msgstr "ブランクのレイヤー" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:185 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184 #, java-format msgid "WMS layer ({0}), {1} tile(s) loaded" msgstr "WMSレイヤー ({0}), {1}このタイル読み込み" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186 msgid "Is not vectorized." msgstr "ベクターではありません。" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:188 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:187 #, java-format msgid "Raster size: {0}" msgstr "ラスターサイズ: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:189 msgid "Is vectorized." msgstr "ベクタライズされました。" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:191 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:190 #, java-format msgid "Commune bbox: {0}" msgstr "都道府県 bbox: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392 #, java-format msgid "" @@ -12245,9 +12312,9 @@ "であるべきです" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:394 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393 msgid "Cache Format Error" msgstr "キャッシュフォーマットエラー" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:416 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -12255,16 +12322,7 @@ "キャッシュのランベルトzone {0} は現在のランベルトzone {1} と互換がありません" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:418 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417 msgid "Cache Lambert Zone Error" msgstr "ランベルトゾーンキャッシュエラー" - -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:551 -#, java-format -msgid "" -"Current layer is in Lambert CC9 Zone \"{0}\"\n" -"where the commune is in Lambert CC9 Zone \"{1}\".\n" -"Upload your changes, close all layers and change\n" -"manually the Lambert zone from the Cadastre menu" -msgstr "" #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67 @@ -13318,20 +13376,20 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:233 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246 msgid "Do you want to allow this?" msgstr "本当にこれを許可してよろしいですか？" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230 -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:247 msgid "Confirm Remote Control action" msgstr "リモート制御の指示を確認した" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:232 msgid "Remote Control has been asked to create a new node." msgstr "リモート制御より新しいノードを作成するかどうか問合せがきました。" -#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240 +#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:244 msgid "Remote Control has been asked to import data from the following URL:" msgstr "" @@ -13455,13 +13513,9 @@ msgstr "ズームダウン" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:214 -msgid "Snap to tile size" -msgstr "" - -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:226 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232 msgid "Flush Tile Cache" msgstr "タイルのキャッシュをフラッシュ" -#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:663 +#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668 msgid "image " msgstr "画像 " @@ -14040,6 +14094,7 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120 -msgid "Unconnceted coastline" -msgstr "" +#, fuzzy +msgid "Unconnected coastline" +msgstr "順序付いていない海岸線" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150 @@ -14692,12 +14747,10 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:55 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58 -#, fuzzy msgid "Way Download" -msgstr "ダウンロード" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:57 -#, fuzzy msgid "Download map data on the end of selected way" -msgstr "地図データをOSMサーバからダウンロード" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:99 @@ -14713,9 +14766,7 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:118 -#, fuzzy, java-format +#, java-format msgid "There are no ways connected to node ''{0}''. Aborting." msgstr "" -"統合元のレイヤー
''{0}''
を、統合する先のレイヤーがありません。" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:168 @@ -14737,7 +14788,6 @@ #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:195 -#, fuzzy msgid "Merge duplicate node?" -msgstr "重複したノードの削除中…" +msgstr "" #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:212 @@ -14805,29 +14855,29 @@ msgstr "正しいWMSまたはID がありません" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43 msgid "Adjust the position of the selected WMS layer" msgstr "選択されたWMSレイヤーの位置を調整してください。" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173 msgid "Please select the WMS layer to adjust." msgstr "調整するWMSレイヤーを選択してください。" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 msgid "Select WMS layer" msgstr "WMSレイヤーを選択" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:179 msgid "Start adjusting" msgstr "調整開始" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 msgid "There are currently no WMS layer to adjust." msgstr "現在は調整するWMSレイヤーがありません。" -#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:199 msgid "No layers to adjust" msgstr "調整するレイヤーがありません" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:115 #, java-format msgid "" @@ -14838,5 +14888,5 @@ "ん。" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:116 msgid "" "Warning: Fetching WMS tiles is likely to fail. Please check you preference " @@ -14844,10 +14894,10 @@ msgstr "警告: WMSタイルの取得に失敗したようです。設定をチェックしてください。" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117 #, java-format msgid "Warning: The complete URL is ''{0}''." msgstr "警告: 完全なURL は ''{0}' です。" -#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134 +#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:138 #, java-format msgid "" @@ -14862,24 +14912,24 @@ msgstr "自動ダウンロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:104 #, java-format msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''" msgstr "警告: WMS レイヤーは不正なベースURL ''{0}'' のために無効化されました" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:98 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:106 msgid "(deactivated)" msgstr "(無効化)" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:145 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:153 #, java-format msgid "WMS layer ({0}), automatically downloading in zoom {1}" msgstr "WMS レイヤー ({0}), 自動的に倍率 {1} でダウンロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:147 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:155 #, java-format msgid "WMS layer ({0}), downloading in zoom {1}" msgstr "WMS レイヤー ({0}), 自倍率 {1} でダウンロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:190 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 #, java-format msgid "" @@ -14893,13 +14943,13 @@ "設定を
チェックしてください。
強制的にWMS タイルを取得しますか？" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:198 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206 msgid "Yes, fetch images" msgstr "はい、画像を取得します" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:204 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:212 msgid "Invalid URL?" msgstr "不正なURL？" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:227 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:235 msgid "" "The requested area is too big. Please zoom in a little, or change resolution" @@ -14907,44 +14957,49 @@ "要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 msgid "Download visible tiles" msgstr "見えるタイルのダウンロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:303 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312 msgid "Change resolution" msgstr "解像度の変更" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324 msgid "Reload erroneous tiles" msgstr "誤ったタイルのリロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:339 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:348 msgid "Alpha channel" msgstr "アルファチャンネル" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:359 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:368 msgid "Save WMS layer to file" msgstr "WMSレイヤーをファイルに保存" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:363 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:372 msgid "Save WMS layer" msgstr "WMS レイヤーを保存" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:387 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:396 msgid "Load WMS layer from file" msgstr "WMSレイヤーをファイルから読み込む" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:391 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:400 msgid "Load WMS layer" msgstr "WMS レイヤーをロード" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:411 #, java-format msgid "Unsupported WMS file version; found {0}, expected {1}" msgstr "未サポートの WMSファイルのバージョン; 発見 {0}, 予想 {1}" -#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:403 +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412 msgid "File Format Error" msgstr "ファイルフォーマットエラー" + +#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445 +#, fuzzy +msgid "Set WMS Bookmark" +msgstr "ブックマークを作成" #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172 @@ -27304,8 +27359,7 @@ #. node : I : amenity == /restaurant|cafe|fast_food/ && name != * #. way : I : highway != * && railway != * && waterway != * && name == * # unusual named way type -#. * : W : natural == water && waterway == * +#. * : W : natural == water && waterway == * # unusual tag combination #. * : W : highway == * && waterway == * -#: build/trans_validator.java:77 build/trans_validator.java:78 -#: build/trans_validator.java:79 +#: build/trans_validator.java:78 build/trans_validator.java:79 msgid "unusual tag combination" msgstr "通常無いタグの組み合わせ" @@ -27325,34 +27379,23 @@ #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg& -#. fails with division by zero error -#: build/trans_wms.java:8 -msgid "NPE Maps" -msgstr "NPEマップ" - -#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& -#: build/trans_wms.java:9 -msgid "NPE Maps (Tim)" -msgstr "NPEマップ(Tim)" - -#. http://dev.openstreetmap.org/~timsc/wms2/map.php? #. #. different forms for web access #. must be html: -#: build/trans_wms.java:13 +#: build/trans_wms.java:10 msgid "Yahoo Sat" msgstr "Yahoo 衛星" #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html? -#: build/trans_wms.java:14 +#: build/trans_wms.java:11 msgid "OpenStreetMap" msgstr "OpenStreetMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html? -#: build/trans_wms.java:15 +#: build/trans_wms.java:12 msgid "OpenCycleMap" msgstr "OpenCycleMap" #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html? -#: build/trans_wms.java:16 +#: build/trans_wms.java:13 msgid "TilesAtHome" msgstr "TilesAtHome" @@ -27362,9 +27405,12 @@ #. #. only for Germany -#: build/trans_wms.java:20 +#: build/trans_wms.java:17 msgid "Streets NRW Geofabrik.de" msgstr "Streets NRW Geofabrik.de" #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms? +#. +#. +#. only for North America #. Terraserver USCG - High resolution maps #: build/trans_wms.java:22 @@ -27378,34 +27424,858 @@ #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg& +#. +#. #. only for Czech Republic -#: build/trans_wms.java:25 +#: build/trans_wms.java:27 msgid "Czech CUZK:KM" msgstr "チェコ CUZK:KM" #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE& -#: build/trans_wms.java:26 +#: build/trans_wms.java:28 msgid "Czech UHUL:ORTOFOTO" msgstr "チェコ UHUL:ORTOFOTO" +#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE& +#. +#. +#. only for GB +#. fails with division by zero error +#: build/trans_wms.java:33 +msgid "NPE Maps" +msgstr "NPEマップ" + +#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe& +#: build/trans_wms.java:34 +msgid "NPE Maps (Tim)" +msgstr "NPEマップ(Tim)" + +#. http://dev.openstreetmap.org/~timsc/wms2/map.php? +#: build/trans_wms.java:35 +msgid "7th Series (OS7)" +msgstr "" + +#. http://ooc.openstreetmap.org/wms/map.php?source=os7& +#. +#. +#. only for Japan +#: build/trans_wms.java:39 +msgid "MLIT Japan (ORTHO)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:40 +msgid "MLIT Japan (ORTHO01)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:41 +msgid "MLIT Japan (ORTHO02)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#: build/trans_wms.java:42 +msgid "MLIT Japan (ORTHO03)" +msgstr "" + +#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF +#. +#. +#. only for Italy +#: build/trans_wms.java:46 +msgid "Lodi - Italy" +msgstr "" + +#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE& +#: build/trans_wms.java:47 +msgid "Sicily - Italy" +msgstr "" + +#~ msgid "Lambert Zone 2 cache file (.2)" +#~ msgstr "Lambert Zone 2 cache file (.2)" + +#~ msgid "Lambert Zone 3 cache file (.3)" +#~ msgstr "Lambert Zone 3 cache file (.3)" + +#~ msgid "Lambert Zone 4 cache file (.4)" +#~ msgstr "Lambert Zone 4 cache file (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 2 cache file (.CC2)" +#~ msgstr "Lambert Zone 2 cache file (.2)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 3 cache file (.CC3)" +#~ msgstr "Lambert Zone 3 cache file (.3)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 4 cache file (.CC4)" +#~ msgstr "Lambert Zone 4 cache file (.4)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 5 cache file (.CC5)" +#~ msgstr "Lambert Zone 1 cache file (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 6 cache file (.CC6)" +#~ msgstr "Lambert Zone 1 cache file (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 7 cache file (.CC7)" +#~ msgstr "Lambert Zone 1 cache file (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 8 cache file (.CC8)" +#~ msgstr "Lambert Zone 1 cache file (.1)" + +#, fuzzy +#~ msgid "Lambert CC9 Zone 9 cache file (.CC9)" +#~ msgstr "Lambert Zone 1 cache file (.1)" + +#~ msgid "null detected in node list" +#~ msgstr "ノードリストにヌルが見つかりました" + +#~ msgid "" +#~ "IMPORTANT : data positioned far away from\n" +#~ "the current Lambert zone limits.\n" +#~ "Do not upload any data after this message.\n" +#~ "Undo your last action, save your work\n" +#~ "and start a new layer on the new zone." +#~ msgstr "" +#~ "重要：データは、現在のランベルト図法のゾーン制限\n" +#~ "の外にあります。\n" +#~ "このメッセージ以降、データのアップロードを中止します。\n" +#~ "最後に行った操作を取り消して、作業内容を保存し、\n" +#~ "新しいレイヤーを新しいゾーンで開始してください。" + +#~ msgid "Edit Properties" +#~ msgstr "プロパティの編集" + +#~ msgid "Linked" +#~ msgstr "リンク済み" + +#~ msgid "" +#~ "Failed to close changeset ''{0}'' on the OSM server ''{1}''.
The " +#~ "changeset will automatically be closed by the server after a timeout." +#~ msgstr "" +#~ "OSM サーバ ''{1}'' 上の変更セット ''{0}'' を閉じられませんでした。" +#~ "
変更セットはタイムアウト後にサーバによって自動的に閉じられます。" + +#~ msgid "Move" +#~ msgstr "移動" + +#~ msgid "File could not be found." +#~ msgstr "ファイルは存在しませんでした。" + +#~ msgid "No data imported." +#~ msgstr "データーはインポートされませんでした。" + +#~ msgid "Data Layer" +#~ msgstr "データレイヤー" + +#~ msgid "Select a bookmark first." +#~ msgstr "最初にブックマークを選択してください、" + +#~ msgid "Please enter the desired coordinates first." +#~ msgstr "最初に目的の座標を入力してください。" + +#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." +#~ msgstr "ズームやパンにマウスやCtrl+Arrow キー/./を使います。" + +#~ msgid "Date" +#~ msgstr "日付" + +#~ msgid "Cannot connect to server." +#~ msgstr "サーバに接続できません。" + +#~ msgid "Click Reload to refresh list" +#~ msgstr "リストを更新するために再読込のクリック" + +#~ msgid "Refresh the selection list." +#~ msgstr "選択したリストを更新する。" + +#~ msgid "Commit comment" +#~ msgstr "コメントを反映します" + +#~ msgid "Server does not support changesets" +#~ msgstr "サーバは変更した設定をサポートしていません" + +#~ msgid "Unsaved Changes" +#~ msgstr "保存されていない変更" + +#~ msgid "Open in Browser" +#~ msgstr "ブラウザで開く" + +#~ msgid "JOSM Online Help" +#~ msgstr "JOSMオンラインヘルプ" + +#~ msgid "{0} Plugin successfully updated. Please restart JOSM." +#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." +#~ msgstr[0] "" +#~ "プラグイン{0}のアップデートに成功しました。JOSMを再起動してください。" + +#~ msgid "" +#~ "The plugin {0} seems to be broken or could not be downloaded " +#~ "automatically." +#~ msgstr "" +#~ "プラグイン {0}が壊れているか、自動的にダウンロードできないようです。" + +#~ msgid "Could not download plugin: {0} from {1}" +#~ msgstr "{1}からプラグイン: {0}をダウンロードできません" + +#~ msgid "Plugin requires JOSM update: {0}." +#~ msgstr "プラグインはJPSMのアップデートを要求しています: {0}" + +#~ msgid "Found element in non-way." +#~ msgstr "ウエイ以外で要素が見つかりました" + +#~ msgid "Unknown version" +#~ msgstr "バージョン番号は不明です" + +#~ msgid "" +#~ "Server returned internal error. Try a reduced area or retry after waiting " +#~ "some time." +#~ msgstr "" +#~ "サーバが内部エラーを返しました。しばらく待ってから試すか、領域指定を縮小し" +#~ "て試してください。" + +#~ msgid "Found element in non-relation." +#~ msgstr "要素がリレーション以外に見つかりました" + +#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" +#~ msgstr "存在しないノードを含むため、ウエイ {0} をスキップします\n" + +#~ msgid "Ill-formed node id" +#~ msgstr "III-形式のノードID" + +#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" +#~ msgstr "エラーのため転送が中断しました（５秒待ちます）：" + +#~ msgid "Hint: Some changes came from uploading new data to the server." +#~ msgstr "" +#~ "ヒント：変更の一部は、新しいデータをサーバにアップロードすることで現れま" +#~ "す。" + +#~ msgid "Please enter a search string" +#~ msgstr "検索文字列を入力してください" + +#~ msgid "Cannot read place search results from server" +#~ msgstr "地名検索結果をサーバから読み取ることができませんでした" + +#~ msgid "name" +#~ msgstr "名前" + +#~ msgid "zoom" +#~ msgstr "ズーム" + +#~ msgid "Revert" +#~ msgstr "取り消す" + +#~ msgid "Layers: {0}" +#~ msgstr "レイヤー：{0}" + +#~ msgid " has zero ref" +#~ msgstr " はゼロ参照です。" + +#~ msgid "Contacting the OSM server..." +#~ msgstr "OSMサーバに接続…" + +#~ msgid "Authors: {0}" +#~ msgstr "作者: {0}" + +#~ msgid "Login name (email) to the OSM account." +#~ msgstr "OSMアカウントのログイン名（email)" + +#~ msgid "OSM username (email)" +#~ msgstr "OSMユーザ名（email）" + +#~ msgid "Error while parsing" +#~ msgstr "解析中にエラー" + +#~ msgid "File not found" +#~ msgstr "ファイルが見つかりません" + +#~ msgid "" +#~ "Plugin archive already available. Do you want to download the current " +#~ "version by deleting existing archive?\n" +#~ "\n" +#~ "{0}" +#~ msgstr "" +#~ "プラグインはすでに有効です。現在のプラグインを削除し、新しいバージョンをダ" +#~ "ウンロードしますか？\n" +#~ "{0}" + +#~ msgid "Plugin already exists" +#~ msgstr "プラグインはすでに存在しています" + +#~ msgid "Error deleting plugin file: {0}" +#~ msgstr "Error deleting plugin file: {0}" + +#~ msgid "Rotate" +#~ msgstr "回転" + +#~ msgid "Change" +#~ msgstr "更新" + +#~ msgid "Delete {1} {0}" +#~ msgstr "削除 {1} {0}" + +#~ msgid "true" +#~ msgstr "真" + +#~ msgid "false" +#~ msgstr "偽" + +#~ msgid "position" +#~ msgstr "位置" + +#~ msgid "different" +#~ msgstr "差異" + +#~ msgid "Cannot open preferences directory: {0}" +#~ msgstr "情報ディレクトリを読み取れません: {0}" + +#~ msgid "EPSG:4326" +#~ msgstr "EPSG:4326" + +#~ msgid "Empty member in relation." +#~ msgstr "リレーションに登録すべきものがありません。" + +#~ msgid "Email" +#~ msgstr "Email" + +#~ msgid "unnamed" +#~ msgstr "名前なし" + +#~ msgid "Only two nodes allowed" +#~ msgstr "二つだけのノード選択が許されています" + +#~ msgid "Only one node selected" +#~ msgstr "ただ一つだけのノードが選択されています。" + +#~ msgid "Import TCX File..." +#~ msgstr "TCXファイルをインポート" + +#~ msgid "Show Tile Status" +#~ msgstr "タイルの状態を表示" + +#~ msgid "Request Update" +#~ msgstr "要求の更新" + +#~ msgid "error loading metadata" +#~ msgstr "メタデータの読み込みエラー" + +#~ msgid "requested: {0}" +#~ msgstr "要求: {0}" + +#~ msgid "error requesting update" +#~ msgstr "アップデート要求時にエラー" + +#~ msgid "Select Tableau d'Assemblage" +#~ msgstr "Tableau d'Assemblageを選択" + +#~ msgid "Public" +#~ msgstr "公開" + +#~ msgid "Show Author Panel" +#~ msgstr "作者パネルを表示" + +#~ msgid "Open User Page" +#~ msgstr "ユーザページを開く" + +#~ msgid "Open User Page in browser" +#~ msgstr "ブラウザでユーザページを開く" + +#~ msgid "Select User's Data" +#~ msgstr "ユーザのデータを選択" + +#~ msgid "Please select some data" +#~ msgstr "データを選択してください" + +#~ msgid "help" +#~ msgstr "ヘルプ" + +#~ msgid "Help / About" +#~ msgstr "ヘルプ/情報" + +#~ msgid "WMS Plugin Help" +#~ msgstr "WMSプラグイン　ヘルプ" + +#~ msgid "Navigation" +#~ msgstr "ナビゲーション" + +#~ msgid "YAHOO (GNOME)" +#~ msgstr "YAHOO (GNOME)" + +#~ msgid "YAHOO (WebKit)" +#~ msgstr "YAHOO (WebKit)" + +#~ msgid "Oberpfalz Geofabrik.de" +#~ msgstr "Oberpfalz Geofabrik.de" + +# http://en.wikipedia.org/wiki/Draw_bridge +#~ msgid "Drawbridge" +#~ msgstr "跳ね橋" + +# http://en.wikipedia.org/wiki/Portcullis +#~ msgid "Portcullis" +#~ msgstr "城の格子戸" + +#~ msgid "Station" +#~ msgstr "駅" + +#~ msgid "Edit Station" +#~ msgstr "駅の編集" + +#~ msgid "map" +#~ msgstr "マップ" + +#~ msgid "citymap" +#~ msgstr "街路地図" + +#~ msgid "hikingmap" +#~ msgstr "ハイキングマップ" + +#~ msgid "bicyclemap" +#~ msgstr "自転車マップ" + +#~ msgid "sports" +#~ msgstr "スポーツ店" + +#~ msgid "Tags (empty value deletes tag)" +#~ msgstr "タグ（空の値でタグ自身を削除）" + +#~ msgid "Add all currently selected objects as members" +#~ msgstr "現在選択されている全てのオブジェクトをメンバーとして追加" + +#~ msgid "Remove the member in the current table row from this relation" +#~ msgstr "この関連から現在の行のメンバーを削除" + +#~ msgid "Error parsing server response." +#~ msgstr "サーバからの応答内容が不正です。" + +#~ msgid "Object" +#~ msgstr "オブジェクト" + +#~ msgid "" +#~ "Revert the state of all currently selected objects to the version " +#~ "selected in the history list." +#~ msgstr "" +#~ "現在選択している全てのオブジェクトの状態を、ヒストリーの選択したバージョン" +#~ "へと戻します。" + +#~ msgid "Tagging preset source" +#~ msgstr "事前に設定した情報源をタグ付け" + +#~ msgid "Tagging preset sources" +#~ msgstr "事前設定の情報源をタグ付け" + +#~ msgid "my version:" +#~ msgstr "私のバージョン:" + +#~ msgid "their version:" +#~ msgstr "相手のバージョン:" + +#~ msgid "resolved version:" +#~ msgstr "解決したバージョン:" + +#~ msgid "Unknown file extension." +#~ msgstr "ファイルの拡張子が不明です" + +#~ msgid "Import TCX file as GPS track" +#~ msgstr "TCXファイルをTCXファイルとしてインポート" + +#~ msgid "Validate" +#~ msgstr "検証" + +#~ msgid "Validate either current selection or complete dataset." +#~ msgstr "現在の選択か、全てのデータ一式の検証" + +#~ msgid "Open a layer first (GPX, OSM, cache)" +#~ msgstr "レイヤーを最初に開く(GPX, OSM, cache)" + +#~ msgid "Please select the row to copy." +#~ msgstr "コピーする列を選択してください。" + +#~ msgid "board" +#~ msgstr "board" + +#~ msgid "History of Element" +#~ msgstr "要素の履歴" + +#~ msgid "Error while loading page {0}" +#~ msgstr "ページ{0}を読み込む際にエラーが発生しました。" + +#~ msgid "Use preset ''{0}'' of group ''{1}''" +#~ msgstr "グループ \"{1}\"のプリセット\"{0}\"を使います" + +#~ msgid "Use preset ''{0}''" +#~ msgstr "プリセット \"{0}\"を使います" + +#~ msgid "Remove Selected" +#~ msgstr "選択の削除" + +#~ msgid "Basic" +#~ msgstr "基本" + +#~ msgid "rectifier id={0}" +#~ msgstr "修正子 ID={0}" + +#~ msgid "All the ways were empty" +#~ msgstr "ウェイが全て空です。" + +#~ msgid "Please select at least one task to download" +#~ msgstr "ダウンロードするタスクを少なくとも一つ選んでください。" + +#~ msgid "viaduct" +#~ msgstr "高架橋" + +#~ msgid "Charge" +#~ msgstr "料金" + +#~ msgid "" +#~ "The plugin could not be removed. Please tell the people you got JOSM from " +#~ "about the problem." +#~ msgstr "" +#~ "プラグインを削除できませんでした。JOSMを入手した方に問題を報告してくださ" +#~ "い。" + +#~ msgid "" +#~ "The projection \"{0}\" is designed for\n" +#~ "latitudes between 46.1° and 57° only.\n" +#~ "Use another projection system if you are not using\n" +#~ "a French WMS server.\n" +#~ "Do not upload any data after this message." +#~ msgstr "" +#~ "投影法\"{0}\"は、緯度が46.1°から57°の\n" +#~ "間で使われるように設計されています。\n" +#~ "フランスのWMSサーバをつかうのではなければ、\n" +#~ "ほかの投影法を使用してください。\n" +#~ "本メッセージ後は、データのアップロードはやめてください。" + +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "" +#~ "選択したウェイは、それぞれ異なった関連へ含まれています。それでも、結合しま" +#~ "すか？" + +#~ msgid "Combine ways with different memberships?" +#~ msgstr "異なるメンバーであるウェイを結合しますか？" + +#~ msgid "No document open so nothing to save." +#~ msgstr "一つも開かれたデータがありませんんで、保存されません。" + +#~ msgid "Please select one or more closed ways of at least four nodes." +#~ msgstr "" +#~ "少なくとも４ノードからなる閉じたウェイを、一つ以上選択してください。" + +#~ msgid "Metacarta Map Rectifier image id" +#~ msgstr "Metacarta Map Rectifier image id" + +#~ msgid "Open the OpenStreetBugs window and activate the automatic download" +#~ msgstr "OpenStreetBugsウインドウを開き、自動ダウンロードを行います。" + +#~ msgid "" +#~ "WARNING: The password is stored in plain text in the preferences " +#~ "file.
The password is transfered in plain text to the server, encoded " +#~ "in the URL.
Do not use a valuable Password." +#~ msgstr "" +#~ "警告：パスワードは平文で設定ファイルに格納されます。
パスワード" +#~ "は、URLに付加されて平文でサーバに送信されます。
他で使用しているパス" +#~ "ワードは使用しないでください。" + +#~ msgid "" +#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " +#~ "move mouse. Select: Click." +#~ msgstr "" +#~ "ズーム:マウスのホイールか、ダブルクリック。地図の移動：右マウスボタンを押" +#~ "した状態で移動させる。選択：クリック。" + +#~ msgid "Occupied By" +#~ msgstr "次によって占められる;" + +#~ msgid "Add either site-josm.xml or Wiki Pages." +#~ msgstr "site-josm.xmlかWikiページを追加する。" + +#~ msgid "Delete and Download" +#~ msgstr "削除とダウンロード" + +#~ msgid "" +#~ "The sources (URL or filename) of tagging preset definition files. See " +#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." +#~ msgstr "" +#~ "タグ付けのソース(URL やファイル名)が、定義ファイルに設定してあります。詳し" +#~ "くは、http://josm.openstreetmap.de/wiki/TaggingPresets を見てください。" + +#~ msgid "{0} object has conflicts:" +#~ msgid_plural "{0} objects have conflicts:" +#~ msgstr[0] "{0} 個のオブジェクトが競合しています:" + +#~ msgid "Conflicting relation" +#~ msgstr "競合中のリレーション" + +#~ msgid "There were conflicts during import." +#~ msgstr "インポート中に競合を発見しました。" + +#~ msgid "Merging conflicts." +#~ msgstr "競合点の統合" + +#~ msgid "Conflicts: {0}" +#~ msgstr "競合: {0}" + +#~ msgid "Move Down" +#~ msgstr "下に移動" + +#~ msgid "Relation Editor: {0}" +#~ msgstr "関連の編集者:{0}" + +#~ msgid "Move Up" +#~ msgstr "上に移動" + +#~ msgid "Add a new tagging preset source to the list." +#~ msgstr "新しいタグプリセット源をリストに追加する。" + +#~ msgid "Some of the nodes are (almost) in the line" +#~ msgstr "ノードの一部は（ほぼ）一直線上にある" + +#~ msgid "Update Data" +#~ msgstr "データの更新" + +# http://en.wikipedia.org/wiki/Draw_bridge +#~ msgid "Edit Drawbridge" +#~ msgstr "跳ね橋の編集" + +#~ msgid "Merge Anyway" +#~ msgstr "強制的に結合" + +#~ msgid "" +#~ "The selected nodes have differing relation memberships. Do you still " +#~ "want to merge them?" +#~ msgstr "" +#~ "選択したノードは、異なった関連に属しています。それでも、結合しますか？" + +#~ msgid "Merge nodes with different memberships?" +#~ msgstr "異なったメンバーになっているノードを結合しますか？" + +#~ msgid "" +#~ "Internal Error: cannot check conditions for no layer. Please report this " +#~ "as a bug." +#~ msgstr "" +#~ "内部エラー：レイヤーのないところで条件チェックはできません。バグとして報告" +#~ "してください。" + +#~ msgid "Combine Anyway" +#~ msgstr "強制的に連結。" + +#~ msgid "Please select ways with almost right angles to orthogonalize." +#~ msgstr "ほぼ垂直になっているウェイを選択してください。" + +#~ msgid "" +#~ "Please select at least one node, way or relation. Only already uploaded " +#~ "elements have a history." +#~ msgstr "" +#~ "少なくとも1つはノード・ウェイ・リレーションを選択してください。既にアップ" +#~ "ロードされた要素だけに遍歴があります。" + +#~ msgid "" +#~ "No data to update found. Have you already opened or downloaded a data " +#~ "layer?" +#~ msgstr "" +#~ "更新するデータは見つかりませんでした。もう既にデータレイヤーを開いている" +#~ "か、ダウンロードしましたか？" + +#~ msgid "" +#~ "This action will require {0} individual download requests. Do you wish to " +#~ "continue?" +#~ msgstr "この作業は、{0}回のダウンロードを実行します。続けますか？" + +#~ msgid "Upload to OSM..." +#~ msgstr "OSMにアップロード" + +#~ msgid "Sorry, doesn't work with anonymous users" +#~ msgstr "申し訳ありません。匿名のユーザでは利用できません。" + +#~ msgid "Invalid projection" +#~ msgstr "投影法が無効" + +#~ msgid "Replaces Selection with Users data" +#~ msgstr "ユーザデータを選択したものに置き替えます。" + +#~ msgid "Please choose a user using the author panel" +#~ msgstr "著作者パネルを使用してユーザを選んでください。" + +#~ msgid "Continue anyway" +#~ msgstr "とりあえず続ける" + +#~ msgid "Change the projection to {0} first." +#~ msgstr "最初に投影法を {0} に変えてください。" + +#~ msgid "Directly load TCX files from JOSM." +#~ msgstr "直接JOSMからのTCXファイルをロードしてください。" + +#~ msgid "" +#~ "An error occured while trying to match the photos to the GPX track. You " +#~ "can adjust the sliders to manually match the photos." +#~ msgstr "" +#~ "GPXトラックに写真を合わせようとしているときにエラーが起きました。スライ" +#~ "ダーを調整して、手動で写真に合わせることができます。" + +#~ msgid "Map Type" +#~ msgstr "マップタイプ" + +#~ msgid "Edit Information Office" +#~ msgstr "案内所の編集" + +#~ msgid "Remove route nodes" +#~ msgstr "ルートノードの削除" + +#~ msgid "Edit Portcullis" +#~ msgstr "城の格子戸の編集" + +#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" +#~ msgstr "" +#~ "Metacarta's Map Rectifier WMS から 幾何補正されたイメージのダウンロード" + +#~ msgid "Really mark this issue as ''done''?" +#~ msgstr "本当に、この問題を“処理済み”としてマークしますか？" + +#~ msgid "YAHOO (WebKit GTK)" +#~ msgstr "米Yahoo (WebKit GTK)" + +#~ msgid "YAHOO (GNOME Fix)" +#~ msgstr "米Yahoo (GNOME Fix)" + +#~ msgid "Image with path {0} does not exist or is not readable." +#~ msgstr "パス {0} にあるイメージは存在しないか、読めません。" + +#~ msgid "" +#~ "The projection \"{0}\" is designed for\n" +#~ "latitudes between 45.7° and 47.9°\n" +#~ "and longitutes between 5.7° and 10.6° only.\n" +#~ "Use another projection system if you are not working\n" +#~ "on a data set of Switzerland or Liechtenstein.\n" +#~ "Do not upload any data after this message." +#~ msgstr "" +#~ "投影法 \"{0}\" は、\n" +#~ "緯度 45.7°から 47.9°で\n" +#~ "経度 5.7°から 10.6°まで用です。\n" +#~ "スイスかリヒテンシュタインのデータセットを使う訳でなければ、\n" +#~ "違う投影系を使ってください。\n" +#~ "このメッセージ以降のデータはアップロードしないでください。" + +#~ msgid "Version number missing from OSM data" +#~ msgstr "OSMデータにバージョン番号が欠けています。" + +#~ msgid "Data upload failed for unknown reason" +#~ msgstr "不明な理由でデータのアップロードに失敗しました。" + +#~ msgid "Cannot read numeric value from response" +#~ msgstr "応答から数値を読み取れません。" + +#~ msgid "Selected makes your trace public in openstreetmap.org" +#~ msgstr "選択したあなたのトレースは、openstreetmap.orgに公開されます。" + +#~ msgid "" +#~ "(You can change the number of days after which this warning appears
by " +#~ "setting the config option 'pluginmanager.warntime'.)" +#~ msgstr "" +#~ "（この警告が何日で表示されるかは
設定オプションの'pluginmanager." +#~ "warntime'を編集することで変更できます）" + +#~ msgid "" +#~ "WARNING: launching browser windows for the first {0} of {1} selected " +#~ "primitives only" +#~ msgstr "" +#~ "警告：ブラウザウインドウを開くのは、選択したプリミティブの{1}のうち、最初" +#~ "の{0}だけです。" + +#~ msgid "Download referrers..." +#~ msgstr "参照をダウンロード..." + +#~ msgid "" +#~ "There are unsaved changes in {0} layer. Discard the changes and continue?" +#~ msgid_plural "" +#~ "There are unsaved changes in {0} layers. Discard the changes and continue?" +#~ msgstr[0] "" +#~ "{0} のレイヤーに保存されていない変更があります。変更を無視して続けますか?" + +#~ msgid "Close current changeset" +#~ msgstr "現在の変更セットを閉じる" + +#~ msgid "Use a new changeset and close it" +#~ msgstr "新しい変更セットを使用して閉じる" + +#~ msgid "" +#~ "Select to upload the data using a new changeset and to leave the " +#~ "changeset open after the upload" +#~ msgstr "" +#~ "選択の上、新しい変更セットを使用してデータをアップロードし、アップロード後" +#~ "に変更セットを閉じる" + +#~ msgid "Use the existing changeset {0} and close it after upload" +#~ msgstr "既存の変更セット {0} を使用しアップロード後に閉じる" + +#~ msgid "" +#~ "Select to upload to the existing changeset {0} and to close the changeset " +#~ "after this upload" +#~ msgstr "" +#~ "選択の上、既存の変更セット {0} にアップロードし、アップロード後に変更セッ" +#~ "トを閉じる" + +#~ msgid "Use the existing changeset {0} and leave it open" +#~ msgstr "既存の変更セット {0} を使用し開いたままにしておく" + +#~ msgid "" +#~ "Select to upload to the existing changeset {0} and to leave the changeset " +#~ "open for further uploads" +#~ msgstr "" +#~ "選択の上、既存の変更セット {0} へアップロードし、さらにアップロードするた" +#~ "めに変更セットを開いておく" + +#~ msgid "Changeset {0} is unchanged. Skipping update." +#~ msgstr "変更セット {0} は変更されていません。更新をスキップします。" + +#~ msgid "No currently open changeset. Opening a new changeset..." +#~ msgstr "現在変更セットは開かれていません。新しい変更セットを開いています..." + +#~ msgid "Reusing existing changeset {0}" +#~ msgstr "既存の変更セット {0} を再利用しています" + +#~ msgid "" +#~ "Warning: could not reuse an existing changeset as requested. Opening a " +#~ "new one." +#~ msgstr "" +#~ "警告: 要求された既存の変更セットを再利用できません。新しく開いています。" + +#~ msgid "" +#~ "Failed to update changeset. Either there is no current changeset or the " +#~ "id of the current changeset is 0" +#~ msgstr "" +#~ "変更セットの更新に失敗しました。現在の変更セットが無いか、または現在の変更" +#~ "セットのIDが 0 です。" + +#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" +#~ msgstr "エラー　ヘッダ \"{0}\" は期待パターン \"{1}\" に一致しません" + +#~ msgid "Updates the currently selected primitives from the server" +#~ msgstr "サーバから現在選択されたプリミティブを更新" + +#~ msgid "Upload to OSM API failed" +#~ msgstr "OSM API へのアップロード失敗" + #~ msgid "Can't search because there is no loaded data." #~ msgstr "データがロードされていないので検索できません。" -#~ msgid "There's no primitive with version {0} in this history." -#~ msgstr "この履歴にはバージョン {0} のプリミティブはありません" - -#~ msgid "There's no version valid at date ''{0}'' in this history." -#~ msgstr "履歴の日付 ''{0}'' には有効なバージョンはありません" - -#~ msgid "No earliest version found. History is empty." -#~ msgstr "前のバージョンがありません。履歴は空です。" - -#~ msgid "No latest version found. History is empty." -#~ msgstr "最新のバージョンがありません。履歴は空です。" - -#~ msgid "No type found. History is empty." -#~ msgstr "種別が見つかりません。履歴は空です。" - -#~ msgid "Didn't find an primitive with id {0} in this dataset" -#~ msgstr "このデータセットには id {0} のプリミティブはありません" +#~ msgid "Conflict detected" +#~ msgstr "競合が検出されました" + +#~ msgid "" +#~ "Selection \"{0}\" is used by relation \"{1}\".
Delete from " +#~ "relation?" +#~ msgstr "" +#~ "選択 \"{0}\" はリレーション \"{1}\" で使用されています。
リレー" +#~ "ションから削除しますか？" #~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset" @@ -27413,18 +28283,156 @@ #~ "このデータセットには id {0} バージョン {1} のプリミティブはありません" +#~ msgid "Primitive already deleted" +#~ msgstr "プリミティブは削除済み" + +#~ msgid "" +#~ "Uploading failed because a primitive you tried " +#~ "to
delete on the server is already deleted.

The error message " +#~ "is:
{0}" +#~ msgstr "" +#~ "アップロード 失敗 サーバから削除しようとしたプリミ" +#~ "ティブは既に削除されています。

エラーメッセージ:
{0}" + +#~ msgid "not yet decided" +#~ msgstr "未決定です" + +#~ msgid "History item" +#~ msgstr "履歴アイテム" + +#~ msgid "parameter '{0}' must not be null" +#~ msgstr "パラメータ '{0}' はヌル以外でなければなりません" + +#~ msgid "Defaults (See tooltip for detailed information)" +#~ msgstr "デフォルト(詳細はツールチップ参照)" + +#~ msgid "Add a new XML source to the list." +#~ msgstr "リストに新しいXML ソースを追加。" + +#~ msgid "Copy defaults" +#~ msgstr "デフォルトをコピー" + +#~ msgid "Reached the end of the line" +#~ msgstr "ラインの終端に到達" + +#~ msgid "Reached a junction" +#~ msgstr "ジャンクションに到達" + +#~ msgid "Purging 1 primitive" +#~ msgstr "1 つのプリミティブを破棄" + +#~ msgid "" +#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}." +#~ "
Delete from relation?" +#~ msgstr "" +#~ "選択 \"{0}\" は、リレーション \"{1}\" のロール {2}で使用されていま" +#~ "す。
リレーションから削除しますか?" + +#~ msgid "removing reference from way {0}" +#~ msgstr "ウェイ {0}から、参照を取り除く" + +#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." +#~ msgstr "" +#~ "リレーション {1} のメンバー {0} に予期しない \"type\"、 {2} を受け取りまし" +#~ "た。" + #~ msgid "Select a starting node on the end of a way" #~ msgstr "ウェイ終端の開始ノードを選択" -#~ msgid "Reached the end of the line" -#~ msgstr "ラインの終端に到達" - -#~ msgid "Reached a junction" -#~ msgstr "ジャンクションに到達" - -#~ msgid "help" -#~ msgstr "ヘルプ" - -#~ msgid "Help / About" -#~ msgstr "ヘルプ/情報" +#~ msgid "The XML source (URL or filename) for {0} definition files." +#~ msgstr "{0} 定義ファイル用XML ソース(URL またはファイル名)。" + +#~ msgid "unsupported value ''{0}'' or parameter ''{1}''" +#~ msgstr "サポートされていない値 ''{0}''またはパラメータ ''{1}''" + +#~ msgid "paramete''{0}'' must not be null" +#~ msgstr "パラメータ''{0}'' はヌルでなければなりません" + +#~ msgid "Missing mandatory attribute ''{0}''" +#~ msgstr "必要な属性 ''{0}'' がありません" + +#~ msgid "Replace" +#~ msgstr "置換" + +#~ msgid "" +#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " +#~ "found." +#~ msgstr "" +#~ "JOSM が想定外のバージョンです。Main.ds および Main.getCurrentDataSet() が" +#~ "見つかりません。" + +#~ msgid "Help page missing. Create it in English." +#~ msgstr "" +#~ "ヘルプページがありません。英語で作成してください。" + +#~ msgid "" +#~ "Help page missing. Create it in English or your language." +#~ msgstr "" +#~ "ヘルプページがありません。英語 または " +#~ "あなたの言語で作成してください。" + +#~ msgid "Didn't find an primitive with id {0} in this dataset" +#~ msgstr "このデータセットには id {0} のプリミティブはありません" + +#~ msgid "Helppage missing. Create it in English." +#~ msgstr "" +#~ "ヘルプページがありません。英語でそれを作成してくださ" +#~ "い。" + +#~ msgid "" +#~ "Helppage missing. Create it in English or your language." +#~ msgstr "" +#~ "ヘルプページがありません。英語もしくは" +#~ "あなたの母国語でそれを作成してください。" + +#~ msgid "Unexpected return value. Got {0}." +#~ msgstr "予期せぬ値が返って来ました。 {0} を受けとりました。" + +#~ msgid "There's no primitive with version {0} in this history." +#~ msgstr "この履歴にはバージョン {0} のプリミティブはありません" + +#~ msgid "There's no version valid at date ''{0}'' in this history." +#~ msgstr "履歴の日付 ''{0}'' には有効なバージョンはありません" + +#~ msgid "No earliest version found. History is empty." +#~ msgstr "前のバージョンがありません。履歴は空です。" + +#~ msgid "No latest version found. History is empty." +#~ msgstr "最新のバージョンがありません。履歴は空です。" + +#~ msgid "Index out of bounds. Got {0}." +#~ msgstr "範囲外のインデックス。{0} を受け取りました" + +#~ msgid "Display the history of the selected primitive." +#~ msgstr "選択されたプリミティブの履歴を表示" + +#~ msgid "" +#~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''." +#~ msgstr "int 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました" + +#~ msgid "" +#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got " +#~ "''{1}''." +#~ msgstr "int 型(>=0)の必須属性 {0} に不正な値、 ''{1}'' を受け取りました" + +#~ msgid "Preset group ''{0}'' of group ''{1}''" +#~ msgstr "プリセットのグループ ''{1}'' のグループ ''{0}''" + +#~ msgid "" +#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back " +#~ "to default geometry. Details: {1}" +#~ msgstr "" +#~ "キー ''{0}'' からの window geometry の復元に失敗しました。デフォルトの" +#~ "geometry にフォールバックします。詳細: {1}" + +#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)" +#~ msgstr "ランベルトzone を手動設定 (例：２つのゾーン間の位置用)" + +#~ msgid "Processing {0}" +#~ msgstr "{0} 実行中" + +#~ msgid "Relation: from {0} to {1} via {2}" +#~ msgstr "リレーション: {0} から {1} まで {2} 経由" #~ msgid "" @@ -27474,840 +28482,4 @@ #~ "い。" -#~ msgid "WMS Plugin Help" -#~ msgstr "WMSプラグイン　ヘルプ" - -#~ msgid "Move" -#~ msgstr "移動" - -#~ msgid "File could not be found." -#~ msgstr "ファイルは存在しませんでした。" - -#~ msgid "No data imported." -#~ msgstr "データーはインポートされませんでした。" - -#~ msgid "Data Layer" -#~ msgstr "データレイヤー" - -#~ msgid "Select a bookmark first." -#~ msgstr "最初にブックマークを選択してください、" - -#~ msgid "Please enter the desired coordinates first." -#~ msgstr "最初に目的の座標を入力してください。" - -#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan." -#~ msgstr "ズームやパンにマウスやCtrl+Arrow キー/./を使います。" - -#~ msgid "Date" -#~ msgstr "日付" - -#~ msgid "Cannot connect to server." -#~ msgstr "サーバに接続できません。" - -#~ msgid "Click Reload to refresh list" -#~ msgstr "リストを更新するために再読込のクリック" - -#~ msgid "Refresh the selection list." -#~ msgstr "選択したリストを更新する。" - -#~ msgid "Commit comment" -#~ msgstr "コメントを反映します" - -#~ msgid "Server does not support changesets" -#~ msgstr "サーバは変更した設定をサポートしていません" - -#~ msgid "Unsaved Changes" -#~ msgstr "保存されていない変更" - -#~ msgid "Open in Browser" -#~ msgstr "ブラウザで開く" - -#~ msgid "JOSM Online Help" -#~ msgstr "JOSMオンラインヘルプ" - -#~ msgid "{0} Plugin successfully updated. Please restart JOSM." -#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM." -#~ msgstr[0] "" -#~ "プラグイン{0}のアップデートに成功しました。JOSMを再起動してください。" - -#~ msgid "" -#~ "The plugin {0} seems to be broken or could not be downloaded " -#~ "automatically." -#~ msgstr "" -#~ "プラグイン {0}が壊れているか、自動的にダウンロードできないようです。" - -#~ msgid "Could not download plugin: {0} from {1}" -#~ msgstr "{1}からプラグイン: {0}をダウンロードできません" - -#~ msgid "Plugin requires JOSM update: {0}." -#~ msgstr "プラグインはJPSMのアップデートを要求しています: {0}" - -#~ msgid "Found element in non-way." -#~ msgstr "ウエイ以外で要素が見つかりました" - -#~ msgid "Unknown version" -#~ msgstr "バージョン番号は不明です" - -#~ msgid "" -#~ "Server returned internal error. Try a reduced area or retry after waiting " -#~ "some time." -#~ msgstr "" -#~ "サーバが内部エラーを返しました。しばらく待ってから試すか、領域指定を縮小し" -#~ "て試してください。" - -#~ msgid "Found element in non-relation." -#~ msgstr "要素がリレーション以外に見つかりました" - -#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n" -#~ msgstr "存在しないノードを含むため、ウエイ {0} をスキップします\n" - -#~ msgid "Ill-formed node id" -#~ msgstr "III-形式のノードID" - -#~ msgid "Transfer aborted due to error (will wait for 5 seconds):" -#~ msgstr "エラーのため転送が中断しました（５秒待ちます）：" - -#~ msgid "Hint: Some changes came from uploading new data to the server." -#~ msgstr "" -#~ "ヒント：変更の一部は、新しいデータをサーバにアップロードすることで現れま" -#~ "す。" - -#~ msgid "Please enter a search string" -#~ msgstr "検索文字列を入力してください" - -#~ msgid "Cannot read place search results from server" -#~ msgstr "地名検索結果をサーバから読み取ることができませんでした" - -#~ msgid "name" -#~ msgstr "名前" - -#~ msgid "zoom" -#~ msgstr "ズーム" - -#~ msgid "Revert" -#~ msgstr "取り消す" - -#~ msgid "Layers: {0}" -#~ msgstr "レイヤー：{0}" - -#~ msgid " has zero ref" -#~ msgstr " はゼロ参照です。" - -#~ msgid "Contacting the OSM server..." -#~ msgstr "OSMサーバに接続…" - -#~ msgid "Authors: {0}" -#~ msgstr "作者: {0}" - -#~ msgid "Login name (email) to the OSM account." -#~ msgstr "OSMアカウントのログイン名（email)" - -#~ msgid "OSM username (email)" -#~ msgstr "OSMユーザ名（email）" - -#~ msgid "Error while parsing" -#~ msgstr "解析中にエラー" - -#~ msgid "File not found" -#~ msgstr "ファイルが見つかりません" - -#~ msgid "" -#~ "Plugin archive already available. Do you want to download the current " -#~ "version by deleting existing archive?\n" -#~ "\n" -#~ "{0}" -#~ msgstr "" -#~ "プラグインはすでに有効です。現在のプラグインを削除し、新しいバージョンをダ" -#~ "ウンロードしますか？\n" -#~ "{0}" - -#~ msgid "Plugin already exists" -#~ msgstr "プラグインはすでに存在しています" - -#~ msgid "Error deleting plugin file: {0}" -#~ msgstr "Error deleting plugin file: {0}" - -#~ msgid "Rotate" -#~ msgstr "回転" - -#~ msgid "Change" -#~ msgstr "更新" - -#~ msgid "Delete {1} {0}" -#~ msgstr "削除 {1} {0}" - -#~ msgid "true" -#~ msgstr "真" - -#~ msgid "false" -#~ msgstr "偽" - -#~ msgid "position" -#~ msgstr "位置" - -#~ msgid "different" -#~ msgstr "差異" - -#~ msgid "Cannot open preferences directory: {0}" -#~ msgstr "情報ディレクトリを読み取れません: {0}" - -#~ msgid "EPSG:4326" -#~ msgstr "EPSG:4326" - -#~ msgid "Empty member in relation." -#~ msgstr "リレーションに登録すべきものがありません。" - -#~ msgid "Email" -#~ msgstr "Email" - -#~ msgid "unnamed" -#~ msgstr "名前なし" - -#~ msgid "Only two nodes allowed" -#~ msgstr "二つだけのノード選択が許されています" - -#~ msgid "Only one node selected" -#~ msgstr "ただ一つだけのノードが選択されています。" - -#~ msgid "Import TCX File..." -#~ msgstr "TCXファイルをインポート" - -#~ msgid "Show Tile Status" -#~ msgstr "タイルの状態を表示" - -#~ msgid "Request Update" -#~ msgstr "要求の更新" - -#~ msgid "error loading metadata" -#~ msgstr "メタデータの読み込みエラー" - -#~ msgid "requested: {0}" -#~ msgstr "要求: {0}" - -#~ msgid "error requesting update" -#~ msgstr "アップデート要求時にエラー" - -#~ msgid "Select Tableau d'Assemblage" -#~ msgstr "Tableau d'Assemblageを選択" - -#~ msgid "Public" -#~ msgstr "公開" - -#~ msgid "Show Author Panel" -#~ msgstr "作者パネルを表示" - -#~ msgid "Open User Page" -#~ msgstr "ユーザページを開く" - -#~ msgid "Open User Page in browser" -#~ msgstr "ブラウザでユーザページを開く" - -#~ msgid "Select User's Data" -#~ msgstr "ユーザのデータを選択" - -#~ msgid "Please select some data" -#~ msgstr "データを選択してください" - -#~ msgid "Navigation" -#~ msgstr "ナビゲーション" - -#~ msgid "YAHOO (GNOME)" -#~ msgstr "YAHOO (GNOME)" - -#~ msgid "YAHOO (WebKit)" -#~ msgstr "YAHOO (WebKit)" - -#~ msgid "Oberpfalz Geofabrik.de" -#~ msgstr "Oberpfalz Geofabrik.de" - -# http://en.wikipedia.org/wiki/Draw_bridge -#~ msgid "Drawbridge" -#~ msgstr "跳ね橋" - -# http://en.wikipedia.org/wiki/Portcullis -#~ msgid "Portcullis" -#~ msgstr "城の格子戸" - -#~ msgid "Station" -#~ msgstr "駅" - -#~ msgid "Edit Station" -#~ msgstr "駅の編集" - -#~ msgid "map" -#~ msgstr "マップ" - -#~ msgid "citymap" -#~ msgstr "街路地図" - -#~ msgid "hikingmap" -#~ msgstr "ハイキングマップ" - -#~ msgid "bicyclemap" -#~ msgstr "自転車マップ" - -#~ msgid "sports" -#~ msgstr "スポーツ店" - -#~ msgid "Tags (empty value deletes tag)" -#~ msgstr "タグ（空の値でタグ自身を削除）" - -#~ msgid "Add all currently selected objects as members" -#~ msgstr "現在選択されている全てのオブジェクトをメンバーとして追加" - -#~ msgid "Remove the member in the current table row from this relation" -#~ msgstr "この関連から現在の行のメンバーを削除" - -#~ msgid "Error parsing server response." -#~ msgstr "サーバからの応答内容が不正です。" - -#~ msgid "Object" -#~ msgstr "オブジェクト" - -#~ msgid "" -#~ "Revert the state of all currently selected objects to the version " -#~ "selected in the history list." -#~ msgstr "" -#~ "現在選択している全てのオブジェクトの状態を、ヒストリーの選択したバージョン" -#~ "へと戻します。" - -#~ msgid "Tagging preset source" -#~ msgstr "事前に設定した情報源をタグ付け" - -#~ msgid "Tagging preset sources" -#~ msgstr "事前設定の情報源をタグ付け" - -#~ msgid "my version:" -#~ msgstr "私のバージョン:" - -#~ msgid "their version:" -#~ msgstr "相手のバージョン:" - -#~ msgid "resolved version:" -#~ msgstr "解決したバージョン:" - -#~ msgid "Unknown file extension." -#~ msgstr "ファイルの拡張子が不明です" - -#~ msgid "Import TCX file as GPS track" -#~ msgstr "TCXファイルをTCXファイルとしてインポート" - -#~ msgid "Validate" -#~ msgstr "検証" - -#~ msgid "Validate either current selection or complete dataset." -#~ msgstr "現在の選択か、全てのデータ一式の検証" - -#~ msgid "Open a layer first (GPX, OSM, cache)" -#~ msgstr "レイヤーを最初に開く(GPX, OSM, cache)" - -#~ msgid "Please select the row to copy." -#~ msgstr "コピーする列を選択してください。" - -#~ msgid "board" -#~ msgstr "board" - -#~ msgid "History of Element" -#~ msgstr "要素の履歴" - -#~ msgid "Error while loading page {0}" -#~ msgstr "ページ{0}を読み込む際にエラーが発生しました。" - -#~ msgid "Use preset ''{0}'' of group ''{1}''" -#~ msgstr "グループ \"{1}\"のプリセット\"{0}\"を使います" - -#~ msgid "Use preset ''{0}''" -#~ msgstr "プリセット \"{0}\"を使います" - -#~ msgid "Remove Selected" -#~ msgstr "選択の削除" - -#~ msgid "Basic" -#~ msgstr "基本" - -#~ msgid "rectifier id={0}" -#~ msgstr "修正子 ID={0}" - -#~ msgid "All the ways were empty" -#~ msgstr "ウェイが全て空です。" - -#~ msgid "Please select at least one task to download" -#~ msgstr "ダウンロードするタスクを少なくとも一つ選んでください。" - -#~ msgid "viaduct" -#~ msgstr "高架橋" - -#~ msgid "Charge" -#~ msgstr "料金" - -#~ msgid "" -#~ "The plugin could not be removed. Please tell the people you got JOSM from " -#~ "about the problem." -#~ msgstr "" -#~ "プラグインを削除できませんでした。JOSMを入手した方に問題を報告してくださ" -#~ "い。" - -#~ msgid "" -#~ "The projection \"{0}\" is designed for\n" -#~ "latitudes between 46.1° and 57° only.\n" -#~ "Use another projection system if you are not using\n" -#~ "a French WMS server.\n" -#~ "Do not upload any data after this message." -#~ msgstr "" -#~ "投影法\"{0}\"は、緯度が46.1°から57°の\n" -#~ "間で使われるように設計されています。\n" -#~ "フランスのWMSサーバをつかうのではなければ、\n" -#~ "ほかの投影法を使用してください。\n" -#~ "本メッセージ後は、データのアップロードはやめてください。" - -#~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want " -#~ "to combine them?" -#~ msgstr "" -#~ "選択したウェイは、それぞれ異なった関連へ含まれています。それでも、結合しま" -#~ "すか？" - -#~ msgid "Combine ways with different memberships?" -#~ msgstr "異なるメンバーであるウェイを結合しますか？" - -#~ msgid "No document open so nothing to save." -#~ msgstr "一つも開かれたデータがありませんんで、保存されません。" - -#~ msgid "Please select one or more closed ways of at least four nodes." -#~ msgstr "" -#~ "少なくとも４ノードからなる閉じたウェイを、一つ以上選択してください。" - -#~ msgid "Metacarta Map Rectifier image id" -#~ msgstr "Metacarta Map Rectifier image id" - -#~ msgid "Open the OpenStreetBugs window and activate the automatic download" -#~ msgstr "OpenStreetBugsウインドウを開き、自動ダウンロードを行います。" - -#~ msgid "" -#~ "WARNING: The password is stored in plain text in the preferences " -#~ "file.
The password is transfered in plain text to the server, encoded " -#~ "in the URL.
Do not use a valuable Password." -#~ msgstr "" -#~ "警告：パスワードは平文で設定ファイルに格納されます。
パスワード" -#~ "は、URLに付加されて平文でサーバに送信されます。
他で使用しているパス" -#~ "ワードは使用しないでください。" - -#~ msgid "" -#~ "Zoom: Mousewheel or double click. Move map: Hold right mousebutton and " -#~ "move mouse. Select: Click." -#~ msgstr "" -#~ "ズーム:マウスのホイールか、ダブルクリック。地図の移動：右マウスボタンを押" -#~ "した状態で移動させる。選択：クリック。" - -#~ msgid "Occupied By" -#~ msgstr "次によって占められる;" - -#~ msgid "Add either site-josm.xml or Wiki Pages." -#~ msgstr "site-josm.xmlかWikiページを追加する。" - -#~ msgid "Delete and Download" -#~ msgstr "削除とダウンロード" - -#~ msgid "" -#~ "The sources (URL or filename) of tagging preset definition files. See " -#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help." -#~ msgstr "" -#~ "タグ付けのソース(URL やファイル名)が、定義ファイルに設定してあります。詳し" -#~ "くは、http://josm.openstreetmap.de/wiki/TaggingPresets を見てください。" - -#~ msgid "{0} object has conflicts:" -#~ msgid_plural "{0} objects have conflicts:" -#~ msgstr[0] "{0} 個のオブジェクトが競合しています:" - -#~ msgid "Conflicting relation" -#~ msgstr "競合中のリレーション" - -#~ msgid "There were conflicts during import." -#~ msgstr "インポート中に競合を発見しました。" - -#~ msgid "Merging conflicts." -#~ msgstr "競合点の統合" - -#~ msgid "Conflicts: {0}" -#~ msgstr "競合: {0}" - -#~ msgid "Move Down" -#~ msgstr "下に移動" - -#~ msgid "Relation Editor: {0}" -#~ msgstr "関連の編集者:{0}" - -#~ msgid "Move Up" -#~ msgstr "上に移動" - -#~ msgid "Add a new tagging preset source to the list." -#~ msgstr "新しいタグプリセット源をリストに追加する。" - -#~ msgid "Some of the nodes are (almost) in the line" -#~ msgstr "ノードの一部は（ほぼ）一直線上にある" - -#~ msgid "Update Data" -#~ msgstr "データの更新" - -# http://en.wikipedia.org/wiki/Draw_bridge -#~ msgid "Edit Drawbridge" -#~ msgstr "跳ね橋の編集" - -#~ msgid "Merge Anyway" -#~ msgstr "強制的に結合" - -#~ msgid "" -#~ "The selected nodes have differing relation memberships. Do you still " -#~ "want to merge them?" -#~ msgstr "" -#~ "選択したノードは、異なった関連に属しています。それでも、結合しますか？" - -#~ msgid "Merge nodes with different memberships?" -#~ msgstr "異なったメンバーになっているノードを結合しますか？" - -#~ msgid "" -#~ "Internal Error: cannot check conditions for no layer. Please report this " -#~ "as a bug." -#~ msgstr "" -#~ "内部エラー：レイヤーのないところで条件チェックはできません。バグとして報告" -#~ "してください。" - -#~ msgid "Combine Anyway" -#~ msgstr "強制的に連結。" - -#~ msgid "Please select ways with almost right angles to orthogonalize." -#~ msgstr "ほぼ垂直になっているウェイを選択してください。" - -#~ msgid "" -#~ "Please select at least one node, way or relation. Only already uploaded " -#~ "elements have a history." -#~ msgstr "" -#~ "少なくとも1つはノード・ウェイ・リレーションを選択してください。既にアップ" -#~ "ロードされた要素だけに遍歴があります。" - -#~ msgid "" -#~ "No data to update found. Have you already opened or downloaded a data " -#~ "layer?" -#~ msgstr "" -#~ "更新するデータは見つかりませんでした。もう既にデータレイヤーを開いている" -#~ "か、ダウンロードしましたか？" - -#~ msgid "" -#~ "This action will require {0} individual download requests. Do you wish to " -#~ "continue?" -#~ msgstr "この作業は、{0}回のダウンロードを実行します。続けますか？" - -#~ msgid "Upload to OSM..." -#~ msgstr "OSMにアップロード" - -#~ msgid "Sorry, doesn't work with anonymous users" -#~ msgstr "申し訳ありません。匿名のユーザでは利用できません。" - -#~ msgid "Invalid projection" -#~ msgstr "投影法が無効" - -#~ msgid "Replaces Selection with Users data" -#~ msgstr "ユーザデータを選択したものに置き替えます。" - -#~ msgid "Please choose a user using the author panel" -#~ msgstr "著作者パネルを使用してユーザを選んでください。" - -#~ msgid "Continue anyway" -#~ msgstr "とりあえず続ける" - -#~ msgid "Change the projection to {0} first." -#~ msgstr "最初に投影法を {0} に変えてください。" - -#~ msgid "Directly load TCX files from JOSM." -#~ msgstr "直接JOSMからのTCXファイルをロードしてください。" - -#~ msgid "" -#~ "An error occured while trying to match the photos to the GPX track. You " -#~ "can adjust the sliders to manually match the photos." -#~ msgstr "" -#~ "GPXトラックに写真を合わせようとしているときにエラーが起きました。スライ" -#~ "ダーを調整して、手動で写真に合わせることができます。" - -#~ msgid "Map Type" -#~ msgstr "マップタイプ" - -#~ msgid "Edit Information Office" -#~ msgstr "案内所の編集" - -#~ msgid "Remove route nodes" -#~ msgstr "ルートノードの削除" - -#~ msgid "Edit Portcullis" -#~ msgstr "城の格子戸の編集" - -#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS" -#~ msgstr "" -#~ "Metacarta's Map Rectifier WMS から 幾何補正されたイメージのダウンロード" - -#~ msgid "Really mark this issue as ''done''?" -#~ msgstr "本当に、この問題を“処理済み”としてマークしますか？" - -#~ msgid "YAHOO (WebKit GTK)" -#~ msgstr "米Yahoo (WebKit GTK)" - -#~ msgid "YAHOO (GNOME Fix)" -#~ msgstr "米Yahoo (GNOME Fix)" - -#~ msgid "Image with path {0} does not exist or is not readable." -#~ msgstr "パス {0} にあるイメージは存在しないか、読めません。" - -#~ msgid "" -#~ "The projection \"{0}\" is designed for\n" -#~ "latitudes between 45.7° and 47.9°\n" -#~ "and longitutes between 5.7° and 10.6° only.\n" -#~ "Use another projection system if you are not working\n" -#~ "on a data set of Switzerland or Liechtenstein.\n" -#~ "Do not upload any data after this message." -#~ msgstr "" -#~ "投影法 \"{0}\" は、\n" -#~ "緯度 45.7°から 47.9°で\n" -#~ "経度 5.7°から 10.6°まで用です。\n" -#~ "スイスかリヒテンシュタインのデータセットを使う訳でなければ、\n" -#~ "違う投影系を使ってください。\n" -#~ "このメッセージ以降のデータはアップロードしないでください。" - -#~ msgid "Version number missing from OSM data" -#~ msgstr "OSMデータにバージョン番号が欠けています。" - -#~ msgid "Data upload failed for unknown reason" -#~ msgstr "不明な理由でデータのアップロードに失敗しました。" - -#~ msgid "Cannot read numeric value from response" -#~ msgstr "応答から数値を読み取れません。" - -#~ msgid "Selected makes your trace public in openstreetmap.org" -#~ msgstr "選択したあなたのトレースは、openstreetmap.orgに公開されます。" - -#~ msgid "" -#~ "(You can change the number of days after which this warning appears
by " -#~ "setting the config option 'pluginmanager.warntime'.)" -#~ msgstr "" -#~ "（この警告が何日で表示されるかは
設定オプションの'pluginmanager." -#~ "warntime'を編集することで変更できます）" - -#~ msgid "" -#~ "WARNING: launching browser windows for the first {0} of {1} selected " -#~ "primitives only" -#~ msgstr "" -#~ "警告：ブラウザウインドウを開くのは、選択したプリミティブの{1}のうち、最初" -#~ "の{0}だけです。" - -#~ msgid "Download referrers..." -#~ msgstr "参照をダウンロード..." - -#~ msgid "" -#~ "There are unsaved changes in {0} layer. Discard the changes and continue?" -#~ msgid_plural "" -#~ "There are unsaved changes in {0} layers. Discard the changes and continue?" -#~ msgstr[0] "" -#~ "{0} のレイヤーに保存されていない変更があります。変更を無視して続けますか?" - -#~ msgid "Close current changeset" -#~ msgstr "現在の変更セットを閉じる" - -#~ msgid "Use a new changeset and close it" -#~ msgstr "新しい変更セットを使用して閉じる" - -#~ msgid "" -#~ "Select to upload the data using a new changeset and to leave the " -#~ "changeset open after the upload" -#~ msgstr "" -#~ "選択の上、新しい変更セットを使用してデータをアップロードし、アップロード後" -#~ "に変更セットを閉じる" - -#~ msgid "Use the existing changeset {0} and close it after upload" -#~ msgstr "既存の変更セット {0} を使用しアップロード後に閉じる" - -#~ msgid "" -#~ "Select to upload to the existing changeset {0} and to close the changeset " -#~ "after this upload" -#~ msgstr "" -#~ "選択の上、既存の変更セット {0} にアップロードし、アップロード後に変更セッ" -#~ "トを閉じる" - -#~ msgid "Use the existing changeset {0} and leave it open" -#~ msgstr "既存の変更セット {0} を使用し開いたままにしておく" - -#~ msgid "" -#~ "Select to upload to the existing changeset {0} and to leave the changeset " -#~ "open for further uploads" -#~ msgstr "" -#~ "選択の上、既存の変更セット {0} へアップロードし、さらにアップロードするた" -#~ "めに変更セットを開いておく" - -#~ msgid "Changeset {0} is unchanged. Skipping update." -#~ msgstr "変更セット {0} は変更されていません。更新をスキップします。" - -#~ msgid "No currently open changeset. Opening a new changeset..." -#~ msgstr "現在変更セットは開かれていません。新しい変更セットを開いています..." - -#~ msgid "Reusing existing changeset {0}" -#~ msgstr "既存の変更セット {0} を再利用しています" - -#~ msgid "" -#~ "Warning: could not reuse an existing changeset as requested. Opening a " -#~ "new one." -#~ msgstr "" -#~ "警告: 要求された既存の変更セットを再利用できません。新しく開いています。" - -#~ msgid "" -#~ "Failed to update changeset. Either there is no current changeset or the " -#~ "id of the current changeset is 0" -#~ msgstr "" -#~ "変更セットの更新に失敗しました。現在の変更セットが無いか、または現在の変更" -#~ "セットのIDが 0 です。" - -#~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\"" -#~ msgstr "エラー　ヘッダ \"{0}\" は期待パターン \"{1}\" に一致しません" - -#~ msgid "Updates the currently selected primitives from the server" -#~ msgstr "サーバから現在選択されたプリミティブを更新" - -#~ msgid "Upload to OSM API failed" -#~ msgstr "OSM API へのアップロード失敗" - -#~ msgid "Conflict detected" -#~ msgstr "競合が検出されました" - -#~ msgid "" -#~ "Selection \"{0}\" is used by relation \"{1}\".
Delete from " -#~ "relation?" -#~ msgstr "" -#~ "選択 \"{0}\" はリレーション \"{1}\" で使用されています。
リレー" -#~ "ションから削除しますか？" - -#~ msgid "Primitive already deleted" -#~ msgstr "プリミティブは削除済み" - -#~ msgid "" -#~ "Uploading failed because a primitive you tried " -#~ "to
delete on the server is already deleted.

The error message " -#~ "is:
{0}" -#~ msgstr "" -#~ "アップロード 失敗 サーバから削除しようとしたプリミ" -#~ "ティブは既に削除されています。

エラーメッセージ:
{0}" - -#~ msgid "not yet decided" -#~ msgstr "未決定です" - -#~ msgid "History item" -#~ msgstr "履歴アイテム" - -#~ msgid "parameter '{0}' must not be null" -#~ msgstr "パラメータ '{0}' はヌル以外でなければなりません" - -#~ msgid "Defaults (See tooltip for detailed information)" -#~ msgstr "デフォルト(詳細はツールチップ参照)" - -#~ msgid "Add a new XML source to the list." -#~ msgstr "リストに新しいXML ソースを追加。" - -#~ msgid "Copy defaults" -#~ msgstr "デフォルトをコピー" - -#~ msgid "Purging 1 primitive" -#~ msgstr "1 つのプリミティブを破棄" - -#~ msgid "" -#~ "Selection \"{0}\" is used by relation \"{1}\" with role {2}." -#~ "
Delete from relation?" -#~ msgstr "" -#~ "選択 \"{0}\" は、リレーション \"{1}\" のロール {2}で使用されていま" -#~ "す。
リレーションから削除しますか?" - -#~ msgid "removing reference from way {0}" -#~ msgstr "ウェイ {0}から、参照を取り除く" - -#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}." -#~ msgstr "" -#~ "リレーション {1} のメンバー {0} に予期しない \"type\"、 {2} を受け取りまし" -#~ "た。" - -#~ msgid "The XML source (URL or filename) for {0} definition files." -#~ msgstr "{0} 定義ファイル用XML ソース(URL またはファイル名)。" - -#~ msgid "unsupported value ''{0}'' or parameter ''{1}''" -#~ msgstr "サポートされていない値 ''{0}''またはパラメータ ''{1}''" - -#~ msgid "paramete''{0}'' must not be null" -#~ msgstr "パラメータ''{0}'' はヌルでなければなりません" - -#~ msgid "Missing mandatory attribute ''{0}''" -#~ msgstr "必要な属性 ''{0}'' がありません" - -#~ msgid "Replace" -#~ msgstr "置換" - -#~ msgid "" -#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() " -#~ "found." -#~ msgstr "" -#~ "JOSM が想定外のバージョンです。Main.ds および Main.getCurrentDataSet() が" -#~ "見つかりません。" - -#~ msgid "Help page missing. Create it in English." -#~ msgstr "" -#~ "ヘルプページがありません。英語で作成してください。" - -#~ msgid "" -#~ "Help page missing. Create it in English or your language." -#~ msgstr "" -#~ "ヘルプページがありません。英語 または " -#~ "あなたの言語で作成してください。" - -#~ msgid "Helppage missing. Create it in English." -#~ msgstr "" -#~ "ヘルプページがありません。英語でそれを作成してくださ" -#~ "い。" - -#~ msgid "" -#~ "Helppage missing. Create it in English or your language." -#~ msgstr "" -#~ "ヘルプページがありません。英語もしくは" -#~ "あなたの母国語でそれを作成してください。" - -#~ msgid "Unexpected return value. Got {0}." -#~ msgstr "予期せぬ値が返って来ました。 {0} を受けとりました。" - -#~ msgid "Index out of bounds. Got {0}." -#~ msgstr "範囲外のインデックス。{0} を受け取りました" - -#~ msgid "Display the history of the selected primitive." -#~ msgstr "選択されたプリミティブの履歴を表示" - -#~ msgid "" -#~ "Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''." -#~ msgstr "int 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました" - -#~ msgid "" -#~ "Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got " -#~ "''{1}''." -#~ msgstr "int 型(>=0)の必須属性 {0} に不正な値、 ''{1}'' を受け取りました" - -#~ msgid "Preset group ''{0}'' of group ''{1}''" -#~ msgstr "プリセットのグループ ''{1}'' のグループ ''{0}''" - -#~ msgid "" -#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back " -#~ "to default geometry. Details: {1}" -#~ msgstr "" -#~ "キー ''{0}'' からの window geometry の復元に失敗しました。デフォルトの" -#~ "geometry にフォールバックします。詳細: {1}" - -#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)" -#~ msgstr "ランベルトzone を手動設定 (例：２つのゾーン間の位置用)" - -#~ msgid "Processing {0}" -#~ msgstr "{0} 実行中" - -#~ msgid "Relation: from {0} to {1} via {2}" -#~ msgstr "リレーション: {0} から {1} まで {2} 経由" - #~ msgid "{0} via nodes." #~ msgstr "{0} 経由ノード。" @@ -28329,4 +28501,7 @@ #~ msgstr "{0} 極値ノード。" +#~ msgid "No type found. History is empty." +#~ msgstr "種別が見つかりません。履歴は空です。" + #~ msgid "longitude" #~ msgstr "経度"