|
|
1862.
|
|
|
Properties in the merged element. They will replace properties in my elements when merge decisions are applied.
|
|
|
|
|
លក្ខណសម្បត្តិនៅក្នុងធាតុដែលបានបញ្ចូលគ្នា។ ពួកគេនឹងជំនួសលក្ខណសម្បត្តិនៅក្នុងធាតុរបស់ខ្ញុំ ពេលដែលការសម្រេចចិត្តបញ្ចូលគ្នាត្រូវបានអនុវត្ត។
|
|
Translated and reviewed by
Sophea Sok
|
|
|
|
Located in
../core/src/org/openstreetmap/josm/gui/conflict/pair/AbstractMergePanel.java:142
|
|
|
1863.
|
|
|
Their version (server dataset)
|
|
|
|
|
កំណែរបស់ពួកគេ (សំណុំទិន្នន័យម៉ាស៊ីនមេ)
|
|
Translated and reviewed by
Sophea Sok
|
|
|
|
Located in
../core/src/org/openstreetmap/josm/gui/conflict/pair/AbstractMergePanel.java:149
|
|
|
1864.
|
|
|
Properties in their dataset, i.e. the server dataset
|
|
|
|
|
លក្ខណសម្បត្តិនៅក្នុងសំណុំមូលដ្ឋានទិន្នន័យ គឺសំណុំមូលដ្ឋានទិន្នន័យម៉ាស៊ីនមេ
|
|
Translated and reviewed by
Sophea Sok
|
|
|
|
Located in
../core/src/org/openstreetmap/josm/gui/conflict/pair/AbstractMergePanel.java:150
|
|
|
1865.
|
|
|
My with Their
|
|
|
*
* compare my version of an {@link org.openstreetmap.josm.data.osm.OsmPrimitive} with their version
|
|
|
|
|
របស់ខ្ញុំជាមួយរបស់គេ
|
|
Translated and reviewed by
Sophea Sok
|
|
|
|
Located in
../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
|
|
|
1866.
|
|
|
My with Merged
|
|
|
*
* compare my version of an {@link org.openstreetmap.josm.data.osm.OsmPrimitive} with the merged version
|
|
|
|
|
របស់ខ្ញុំជាមួយដែលបានបញ្ចូលគ្នា
|
|
Translated and reviewed by
Sophea Sok
|
|
|
|
Located in
../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
|
|
|
1867.
|
|
|
Their with Merged
|
|
|
*
* compare their version of an {@link org.openstreetmap.josm.data.osm.OsmPrimitive} with the merged version
|
|
|
|
|
របស់គេជាមួយដែលបានបញ្ចូលគ្នា
|
|
Translated and reviewed by
Sophea Sok
|
|
|
|
Located in
../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
|
|
|
1868.
|
|
|
Role {0} is not participating in compare pair {1}.
|
|
|
|
|
បញ្ជី {0} មិននៅក្នុងគូប្រៀបធៀប {1} ។
|
|
Translated and reviewed by
Sophea Sok
|
|
|
|
Located in
../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:77
|
|
|
1869.
|
|
|
Properties
|
|
|
|
|
លក្ខណៈសម្បត្តិ
|
|
Translated and reviewed by
វ័ណថារិទ្ធ
|
|
|
|
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
|
|
|
1870.
|
|
|
Tags
|
|
|
|
|
ស្លាក
|
|
Translated and reviewed by
វ័ណថារិទ្ធ
|
|
|
|
Located in
../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:107
../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179
../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:198
../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:467
../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:129
../plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java:117
../plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/config/SimpleMatchFinderPanel.java:50
../plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/RoutePatternAction.java:345
../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:193
|
|
|
1871.
|
|
|
Nodes
|
|
|
|
|
តំណ
|
|
Translated and reviewed by
Sophea Sok
|
|
|
|
Located in
../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:112
../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:260
../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136
../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:34
|
