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

[nomail]

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

date: 2004/05/13 16:20:05;  author: mkaemmerer;  state: Exp;  lines: +1 -1

Log Message:
- "donothing" in "Konflikte spter in phpGW" auflösen umbenannt
=====================================================================
Index: sync/setup/phpgw_en.lang
diff -u sync/setup/phpgw_en.lang:1.10 sync/setup/phpgw_en.lang:1.11
--- sync/setup/phpgw_en.lang:1.10       Wed May 12 16:05:51 2004
+++ sync/setup/phpgw_en.lang    Thu May 13 16:20:05 2004
@@ -29,7 +29,7 @@
 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
+conflict_donothing     common  en      resolve conflict later in phpGW
 last_sync_status       common  en      status of last synchronizations
 lastsync_fullsync      common  en      reset (synchronize all)
 sync_devicelabel       common  en      device