Index: applications/editors/josm/i18n/po/ja.po =================================================================== --- applications/editors/josm/i18n/po/ja.po (revision 22209) +++ applications/editors/josm/i18n/po/ja.po (revision 22278) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-06 17:43+0200\n" -"PO-Revision-Date: 2010-07-01 03:58+0000\n" +"POT-Creation-Date: 2010-07-11 21:01+0200\n" +"PO-Revision-Date: 2010-07-09 03:08+0000\n" "Last-Translator: higa4 \n" "Language-Team: Japanese \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2010-07-06 15:09+0000\n" +"X-Launchpad-Export-Date: 2010-07-11 18:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: JAPAN\n" @@ -271,5 +271,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:647 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129 @@ -663,9 +663,9 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:636 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:656 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507 @@ -1493,5 +1493,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230 -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:664 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:684 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351 @@ -2771,6 +2771,6 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2801,7 +2801,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 -#, fuzzy msgid "Invalid search expression" -msgstr "検索表現を入力してください" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 @@ -4374,5 +4373,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4921,5 +4920,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 #: build/specialmessages.java:64 msgid "Up" @@ -4931,5 +4930,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Down" msgstr "下" @@ -5523,5 +5522,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5621,9 +5620,9 @@ msgstr "''{0}'' の競合を解決する" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 msgid "Filter objects and hide/disable them." msgstr "オブジェクトにフィルターをかけ、非表示/無効にします。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5636,53 +5635,52 @@ msgstr "追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87 msgid "Add filter." msgstr "フィルターを追加。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:98 msgid "Edit filter." msgstr "フィルターを編集。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112 msgid "Delete filter." msgstr "フィルターを削除。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:122 msgid "Move filter up." msgstr "フィルターを上に移動。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133 msgid "Move filter down." msgstr "フィルターを下に移動。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:147 msgid "Enable filter" msgstr "フィルターを有効化" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:148 msgid "Hide elements" msgstr "要素を非表示にする" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:150 msgid "Inverse filter" msgstr "反転フィルター" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:151 msgid "Filter mode" msgstr "フィルターモード" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 -#, fuzzy +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:57 msgid "Error in filter" -msgstr "ファイルの読み込みエラー" +msgstr "フィルタ内にエラー" #. translators notes must be in front #. column header: enable filter -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:255 msgctxt "filter" msgid "E" @@ -5690,5 +5688,5 @@ #. column header: hide filter -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:256 msgctxt "filter" msgid "H" @@ -5696,5 +5694,5 @@ #. column header: filter text -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:257 msgctxt "filter" msgid "Text" @@ -5702,5 +5700,5 @@ #. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:258 msgctxt "filter" msgid "I" @@ -5708,5 +5706,5 @@ #. column header: filter mode -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:259 msgctxt "filter" msgid "M" @@ -5715,5 +5713,5 @@ #. translators notes must be in front #. filter mode: replace -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:328 msgctxt "filter" msgid "R" @@ -5721,5 +5719,5 @@ #. filter mode: add -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:330 msgctxt "filter" msgid "A" @@ -5727,5 +5725,5 @@ #. filter mode: remove -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:332 msgctxt "filter" msgid "D" @@ -5733,24 +5731,24 @@ #. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:334 msgctxt "filter" msgid "F" msgstr "F" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:364 msgid "

Filter active

" msgstr "

有効なフィルタ

" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:370 #, java-format msgid "

{0} objects hidden" msgstr "

{0} 件の非表示オブジェクト" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:378 #, java-format msgid "{0} objects disabled" msgstr "{0} 件の無効化オブジェクト" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:381 msgid "

Close the filter dialog to see all objects.

" msgstr "

フィルタのダイアログを閉じて全オブジェクトを見る。

