From cb7eddb91455a69cf66fcd717e91a51ca5e2cfef Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 16 Feb 2011 20:17:18 +0000 Subject: Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpilot@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- conduits/abbrowserconduit/resolutionDialog_base.ui | 129 +++++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 conduits/abbrowserconduit/resolutionDialog_base.ui (limited to 'conduits/abbrowserconduit/resolutionDialog_base.ui') diff --git a/conduits/abbrowserconduit/resolutionDialog_base.ui b/conduits/abbrowserconduit/resolutionDialog_base.ui new file mode 100644 index 0000000..0f4b7c0 --- /dev/null +++ b/conduits/abbrowserconduit/resolutionDialog_base.ui @@ -0,0 +1,129 @@ + +ResolutionDialogBase + + + widget2 + + + + 0 + 0 + 459 + 350 + + + + widget2 + + + + unnamed + + + + fIntroText + + + The following record was edited both on the handheld and on the PC. Please choose which values shall be synced: + + + WordBreak|AlignVCenter + + + + + + Field + + + false + + + false + + + + fResolutionView + + + true + + + AllColumns + + + <qt>Use this list to resolve, field by field, the conflicts created when a record was edited both on the handheld and on the PC. For each record, the different values from the last sync, the handheld and PC are displayed for each field, allowing you to choose the desired value.</qt> + + + + + textLabel1 + + + Line breaks in any of the entries are denoted by a " | " (without the quotes). + + + WordBreak|AlignVCenter + + + + + frame3 + + + GroupBoxPanel + + + + unnamed + + + + fKeepBoth + + + &Keep Both + + + <qt>Click this button to use both values, resulting in the duplication of the record.</qt> + + + + + fPCValues + + + &PC Values + + + <qt>Click this button to use the PC values for synchronizing all conflicting fields in this record.</qt> + + + + + fBackupValues + + + &Last Sync Values + + + <qt>Click this button to use the last sync values (old values) for synchronizing all conflicting fields in this record.</qt> + + + + + fPalmValues + + + &Handheld Values + + + <qt>Click this button to use the handheld values for synchronizing all conflicting fields in this record.</qt> + + + + + + + + -- cgit v1.2.1