|
|
1862.
|
|
|
My version (local dataset)
|
|
|
|
|
Benim sürümüm (yerel veri kümesi)
|
|
Translated by
E
|
|
|
|
Located in
../core/src/org/openstreetmap/josm/gui/conflict/pair/AbstractMergePanel.java:132
|
|
|
1863.
|
|
|
Properties in my dataset, i.e. the local dataset
|
|
|
|
|
Veri kümemdeki özellikler, yani yerel veri kümesi
|
|
Translated by
E
|
|
|
|
Located in
../core/src/org/openstreetmap/josm/gui/conflict/pair/AbstractMergePanel.java:133
|
|
|
1864.
|
|
|
Properties in the merged element. They will replace properties in my elements when merge decisions are applied.
|
|
|
|
|
Birleştirilmiş öğedeki özellikler. Birleştirme kararları uygulandığında, bunlar benim öğelerimdeki özellikleri değiştirecek.
|
|
Translated by
E
|
|
|
|
Located in
../core/src/org/openstreetmap/josm/gui/conflict/pair/AbstractMergePanel.java:142
|
|
|
1865.
|
|
|
Their version (server dataset)
|
|
|
|
|
Onların sürümü (sunucu veri kümesi)
|
|
Translated by
E
|
|
|
|
Located in
../core/src/org/openstreetmap/josm/gui/conflict/pair/AbstractMergePanel.java:149
|
|
|
1866.
|
|
|
Properties in their dataset, i.e. the server dataset
|
|
|
|
|
Veri kümesindeki özellikler, yani sunucu veri kümesi
|
|
Translated by
E
|
|
|
|
Located in
../core/src/org/openstreetmap/josm/gui/conflict/pair/AbstractMergePanel.java:150
|
|
|
1867.
|
|
|
My with Their
|
|
|
*
* compare my version of an {@link org.openstreetmap.josm.data.osm.OsmPrimitive} with their version
|
|
|
|
|
Benim ile Onların
|
|
Translated by
E
|
|
|
|
Located in
../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
|
|
|
1868.
|
|
|
My with Merged
|
|
|
*
* compare my version of an {@link org.openstreetmap.josm.data.osm.OsmPrimitive} with the merged version
|
|
|
|
|
Benim ile Birleştirilmiş
|
|
Translated by
E
|
|
|
|
Located in
../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
|
|
|
1869.
|
|
|
Their with Merged
|
|
|
*
* compare their version of an {@link org.openstreetmap.josm.data.osm.OsmPrimitive} with the merged version
|
|
|
|
|
Onların ile Birleştirilmiş
|
|
Translated by
E
|
|
|
|
Located in
../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
|
|
|
1870.
|
|
|
Role {0} is not participating in compare pair {1}.
|
|
|
|
|
Rol {0}, {1} karşılaştırma çiftine katılmıyor.
|
|
Translated by
E
|
|
|
|
Located in
../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:77
|
|
|
1871.
|
|
|
Properties
|
|
|
|
|
Özellikler
|
|
Translated and reviewed by
katpatuka
|
|
|
|
Located in
../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:102
../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:216
../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:196
|