" @@ -10452,10 +10450,10 @@ msgstr[0] "GPSタグが必要なものが {0}見つかりました。" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:635 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:655 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100 msgid "Delete image file from disk" msgstr "ディスクから画像ファイルを削除" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:638 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:658 #, java-format msgid "" @@ -10466,5 +10464,5 @@ "に失われます。" -#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:663 +#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:683 msgid "Image file could not be deleted." msgstr "画像ファイルが削除できません。" @@ -12775,5 +12773,5 @@ #, java-format msgid "Unknown requisite: {0}" -msgstr "" +msgstr "不明な必要条件: {0}" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563 @@ -13145,5 +13143,5 @@ msgstr "事前定義のライセンスを選択" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:52 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34 #: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87 @@ -13154,5 +13152,5 @@ msgstr "{0}　のマーカー" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214 #, java-format @@ -13164,5 +13162,5 @@ "われます" -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:69 #: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 @@ -13172,5 +13170,5 @@ #. input was not properly parsed, abort -#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82 +#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:72 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225 @@ -13855,9 +13853,9 @@ msgstr "OSMデータ解析中..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:577 msgid "Preparing data set..." msgstr "データセット準備中..." -#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592 +#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593 #, java-format msgid "Line {0} column {1}: " @@ -14732,11 +14730,11 @@ msgstr "Unable to find translation for the locale {0}. Reverting to {1}." -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:162 #, java-format msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}" msgstr "警告: zipファイル ''{0}'' のハンドルに失敗。例外コード: {1}" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203 -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:214 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:228 #, java-format msgid "" @@ -14747,5 +14745,5 @@ "コード: {1}" -#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237 +#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:248 #, java-format msgid "" @@ -15453,7 +15451,6 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 -#, fuzzy msgid "on polygon" -msgstr "マルチポリゴン" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 @@ -15472,15 +15469,14 @@ msgstr "建物" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:418 msgid "Next no" -msgstr "次へ" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:419 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "ストリート" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:460 msgid "Enter addresses" msgstr "" @@ -15658,5 +15654,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 -msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." +msgid "Don't use relation for addresses (but \"addr:street\" on elements)." msgstr "" @@ -26440,7 +26436,6 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -#, fuzzy msgid "american_football" -msgstr "オーストラリアフットボール" +msgstr "" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -26471,7 +26466,6 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -#, fuzzy msgid "canadian_football" -msgstr "オーストラリアフットボール" +msgstr "" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -26517,7 +26511,6 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -#, fuzzy msgid "gaelic_football" -msgstr "オーストラリアフットボール" +msgstr "" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -26563,7 +26556,6 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -#, fuzzy msgid "rugby_union" -msgstr "ラグビー" +msgstr "" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -27053,35 +27045,29 @@ #: build/trans_presets.java:2076 -#, fuzzy msgid "American Football" -msgstr "オーストラリアフットボール" +msgstr "" #. item "Sport (Ball)/American Football" #: build/trans_presets.java:2077 -#, fuzzy msgid "Edit American Football" -msgstr "オーストラリアフットボールの編集" +msgstr "" #: build/trans_presets.java:2082 -#, fuzzy msgid "Canadian Football" -msgstr "フットボール場の編集" +msgstr "" #. item "Sport (Ball)/Canadian Football" #: build/trans_presets.java:2083 -#, fuzzy msgid "Edit Canadian Football" -msgstr "オーストラリアフットボールの編集" +msgstr "" #: build/trans_presets.java:2088 -#, fuzzy msgid "Gaelic Football" -msgstr "フットボール場の編集" +msgstr "" #. item "Sport (Ball)/Gaelic Football" #: build/trans_presets.java:2089 -#, fuzzy msgid "Edit Gaelic Football" -msgstr "フットボール場の編集" +msgstr "" #: build/trans_presets.java:2094 @@ -27091,18 +27077,15 @@ #. item "Sport (Ball)/Rugby League" #: build/trans_presets.java:2095 -#, fuzzy msgid "Edit Rugby League" -msgstr "ラグビー場の編集" +msgstr "" #: build/trans_presets.java:2100 -#, fuzzy msgid "Rugby Union" -msgstr "ラグビー" +msgstr "" #. item "Sport (Ball)/Rugby Union" #: build/trans_presets.java:2101 -#, fuzzy msgid "Edit Rugby Union" -msgstr "ラグビー場の編集" +msgstr "" #: build/trans_presets.java:2106 @@ -33849,112 +33832,4 @@ msgstr "Sicily - Italy" -#~ msgid "" -#~ "An error occurred while communicating with the server
Details: " -#~ "{0}" -#~ msgstr "サーバとの通信中にエラー発生
詳細: {0}" - -#~ msgid "Communication with server failed" -#~ msgstr "サーバとの通信失敗" - -#~ msgid "Yes, undelete them too" -#~ msgstr "はい、これも削除を取り消します" - -#~ msgid "No, cancel operation" -#~ msgstr "いいえ、操作をキャンセルします" - -#~ msgid "" -#~ "There is {0} additional node used by way {1}
which is deleted on the " -#~ "server.

