[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] sync/setup/phpgw_en.lang, 1.16
From: |
nomail |
Subject: |
[Phpgroupware-cvs] sync/setup/phpgw_en.lang, 1.16 |
Date: |
Thu, 1 Jul 2004 10:47:06 +0200 |
Update of /sync/setup
Modified Files:
Branch:
phpgw_en.lang
date: 2004/07/01 08:47:06; author: mleonhardt; state: Exp; lines: +13 -0
Log Message:
- handful new functions for conflict-view in UI
=====================================================================
Index: sync/setup/phpgw_en.lang
diff -u sync/setup/phpgw_en.lang:1.15 sync/setup/phpgw_en.lang:1.16
--- sync/setup/phpgw_en.lang:1.15 Thu Jun 17 16:00:26 2004
+++ sync/setup/phpgw_en.lang Thu Jul 1 08:47:06 2004
@@ -2,11 +2,14 @@
link_back common en back to mainpage
link_cleartables common en clear all tables
link_testcase common en call testcase
+link_showconflictlist common en show conflicts
link_showdevicelist common en show device list
+link_showsourcelist common en show source list
link_preferences common en show preferences
link_syncmodule common en to the %s
link_admindevicelist common en edit devicelist
link_adminsourcelist common en edit sourcelist
+link_apply common en apply this entry
status_deldevice common en %s, device %s %s deleted
status_delsource common en %s, source %s %s deleted
status_devicedescsaved common en %s, device description for %s changed
@@ -18,6 +21,7 @@
status_not common en not
status_never common en not yet
status_noconflictsources common en There aren't synchronized
sources yet.
+status_admindisabled common en You haven't admin permissions.
head_account common en account
head_uri common en URI
head_description common en description
@@ -31,9 +35,18 @@
head_new common en create a new
head_source common en application to sync
head_conflicthandling common en how to handle conflicts
+head_conflictlist common en conflict resolution for source %s
head_lastsync common en date of last synchronization
head_fullsync common en next sync will be full sync
head_devicelist common en device / client list
+head_sourcelist common en sourcelist
+head_module common en phpGroupware modul
+head_conflict common en conflict %s
+head_conflicts common en edit conflicts
+head_fieldname common en fieldname
+head_fieldserver common en serverfield
+head_fieldclient common en clientfield
+head_fieldresult common en field to use
sync_preferences common en synchronization preferences
conflicthandling common en edit synchronization conflict handling
reset common en Reset
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] sync/setup/phpgw_en.lang, 1.16,
nomail <=