[Phpgroupware-cvs] sync/setup/phpgw_en.lang, 1.3

[nomail]

Update of /sync/setup
Modified Files:
        Branch: 
          phpgw_en.lang

date: 2004/04/29 12:19:23;  author: mleonhardt;  state: Exp;  lines: +11 -1

Log Message:
- hooks for sync preferences and admin
- extended ui with:
  - user can delete their syncdevices
  - user can set the conflicthandling for each source in preferences
=====================================================================
Index: sync/setup/phpgw_en.lang
diff -u sync/setup/phpgw_en.lang:1.2 sync/setup/phpgw_en.lang:1.3
--- sync/setup/phpgw_en.lang:1.2        Mon Apr 26 16:46:25 2004
+++ sync/setup/phpgw_en.lang    Thu Apr 29 12:19:23 2004
@@ -3,7 +3,8 @@
 link_cleartables       common  en      Clear all tables
 link_testcase  common  en      call testcase
 link_showdevicelist    common  en      show devicelist
-status_del_deldevice   common  en      Status %s, device %s %s deleted
+status_deldevice       common  en      %s, device %s %s deleted
+status_prefsaved       common  en      %s, settings %s saved
 status_ok      common  en      OK
 status_error   common  en      Error
 status_not     common  en      not
@@ -13,3 +14,12 @@
 head_username  common  en      username
 head_edit      common  en      edit
 head_delete    common  en      delete
+head_source    common  en      application to sync
+head_conflicthandling  common  en      how to handle conflicts
+sync_preferences       common  en      synchronisation preferences
+conflicthandling       common  en      setup the way handling synchronisation 
conflicts
+reset  common  en      Reset
+conflict_serverwins    common  en      clientdata overwritten by serverdata
+conflict_clientwins    common  en      serverdata overwritten by clientdata
+conflict_duplicate     common  en      duplicate entry
+conflict_donothing     common  en      ignore conflicts