Do you want to undelete this node too?" -#~ msgid_plural "" -#~ "There are {0} additional nodes used by way {1}
which are deleted on " -#~ "the server.

Do you want to undelete these nodes too?" -#~ msgstr[0] "" -#~ "{0} 件の付加的なノードをウェイ {1} が使用していますがサーバ上から削除され" -#~ "ています。

このノードも削除を取り消しますか？" - -#~ msgid "Undelete additional nodes?" -#~ msgstr "追加のノードの削除を取り消しますか？" - -#~ msgid "" -#~ "There is {0} additional primitive referred to by relation {1}
which is " -#~ "deleted on the server.

Do you want to undelete this too?" -#~ msgid_plural "" -#~ "There are {0} additional primitives referred to by relation {1}
which " -#~ "are deleted on the server.

Do you want to undelete these too?" -#~ msgstr[0] "" -#~ "{0} 件の付加的なプリミティブをリレーション {1} が参照していますがサーバ上" -#~ "から削除されています。

これも削除を取り消しますか？" - -#~ msgid "Undelete dependent primitives?" -#~ msgstr "依存するプリミティブの削除を取り消しますか？" - -#~ msgid "Visible State:" -#~ msgstr "表示状態:" - -#~ msgid "visible (on the server)" -#~ msgstr "表示(サーバ上)" - -#~ msgid "not visible (on the server)" -#~ msgstr "非表示(サーバ上)" - -#~ msgid "Keep a clone of the local version" -#~ msgstr "ローカルバージョンのクローンを残す" - -#~ msgid "Physically delete from local dataset" -#~ msgstr "ローカルデータセットから物理的に削除" - -#~ msgid "Keep my visible state" -#~ msgstr "自分の表示状態を残す" - -#~ msgid "Yes, reset the id" -#~ msgstr "はい、id をリセットします" - -#~ msgid "" -#~ "To keep your local version, JOSM
has to reset the id of " -#~ "primitive {0} to 0.
On the next upload the server will assign
it a " -#~ "new id.
Do you agree?" -#~ msgstr "" -#~ "あなたのローカルバージョンを保持するために、JOSM
はプリミティブ " -#~ "{0} のIDを0にリセットしなければなりません。
次回アップロード時にサーバ" -#~ "はこれに新しいIDを
割り当てます。
同意しますか？" - -#~ msgid "Reset id to 0" -#~ msgstr "id を0 にリセット" - -#~ msgid "Keep their visible state" -#~ msgstr "相手の表示状態を残す" - -#~ msgid "Yes, purge it" -#~ msgstr "はい、破棄します" - -#~ msgid "" -#~ "JOSM will have to remove your local primitive with id {0}
from " -#~ "the dataset.
Do you agree?" -#~ msgstr "" -#~ "JOSM はid {0} のあなたのローカルプリミティブをデータセットから
削" -#~ "除しなければなりません。
よろしいですか？" - -#~ msgid "Remove from dataset" -#~ msgstr "データセットから削除" - -#~ msgid "Undecide conflict between visible state" -#~ msgstr "表示状態間の競合を未決にする" - -#~ msgid "" -#~ "{0} conflict remains to be resolved.

Please open the Conflict List " -#~ "Dialog and manually resolve it." -#~ msgid_plural "" -#~ "{0} conflicts remain to be resolved.

Please open the Conflict List " -#~ "Dialog and manually resolve them." -#~ msgstr[0] "" -#~ "{0} 件の競合が未解決です。

競合リストダイアログをオープンして手動で" -#~ "解決してください。" - -#~ msgid "football" -#~ msgstr "フットボール" - -#~ msgid "Football" -#~ msgstr "フットボール" - #~ msgid "Move" #~ msgstr "移動" @@ -34390,4 +34265,10 @@ #~ msgid "bicyclemap" #~ msgstr "自転車マップ" + +#~ msgid "football" +#~ msgstr "フットボール" + +#~ msgid "Football" +#~ msgstr "フットボール" #~ msgid "sports" @@ -35047,4 +34928,19 @@ #~ msgstr "競合が検出されました" +#~ msgid "Keep their visible state" +#~ msgstr "相手の表示状態を残す" + +#~ msgid "Keep my visible state" +#~ msgstr "自分の表示状態を残す" + +#~ msgid "Visible State:" +#~ msgstr "表示状態:" + +#~ msgid "Undecide conflict between visible state" +#~ msgstr "表示状態間の競合を未決にする" + +#~ msgid "Yes, purge it" +#~ msgstr "はい、破棄します" + #~ msgid "" #~ "Selection \"{0}\" is used by relation \"{1}\".
Delete from " @@ -35060,4 +34956,10 @@ #~ msgstr "" #~ "このデータセットには id {0} バージョン {1} のプリミティブはありません" + +#~ msgid "Remove from dataset" +#~ msgstr "データセットから削除" + +#~ msgid "Physically delete from local dataset" +#~ msgstr "ローカルデータセットから物理的に削除" #~ msgid "" @@ -35093,4 +34995,30 @@ #~ "ティブは既に削除されています。

