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

[nomail]

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

date: 2004/05/02 15:03:20;  author: mkaemmerer;  state: Exp;  lines: +9 -9

Log Message:
- improved english translation
=====================================================================
Index: sync/setup/phpgw_en.lang
diff -u sync/setup/phpgw_en.lang:1.7 sync/setup/phpgw_en.lang:1.8
--- sync/setup/phpgw_en.lang:1.7        Sun May  2 14:30:07 2004
+++ sync/setup/phpgw_en.lang    Sun May  2 15:03:20 2004
@@ -1,12 +1,12 @@
-sync   common  en      Sync Module
+sync   common  en      Synchronization Module
 link_back      common  en      back to mainpage
-link_cleartables       common  en      Clear all tables
+link_cleartables       common  en      clear all tables
 link_testcase  common  en      call testcase
-link_showdevicelist    common  en      show devicelist
+link_showdevicelist    common  en      show device list
 link_preferences       common  en      show preferences
 link_syncmodule        common  en      to the %s
 status_deldevice       common  en      %s, device %s %s deleted
-status_devicedescsaved common  en      %s, new device description %s changed
+status_devicedescsaved common  en      %s, device description %s changed
 status_prefsaved       common  en      %s, settings %s saved
 status_ok      common  en      OK
 status_error   common  en      Error
@@ -21,13 +21,13 @@
 head_source    common  en      application to sync
 head_conflicthandling  common  en      how to handle conflicts
 head_lastsync  common  en      date of last synchronization
-head_fullsync  common  en      next sync will be fullsync
+head_fullsync  common  en      next sync will be full sync
 sync_preferences       common  en      synchronization preferences
-conflicthandling       common  en      setup the way handling synchronization 
conflicts
+conflicthandling       common  en      edit synchronization conflict handling
 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_serverwins    common  en      phpGW overwrites data from device
+conflict_clientwins    common  en      device overwrites data in phpGW
+conflict_duplicate     common  en      duplicate item
 conflict_donothing     common  en      ignore conflicts
 last_sync_status       common  en      status of last synchronizations
 sync_devicelabel       common  en      device