|
|
17.
|
|
|
Conflicts
|
|
|
i18n: file: conduits/contacts/settingswidget.ui:25
i18n: ectx: attribute (title), widget (QWidget, tab_6)
i18n: file: conduits/docconduit/doc-setupdialog.ui:339
i18n: ectx: attribute (title), widget (QWidget, tab)
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
rc.cpp:717 rc.cpp:1293
|
|
|
18.
|
|
|
Conflict &resolution:
|
|
|
i18n: file: kpilot/config_page_sync.ui:145
i18n: ectx: property (text), widget (QLabel, textLabel1)
i18n: file: Documentation/base-conduit-template/contacts-settings.ui:59
i18n: ectx: property (text), widget (QLabel, textLabel1_2_3)
i18n: file: conduits/contacts/settingswidget.ui:59
i18n: ectx: property (text), widget (QLabel, textLabel1_2_3)
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
rc.cpp:294 rc.cpp:400 rc.cpp:729
|
|
|
19.
|
|
|
Use KPilot's Global Setting
|
|
|
i18n: file ./conduits/vcalconduit/korganizerConduit.ui line 193
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
rc.cpp:40 rc.cpp:130
|
|
|
20.
|
|
|
Ask User
|
|
|
i18n: file: kpilot/config_page_sync.ui:168
i18n: ectx: property (text), item, widget (KComboBox, fConflictResolution)
i18n: file: Documentation/base-conduit-template/contacts-settings.ui:78
i18n: ectx: property (text), item, widget (KComboBox, fConflictResolution)
i18n: file: conduits/contacts/settingswidget.ui:81
i18n: ectx: property (text), item, widget (KComboBox, fConflictResolution)
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
rc.cpp:300 rc.cpp:409 rc.cpp:738
|
|
|
21.
|
|
|
Do Nothing
|
|
|
i18n: file: kpilot/config_page_sync.ui:173
i18n: ectx: property (text), item, widget (KComboBox, fConflictResolution)
i18n: file: Documentation/base-conduit-template/contacts-settings.ui:98
i18n: ectx: property (text), item, widget (KComboBox, fConflictResolution)
i18n: file: conduits/contacts/settingswidget.ui:101
i18n: ectx: property (text), item, widget (KComboBox, fConflictResolution)
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
rc.cpp:303 rc.cpp:421 rc.cpp:750
|
|
|
22.
|
|
|
Handheld Overrides
|
|
|
i18n: file: kpilot/config_page_sync.ui:178
i18n: ectx: property (text), item, widget (KComboBox, fConflictResolution)
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
rc.cpp:306
|
|
|
23.
|
|
|
PC Overrides
|
|
|
i18n: file: kpilot/config_page_sync.ui:183
i18n: ectx: property (text), item, widget (KComboBox, fConflictResolution)
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
rc.cpp:309
|
|
|
24.
|
|
|
Values From Last Sync (if possible)
|
|
|
i18n: file ./conduits/vcalconduit/korganizerConduit.ui line 218
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
rc.cpp:55 rc.cpp:145 rc.cpp:1400
|
|
|
25.
|
|
|
Use Both Entries
|
|
|
i18n: file: Documentation/base-conduit-template/contacts-settings.ui:93
i18n: ectx: property (text), item, widget (KComboBox, fConflictResolution)
i18n: file: conduits/contacts/settingswidget.ui:96
i18n: ectx: property (text), item, widget (KComboBox, fConflictResolution)
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
rc.cpp:418 rc.cpp:747
|
|
|
26.
|
|
|
<qt>Select in this list how conflicting entries (entries which were edited both on your handheld and on the PC) are resolved. Possibly values are "Use KPilot's Global Setting" to use the settings defined in KPilot HotSync configuration, "Ask User" to let you decide case by case, "Do Nothing" to allow the entries to be different, "PC overrides", "Handheld overrides", "Use values from last sync" and "Use both entries" to create a new entry on both the PC and handheld. Note that this does <i>not</i> handle double-scheduling conflicts.</qt>
|
|
|
|
|
(no translation yet)
|
|
|