エラーメッセージ:
{0}" +#~ msgid "No, cancel operation" +#~ msgstr "いいえ、操作をキャンセルします" + +#~ msgid "" +#~ "An error occurred while communicating with the server
Details: " +#~ "{0}" +#~ msgstr "サーバとの通信中にエラー発生
詳細: {0}" + +#~ msgid "Communication with server failed" +#~ msgstr "サーバとの通信失敗" + +#~ msgid "not visible (on the server)" +#~ msgstr "非表示(サーバ上)" + +#~ msgid "visible (on the server)" +#~ msgstr "表示(サーバ上)" + +#~ msgid "Keep a clone of the local version" +#~ msgstr "ローカルバージョンのクローンを残す" + +#~ msgid "Reset id to 0" +#~ msgstr "id を0 にリセット" + +#~ msgid "Yes, reset the id" +#~ msgstr "はい、id をリセットします" + #~ msgid "not yet decided" #~ msgstr "未決定です" @@ -35098,4 +35026,20 @@ #~ msgid "parameter '{0}' must not be null" #~ msgstr "パラメータ '{0}' はヌル以外でなければなりません" + +#~ msgid "Yes, undelete them too" +#~ msgstr "はい、これも削除を取り消します" + +#~ msgid "Undelete additional nodes?" +#~ msgstr "追加のノードの削除を取り消しますか？" + +#~ msgid "Undelete dependent primitives?" +#~ msgstr "依存するプリミティブの削除を取り消しますか？" + +#~ msgid "" +#~ "JOSM will have to remove your local primitive with id {0}
from " +#~ "the dataset.
Do you agree?" +#~ msgstr "" +#~ "JOSM はid {0} のあなたのローカルプリミティブをデータセットから
削" +#~ "除しなければなりません。
よろしいですか？" #~ msgid "Dialog not created yet. Invoke createInstance() first" @@ -35722,4 +35666,43 @@ #~ msgstr "摂氏" +#~ msgid "" +#~ "{0} conflict remains to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve it." +#~ msgid_plural "" +#~ "{0} conflicts remain to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve them." +#~ msgstr[0] "" +#~ "{0} 件の競合が未解決です。

競合リストダイアログをオープンして手動で" +#~ "解決してください。" + +#~ msgid "" +#~ "To keep your local version, JOSM
has to reset the id of " +#~ "primitive {0} to 0.
On the next upload the server will assign
it a " +#~ "new id.
Do you agree?" +#~ msgstr "" +#~ "あなたのローカルバージョンを保持するために、JOSM
はプリミティブ " +#~ "{0} のIDを0にリセットしなければなりません。
次回アップロード時にサーバ" +#~ "はこれに新しいIDを
割り当てます。
同意しますか？" + +#~ msgid "" +#~ "There is {0} additional node used by way {1}
which is deleted on the " +#~ "server.

Do you want to undelete this node too?" +#~ msgid_plural "" +#~ "There are {0} additional nodes used by way {1}
which are deleted on " +#~ "the server.

Do you want to undelete these nodes too?" +#~ msgstr[0] "" +#~ "{0} 件の付加的なノードをウェイ {1} が使用していますがサーバ上から削除され" +#~ "ています。

このノードも削除を取り消しますか？" + +#~ msgid "" +#~ "There is {0} additional primitive referred to by relation {1}
which is " +#~ "deleted on the server.

Do you want to undelete this too?" +#~ msgid_plural "" +#~ "There are {0} additional primitives referred to by relation {1}
which " +#~ "are deleted on the server.

Do you want to undelete these too?" +#~ msgstr[0] "" +#~ "{0} 件の付加的なプリミティブをリレーション {1} が参照していますがサーバ上" +#~ "から削除されています。

これも削除を取り消しますか？" + #~ msgid "Point on angle of building to start drawing" #~ msgstr "描画を始める建物の角度をポイント"