Index: applications/editors/josm/i18n/po/tr.po =================================================================== --- applications/editors/josm/i18n/po/tr.po (revision 17822) +++ applications/editors/josm/i18n/po/tr.po (revision 17946) @@ -10,6 +10,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-28 16:38+0200\n" -"PO-Revision-Date: 2009-09-22 17:58+0000\n" +"POT-Creation-Date: 2009-10-02 22:03+0200\n" +"PO-Revision-Date: 2009-09-28 17:54+0000\n" "Last-Translator: katpatuka \n" "Language-Team: Türkçe\n" @@ -18,5 +18,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2009-09-28 14:33+0000\n" +"X-Launchpad-Export-Date: 2009-10-02 19:25+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -49,5 +49,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72 @@ -92,9 +92,9 @@ #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:593 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:606 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:915 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176 @@ -127,6 +127,6 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130 @@ -149,5 +149,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:260 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587 @@ -330,5 +330,5 @@ #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53 @@ -340,12 +340,12 @@ #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104 @@ -367,5 +367,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296 @@ -454,9 +454,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43 @@ -491,6 +491,6 @@ #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:68 -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267 @@ -620,22 +620,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49 msgid "Combine Way" msgstr "Yolları Birleştir" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48 msgid "Combine several ways into one." msgstr "Çeşitli yolları birine birleştir." -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 msgid "Change directions?" msgstr "Yönü değiştirilsin mi?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55 msgid "Reverse and Combine" msgstr "Yönü değiştirip birleştir" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57 msgid "" "The ways can not be combined in their current directions. Do you want to " @@ -645,5 +645,5 @@ "değiştirmek istermisiniz?" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:63 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64 msgid "" "Could not combine ways (They could not be merged into a single string of " @@ -651,10 +651,10 @@ msgstr "Yollar birleştiriledi (Tek bir yoluna konulamadı)" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163 #, java-format msgid "Combine {0} ways" msgstr "{0} yol birleştir" -#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:224 +#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188 msgid "Please select at least two ways to combine." msgstr "Lütfen birleştirmek için en az iki yol seçiniz." @@ -701,5 +701,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:858 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141 @@ -767,5 +767,5 @@ #: ../plugins/grid/src/grid/GridLayer.java:162 #: ../plugins/grid/src/grid/GridLayer.java:199 -#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144 +#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333 msgid "OK" @@ -850,8 +850,8 @@ #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:154 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:156 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:236 -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:238 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295 @@ -887,5 +887,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281 @@ -957,5 +957,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144 @@ -1045,23 +1045,23 @@ msgstr "Varsayılan tabaka başka bir tabaka ile birleştir" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44 msgid "Merge Nodes" msgstr "Noktaları birleştir" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43 msgid "Merge nodes into the oldest one." msgstr "Noktaları en eskisiyle birleştir" -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55 msgid "Please select at least two nodes to merge." msgstr "Birleştirmek için en azından iki nokta seçmen lazım." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165 msgid "Cannot merge nodes: Would have to delete a way that is still used." msgstr "" "Noktalar birleştirilemiyor: Kullanılan bir yolun silinmesi gerekiyordu." -#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:298 +#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261 #, java-format msgid "Merge {0} nodes" @@ -1239,5 +1239,5 @@ "Yapıştırma hafızsında bulunan etiket içeriklerini seçili elemanlara ekle." -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:124 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:106 #, java-format msgid "Pasting {0} tag" @@ -1246,5 +1246,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125 +#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107 #, java-format msgid "to {0} primitive" @@ -1867,7 +1867,6 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:118 -#, fuzzy msgid "No data found in this area." -msgstr "Cihazda veri bulunamadı." +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:149 @@ -2131,53 +2130,53 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69 msgid "Please enter a search string." msgstr "Lütfen bir aramametni giriniz." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 msgid "replace selection" msgstr "seçimi değiştiriniz" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 msgid "add to selection" msgstr "seçime ekleyiniz" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:75 msgid "remove from selection" msgstr "Seçimden çıkartınız" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:76 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:83 msgid "case sensitive" msgstr "Harf hassas" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84 msgid "regular expression" msgstr "ifade anlatımı" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 msgid "Baker Street - 'Baker' and 'Street' in any key or name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 msgid "\"Baker Street\" - 'Baker Street' in any key or name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 msgid "name:Bak - 'Bak' anywhere in the name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 msgid "type=route - key 'type' with value exactly 'route'." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 msgid "" "type=* - key 'type' with any value. Try also *=value, " @@ -2185,72 +2184,72 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 msgid "-name:Bak - not 'Bak' in the name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 msgid "foot: - key=foot set to any value." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 msgid "Special targets:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 msgid "" "type: - type of the object (node, way, relation)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 msgid "user:... - all objects changed by user" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 msgid "id:... - object with given ID (0 for new objects)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 msgid "nodes:... - object with given number of nodes" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 msgid "modified - all changed objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "selected - all selected objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "incomplete - all incomplete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 msgid "untagged - all untagged objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 msgid "Use | or OR to combine with logical or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119 msgid "Use ( and ) to group expressions" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57 @@ -2260,51 +2259,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 msgid "Search" msgstr "Arama" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131 msgid "Start Search" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 #, java-format msgid "No match found for ''{0}''" msgstr "''{0}'' için herhangi karşılık bulunamadı" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "''{0}'' için yapılan aramada herhangi bir ekleme yapılmadı." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "''{0}'' için yapılan aramada, herhangi birşey çıkartılmadı" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252 -#, java-format -msgid "Nothing find in selection by searching for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254 +#, fuzzy, java-format +msgid "Nothing found in selection by searching for ''{0}''" +msgstr "''{0}'' için yapılan aramada herhangi bir ekleme yapılmadı." + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264 #, java-format msgid "Found {0} matches" msgstr "{0} Eşleşme bulundu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CS" msgstr "CS" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284 msgid "CI" msgstr "CI" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285 msgid "RX" msgstr "RX" @@ -2614,5 +2613,5 @@ #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:197 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840 msgid "Delete from relation" msgstr "" @@ -2665,12 +2664,12 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:107 -#, fuzzy, java-format +#, java-format msgid "Purged object ''{0}''" -msgstr "Objeleri taşı {0}" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117 -#, fuzzy, java-format +#, java-format msgid "Purged {0} objects" -msgstr "{0} Objeyi Değiştir" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160 @@ -2682,7 +2681,7 @@ #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:169 -#, fuzzy, java-format +#, java-format msgid "Removing reference from relation {0}" -msgstr "Gerçekten seçili kısmı ilişkiden silmek istiyormusun {0}?" +msgstr "" #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58 @@ -3045,14 +3044,14 @@ msgstr "Uyarı: {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:164 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:163 #, java-format msgid "Expected ID >= 0. Got {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:308 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:307 msgid "A primitive with ID = 0 can't be invisible." msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:348 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:347 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40 #, java-format @@ -3060,5 +3059,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350 +#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:349 #, java-format msgid "Version > 0 expected. Got {0}." @@ -3403,7 +3402,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340 #, java-format @@ -3443,7 +3440,6 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141 -#, fuzzy msgid "Not Found" -msgstr "Bağlı Değil" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:155 @@ -3758,9 +3754,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:289 msgid "(no object)" msgstr "(obje yok)" -#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418 +#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:416 msgid "User:" msgstr "" @@ -4224,5 +4220,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:63 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "silindi" @@ -4323,5 +4319,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20 @@ -4368,6 +4364,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112 @@ -4381,6 +4377,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75 @@ -4438,34 +4434,34 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115 msgid "Conflicts when combining primitives" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121 #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128 #, java-format msgid "Conflicts when merging nodes - merged node is ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257 msgid "No conflicts to resolve" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 @@ -4483,23 +4479,23 @@ msgstr "hepsi" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66 msgid "Choose a value" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54 -msgid "Please decided which values to keep" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68 +msgid "Please decide which values to keep" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73 #, java-format msgid "Value ''{0}'' is going to be applied for key ''{1}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79 #, java-format msgid "The key ''{0}'' and all its values are going to be removed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84 #, java-format msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''" @@ -4543,38 +4539,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 -#, java-format -msgid "{0} way" -msgid_plural "{0} ways" -msgstr[0] "{0} Yol" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 -#, java-format -msgid "{0} relation" -msgid_plural "{0} relations" -msgstr[0] "{0} İlişki" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 msgid "Paste ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 msgid "From ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369 -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396 msgid "To ..." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425 +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:444 #, java-format msgid "{0} tag" @@ -4583,4 +4561,18 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336 +#, java-format +msgid "{0} way" +msgid_plural "{0} ways" +msgstr[0] "{0} Yol" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344 +#, java-format +msgid "{0} relation" +msgid_plural "{0} relations" +msgstr[0] "{0} İlişki" + #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24 #, java-format @@ -4646,4 +4638,12 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 msgid "Decision" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:42 +msgid "Please select the values to keep for the following tags." +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47 +msgid "Show tags with conflicts only" msgstr "" @@ -4663,5 +4663,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 @@ -4754,5 +4754,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124 @@ -4908,6 +4908,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323 #, java-format msgid "This will change up to {0} object." @@ -4915,22 +4915,22 @@ msgstr[0] "İşlem {0} objeyi değiştirecek." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149 msgid "An empty value deletes the key." msgstr "Boş değer anahtarı sildi." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:108 msgid "" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347 msgid "Change values?" msgstr "Değerleri Değiştir?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264 #, java-format msgid "Change properties of up to {0} object" @@ -4938,69 +4938,69 @@ msgstr[0] "Değerleri {0} obje için değiştir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325 msgid "Please select a key" msgstr "Lütfen bir anahtar seçiniz" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335 msgid "Please select a value" msgstr "Lütfen bir değer seçiniz" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447 msgid "Please select the objects you want to change properties for." msgstr "Özelliklerini değiştirmek istediğiniz objeleri seçiniz." +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455 msgid "Properties/Memberships" msgstr "Özellikler/Üyelikler" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453 msgid "Properties for selected objects." msgstr "Seçili objenin özellikleri" #. setting up the membership table -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487 msgid "Member Of" msgstr "Üyesi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:575 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576 msgid "Add Properties" msgstr "Özellik Ekle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579 msgid "Add a new key/value pair to all objects" msgstr "Her obje için yeni bir anahtar/değer çifti ekleyiniz" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:581 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582 msgid "Edit Properties" msgstr "Özellikleri Değiştir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585 msgid "Edit the value of the selected key for all objects" msgstr "Seçili anahtarın değerini her obje için düzenle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:795 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796 #, java-format msgid "Properties: {0} / Memberships: {1}" msgstr "Özellik: {0} / Üyelik: {1}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:798 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799 msgid "Properties / Memberships" msgstr "Özellik / Üyelik" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:838 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839 msgid "Change relation" msgstr "İlişkiyi değiştir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:841 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842 #, java-format msgid "Really delete selection from relation {0}?" msgstr "Gerçekten seçili kısmı ilişkiden silmek istiyormusun {0}?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860 msgid "Delete the selected key in all objects" msgstr "Seçili anahtarı her objeden sil" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862 msgid "Delete Properties" msgstr "Özelliği Sil" @@ -5042,7 +5042,6 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:440 -#, fuzzy msgid "Set the current selection to the list of selected relations" -msgstr "Yapılan seçim bölme için kullanılamaz." +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86 @@ -5083,14 +5082,14 @@ msgstr "Seçim: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:459 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:307 msgid "Undock the panel" msgstr "Panelin kilidini Kaldır" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:472 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:321 msgid "" "Close this panel. You can reopen it with the buttons in the left toolbar." msgstr "Paneli Kapat. Soldaki araç çubuğundan tekrar açabilirsiniz." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:482 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:332 msgid "Click to minimize/maximize the panel content" msgstr "paneli büyütüp/küçültmek için tıklayınız" @@ -6508,5 +6507,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350 -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 #: build/trans_presets.java:67 build/trans_presets.java:103 #: build/trans_presets.java:143 build/trans_presets.java:180 @@ -6884,7 +6883,6 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348 -#, fuzzy msgid "Save/Upload and Exit" -msgstr "Kaydet ve Çık" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349 @@ -7106,5 +7104,5 @@ #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385 -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:627 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:632 #, java-format msgid "Changeset ID > 0 expected. Got {0}." @@ -7452,8 +7450,9 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:324 -#, fuzzy, java-format +#, java-format msgid "There was {0} conflict detected." msgid_plural "There were {0} conflicts detected." -msgstr[0] "Dışalım işlemi esnasında {0} çakışma oldu." +msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330 @@ -7466,9 +7465,9 @@ "on the server." msgstr[0] "" +msgstr[1] "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:345 -#, fuzzy msgid "Conflicts detected" -msgstr "Çelişkiler" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:472 @@ -7796,5 +7795,5 @@ msgstr "Ses kayıt cihazı kalibrasyonu" -#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70 +#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71 msgid "Color" msgstr "Renk" @@ -8778,5 +8777,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310 +#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313 msgid "Parse error: invalid document structure for GPX document." msgstr "Ayrıştırma hatası: gpx dökümanı için geçersiz yapı." @@ -8955,19 +8954,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:516 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:521 #, java-format msgid "Starting retry {0} of {1}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:599 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604 msgid "Current changeset is null. Can't upload data." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:601 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606 #, java-format msgid "ID of current changeset > 0 required. Current ID is {0}." msgstr "" -#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629 +#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634 #, java-format msgid "Open changeset expected. Got closed changeset with id {0}." @@ -9431,7 +9430,7 @@ #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138 -#, fuzzy, java-format +#, java-format msgid "Parameter ''{0}'' must not be null" -msgstr "parametre ''{0}'' zero (null) olamaz" +msgstr "" #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141 @@ -10149,69 +10148,73 @@ msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:373 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381 msgid "City:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:374 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382 msgid "State:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:375 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383 msgid "Post Code:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:376 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384 msgid "Country:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:377 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385 msgid "Full Address:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:412 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420 msgid "Optional Information:" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:592 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600 msgid "Please select a street to associate with address interpolation way" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:605 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613 msgid "Please select address interpolation way for this street" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:711 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719 msgid "Expected odd numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:716 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724 msgid "Expected even numbers for addresses" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740 msgid "Country code must be 2 letters" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:870 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878 msgid "Please enter valid number for starting and ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:876 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896 msgid "Alphabetic address must end with a letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:881 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911 +msgid "Starting and ending numbers must be the same for alphabetic addresses" +msgstr "" + +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917 msgid "Starting address letter must be less than ending address letter" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:897 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933 msgid "Please enter valid number for starting address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:900 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936 msgid "Please enter valid number for ending address" msgstr "" -#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:907 +#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943 msgid "Starting address number must be less than ending address number" msgstr "" @@ -19767,24 +19770,20 @@ #. item "Man Made/Tower" text "Name" #: build/trans_presets.java:2296 -#, fuzzy msgid "Tower type" -msgstr "Kule" +msgstr "" #. item "Man Made/Tower" combo "Tower type" #: build/trans_presets.java:2296 -#, fuzzy msgid "communication" -msgstr "Kavşak" +msgstr "" #: build/trans_presets.java:2296 -#, fuzzy msgid "observation" -msgstr "yükseklik" +msgstr "" #. #: build/trans_presets.java:2298 -#, fuzzy msgid "Height (meters)" -msgstr "Maximum uzunluk (metre)" +msgstr "" #. item "Man Made/Tower" text "Operator" @@ -19844,7 +19843,6 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "oil" -msgstr "fosil" +msgstr "" #: build/trans_presets.java:2330 build/trans_presets.java:2372 @@ -19853,27 +19851,22 @@ #: build/trans_presets.java:2330 -#, fuzzy msgid "sewage" -msgstr "kullanım" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "heat" -msgstr "çalılık" +msgstr "" #: build/trans_presets.java:2330 -#, fuzzy msgid "any substance" -msgstr "A Mesafeye Göre" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "underwater" -msgstr "su" +msgstr "" #: build/trans_presets.java:2331 -#, fuzzy msgid "overground" -msgstr "yer altı" +msgstr "" #: build/trans_presets.java:2333 @@ -20018,17 +20011,14 @@ #. item "Man Made/Power Tower" combo "Type" #: build/trans_presets.java:2398 -#, fuzzy msgid "tower" -msgstr "Kule" +msgstr "" #: build/trans_presets.java:2398 -#, fuzzy msgid "pole" -msgstr "Rol" +msgstr "" #: build/trans_presets.java:2399 -#, fuzzy msgid "Tower reference" -msgstr "çizgi referansı" +msgstr "" #. item "Man Made/Power Tower" text "Tower reference" @@ -20046,18 +20036,15 @@ #. item "Man Made/Power Line" label "Edit Power Line" #: build/trans_presets.java:2405 -#, fuzzy msgid "Line type" -msgstr "tip" +msgstr "" #. item "Man Made/Power Line" combo "Line type" #: build/trans_presets.java:2405 -#, fuzzy msgid "line" -msgstr "Suboru Hattı" +msgstr "" #: build/trans_presets.java:2405 -#, fuzzy msgid "minor_line" -msgstr "otoyol_hat" +msgstr "" #. item "Man Made/Power Line" text "Line reference" @@ -20068,7 +20055,6 @@ #. item "Man Made/Power Line" text "Voltage" #: build/trans_presets.java:2409 -#, fuzzy msgid "Amount of Cables" -msgstr "Kablo Miktarı" +msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" @@ -20079,22 +20065,18 @@ #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" #: build/trans_presets.java:2410 -#, fuzzy msgid "single" -msgstr "Açı" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "double" -msgstr "Boule" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "triple" -msgstr "Stil" +msgstr "" #: build/trans_presets.java:2410 -#, fuzzy msgid "quad" -msgstr "quaker" +msgstr "" #: build/trans_presets.java:2413 @@ -25989,20 +25971,4 @@ msgstr "" -#~ msgid "Combine ways with different memberships?" -#~ msgstr "Farklı sınıflardaki yolları birleştir?" - -#~ msgid "Combine Anyway" -#~ msgstr "Ne olursa olsun: Birleştir" - -#~ msgid "" -#~ "The selected ways have differing relation memberships. Do you still want " -#~ "to combine them?" -#~ msgstr "" -#~ "Seçili yollar farklı ilişkilere sahip, buna rağmen birleştirmek " -#~ "istiyormusunuz?" - -#~ msgid "Empty member in relation." -#~ msgstr "İlişkide boş üye." - #~ msgid "" #~ "The plugin could not be removed. Please tell the people you got JOSM from " @@ -26198,4 +26164,17 @@ #~ msgid "EPSG:4326" #~ msgstr "EPSG:4326" + +#~ msgid "Empty member in relation." +#~ msgstr "İlişkide boş üye." + +#~ msgid "" +#~ "The selected ways have differing relation memberships. Do you still want " +#~ "to combine them?" +#~ msgstr "" +#~ "Seçili yollar farklı ilişkilere sahip, buna rağmen birleştirmek " +#~ "istiyormusunuz?" + +#~ msgid "Combine ways with different memberships?" +#~ msgstr "Farklı sınıflardaki yolları birleştir?" #~ msgid "All the ways were empty" @@ -26394,4 +26373,7 @@ #~ msgstr "Kaydedilmemiş Değişiklikler" +#~ msgid "Combine Anyway" +#~ msgstr "Ne olursa olsun: Birleştir" + #~ msgid "Merge nodes with different memberships?" #~ msgstr "Farklı üyelik olan noktaları birleştirmek istiyor musun?"