[Phpgroupware-cvs] CVS: preferences/setup phpgw_de.lang,1.9,1.10 phpgw_en.lang,1.9,1.10

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/preferences/setup
In directory subversions:/tmp/cvs-serv6866

Modified Files:
        phpgw_de.lang phpgw_en.lang 
Log Message:
merged my and gugux changes from 0.9.14

Index: phpgw_de.lang
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/setup/phpgw_de.lang,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** phpgw_de.lang       24 Nov 2002 18:41:32 -0000      1.9
--- phpgw_de.lang       18 Mar 2003 10:38:42 -0000      1.10
***************
*** 1,2 ****
--- 1,3 ----
+ acl grants have been updated  preferences     de      ACL 
(Zugangskontrollliste) wurde upgedatet
  change your password  preferences     de      Passwort ändern
  change your profile   preferences     de      Profil ändern
***************
*** 5,11 ****
  default application   preferences     de      Standard-Anwendung
  default preferences   preferences     de      Voreinstellungen
  edit custom fields    preferences     de      Benutzerdefinierte Felder 
editieren
  enter your new password       preferences     de      Neues Passwort eingeben
! forced preferences    preferences     de      Feststehende Einstellungen
  icons and text        preferences     de      Icons und Text
  icons only    preferences     de      nur Icons
--- 6,14 ----
  default application   preferences     de      Standard-Anwendung
  default preferences   preferences     de      Voreinstellungen
+ description can not exceed 255 characters in length ! preferences     de      
Die Beschreibung darf nicht länger als 255 Zeichen sein !
  edit custom fields    preferences     de      Benutzerdefinierte Felder 
editieren
  enter your new password       preferences     de      Neues Passwort eingeben
! error: there was a problem finding the preference file for %1 in %2   
preferences     de      Fehler: Es gab ein Problem die Einstellungen für %1 in 
%2 zu finden
! forced preferences    preferences     de      Erzwungene Einstellungen
  icons and text        preferences     de      Icons und Text
  icons only    preferences     de      nur Icons
***************
*** 13,17 ****
  language      preferences     de      Sprache
  max matches per page  preferences     de      maximale Treffer pro Seite
- max matchs per page   preferences     de      Maximale Treffer pro Seite
  note: this feature does *not* change your email password. this will need to 
be done manually. preferences     de      Hinweis: Diese Funktion ändert 
*nicht* Ihr Passwort auf dem E-Mail server. Dies müssen sie separat tun.
  please, select a new theme    preferences     de      Bitte ein neues Schema 
wählen
--- 16,19 ----
***************
*** 26,32 ****
  the two passwords are not the same    preferences     de      Die beiden 
Passworte sind nicht identisch
  theme (colors/fonts) selection        preferences     de      Auswahl des 
Themas (Farben/Schriften)
! this server is located in the x timezone      preferences     de      Der 
Server befindet sich in der Zeitzone %1
  time format   preferences     de      Zeitformat
  you must enter a password     preferences     de      Sie müssen ein Passwort 
angeben
! your current theme is: x      preferences     de      Ihr aktuelles 
Farbschema ist: %1
  your preferences      preferences     de      Persönliche Einstellungen
--- 28,36 ----
  the two passwords are not the same    preferences     de      Die beiden 
Passworte sind nicht identisch
  theme (colors/fonts) selection        preferences     de      Auswahl des 
Themas (Farben/Schriften)
! this server is located in the %1 timezone     preferences     de      Der 
Server befindet sich in der Zeitzone %1
  time format   preferences     de      Zeitformat
+ users choice  preferences     de      Benutzerauswahl
+ %1 - preferences      preferences     de      %1 - Einstellungen
  you must enter a password     preferences     de      Sie müssen ein Passwort 
angeben
! your current theme is: %1     preferences     de      Ihr aktuelles 
Farbschema ist: %1
  your preferences      preferences     de      Persönliche Einstellungen

Index: phpgw_en.lang
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/setup/phpgw_en.lang,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** phpgw_en.lang       4 Oct 2002 20:58:39 -0000       1.9
--- phpgw_en.lang       18 Mar 2003 10:38:42 -0000      1.10
***************
*** 1,2 ****
--- 1,4 ----
+ %1 - Preferences      preferences     en      %1 - Preferences
+ acl grants have been updated  preferences     en      ACL grants have been 
updated
  change your password  preferences     en      Change your Password
  change your profile   preferences     en      Change your profile
***************
*** 5,10 ****
--- 7,14 ----
  default application   preferences     en      Default application
  default preferences   preferences     en      Default Preferences
+ description can not exceed 255 characters in length ! preferences     en      
Description can not exceed 255 characters in length !
  edit custom fields    preferences     en      edit custom fields
  enter your new password       preferences     en      Enter your new password
+ error: there was a problem finding the preference file for %1 in %2   
preferences     en      Error: There was a problem finding the preference file 
for %1 in %2
  forced preferences    preferences     en      Forced Preferences
  icons and text        preferences     en      Icons and text
***************
*** 22,30 ****
  show text on navigation icons preferences     en      Show text on navigation 
icons
  text only     preferences     en      Text only
- theme (colors/fonts) selection        preferences     en      Theme 
(colors/fonts) Selection
  the two passwords are not the same    preferences     en      The two 
passwords are not the same
! this server is located in the x timezone      preferences     en       This 
server is located in the %1 timezone
  time format   preferences     en      Time format
! your current theme is: x      preferences     en      </b>
  you must enter a password     preferences     en      You must enter a 
password
  your preferences      preferences     en      Your Preferences
--- 26,36 ----
  show text on navigation icons preferences     en      Show text on navigation 
icons
  text only     preferences     en      Text only
  the two passwords are not the same    preferences     en      The two 
passwords are not the same
! theme (colors/fonts) selection        preferences     en      Theme 
(colors/fonts) Selection
! this server is located in the %1 timezone     preferences     en       This 
server is located in the %1 timezone
  time format   preferences     en      Time format
! users choice  preferences     en      Users choice
! %1 - preferences      preferences     en      %1 - Preferences
  you must enter a password     preferences     en      You must enter a 
password
+ your current theme is: %1     preferences     en      your current theme is: 
%1
  your preferences      preferences     en      Your Preferences