diff --git a/preferences/changepassword.php b/preferences/changepassword.php
index 8aaad30586..c0a450227a 100755
--- a/preferences/changepassword.php
+++ b/preferences/changepassword.php
@@ -30,7 +30,7 @@ if (! $submit) {
     <table border="0">
      <tr>
        <td>
-        <?php echo lang_pref("enter your new password"); ?>
+        <?php echo lang("enter your new password"); ?>
        </td>
        <td>
         <input type="password" name="n_passwd">
@@ -38,7 +38,7 @@ if (! $submit) {
      </tr>
      <tr>
        <td>
-        <?php echo lang_pref("re-enter your password"); ?>
+        <?php echo lang("re-enter your password"); ?>
        </td>
        <td>
         <input type="password" name="n_passwd_2">
@@ -46,23 +46,23 @@ if (! $submit) {
      </tr>
      <tr>
        <td colspan="2">
-        <input type="submit" name="submit" value="<?php echo lang_common("change"); ?>">
+        <input type="submit" name="submit" value="<?php echo lang("change"); ?>">
        </td>
      </tr>
     </table>
    </form>
    <br>
-   <pre><?php echo lang_pref("note: This feature does *not* change your email password. This will "
+   <pre><?php echo lang("note: This feature does *not* change your email password. This will "
             		   . "need to be done manually."); ?>
    </pre>
 <?php
   include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
 } else {
    if ($n_passwd != $n_passwd_2)
-      $error = lang_pref("the two passwords are not the same");
+      $error = lang("the two passwords are not the same");
 
    if (! $n_passwd)
-      $error = lang_pref("you must enter a password");
+      $error = lang("you must enter a password");
 
    if ($error) {
       phpgw_navbar();
diff --git a/preferences/changetheme.php b/preferences/changetheme.php
index 95b5b17861..3104aae6c9 100755
--- a/preferences/changetheme.php
+++ b/preferences/changetheme.php
@@ -40,8 +40,8 @@
   $phpgw->common->header();
   $phpgw->common->navbar();
 
-  echo "<br>" . lang_pref("your current theme is: x",$phpgw_info["user"]["preferences"]["theme"]);
-  echo "<br>" . lang_pref("please, select a new theme") . ":";
+  echo "<br>" . lang("your current theme is: x",$phpgw_info["user"]["preferences"]["theme"]);
+  echo "<br>" . lang("please, select a new theme") . ":";
   echo "<br>";
 
   for ($i=0; $i<count($installed_themes); $i++) {
diff --git a/preferences/index.php b/preferences/index.php
index b981865f8d..5960a451a6 100755
--- a/preferences/index.php
+++ b/preferences/index.php
@@ -22,16 +22,16 @@
   }
 
   echo "<br><a href=\"" . $phpgw->link("changepassword.php") . "\">"
-     . lang_pref("change your password") . "</a>";
+     . lang("change your password") . "</a>";
   echo "<br><a href=\"" . $phpgw->link("changetheme.php") . "\">"
-     . lang_pref("select different theme") . "</a>";
+     . lang("select different theme") . "</a>";
   echo "<br><a href=\"" . $phpgw->link("settings.php") . "\">"
-     . lang_pref("change your settings") . "</a>";
+     . lang("change your settings") . "</a>";
   echo "<br><a href=\"" . $phpgw->link("changeprofile.php") . "\">"
-     . lang_pref("change your profile") . "</a>";
+     . lang("change your profile") . "</a>";
 //  if ($phpgw_info["user"]["permissions"]["nntp"])
   if ($phpgw_info["user"]["apps"]["nntp"])
     echo "<br><a href=\"" . $phpgw->link("nntp.php") . "\">"
-       . lang_pref("monitor newsgroups") . "</a>";
+       . lang("monitor newsgroups") . "</a>";
 
   include($phpgw_info["server"]["api_dir"] . "/footer.inc.php");
diff --git a/preferences/nntp.php b/preferences/nntp.php
index f2b43dfa66..52cc353469 100755
--- a/preferences/nntp.php
+++ b/preferences/nntp.php
@@ -112,8 +112,8 @@
 		        . "<input type=\"hidden\" name=\"query_result\" value=\"".$query_result."\">\n";
 
     $t->set_var("search_value",$query);
-    $t->set_var("search",lang_common("search"));
-    $t->set_var("next",lang_nntp("next"));
+    $t->set_var("search",lang("search"));
+    $t->set_var("next",lang("next"));
 
     $t->set_var("nml",$phpgw->nextmatchs->left(	$urlname,
 					$start,
@@ -124,7 +124,7 @@
 					$tg,
 				  	"&tg=$tg&sort=$sort&order=$order"));
 
-    $t->set_var("title",lang_nntp("Newsgroups"));
+    $t->set_var("title",lang("Newsgroups"));
     $t->set_var("action_url",$phpgw->link($urlname));
     $t->set_var("common_hidden_vars",$common_hidden_vars);
     $t->set_var("th_bg",$phpgw_info["theme"]["th_bg"]);
@@ -159,7 +159,7 @@
       if ($i+1 <> count($nntpavailgroups["con"]))
 	$t->parse("output","nntp_list",True);
     }
-    $t->set_var("lang_update",lang_nntp("update"));
+    $t->set_var("lang_update",lang("update"));
     $t->set_var("checkmark",$phpgw_info["server"]["webserver_url"]."/email/images/check.gif");
 
     $t->pparse("out","nntp_footer");
diff --git a/preferences/settings.php b/preferences/settings.php
index 3933bde75b..a1c9017d7b 100755
--- a/preferences/settings.php
+++ b/preferences/settings.php
@@ -30,7 +30,7 @@
 ?>
       <tr>
        <td>
-        <?php echo lang_pref($text); ?> ?
+        <?php echo lang($text); ?> ?
        </td>
        <td>
         <input type="checkbox" name="<?php echo $option; ?>" value="True"<?php if ($phpgw_info["user"]["preferences"][$option]) echo " checked"; ?>>
@@ -41,7 +41,7 @@
 ?>
       <tr>
        <td>
-        <?php echo lang_pref("email signature"); ?>
+        <?php echo lang("email signature"); ?>
        </td>
        <td>
         <textarea name="email_sig" rows="3" cols="30"><?php echo $phpgw_info["user"]["preferences"]["email_sig"]; ?></textarea>
@@ -57,14 +57,14 @@
       <form method="POST" action="<?php echo $phpgw->link("settings.php"); ?>">
        <table border=0>
        <tr>
-        <td><?php echo lang_pref("max matchs per page"); ?>: </td>
+        <td><?php echo lang("max matchs per page"); ?>: </td>
         <td>
          <input name="maxmatchs" value="<?php
            echo $phpgw_info["user"]["preferences"]["maxmatchs"]; ?>" size="2">
         </td>
        </tr>
        <tr>
-        <td><?php echo lang_pref("Show text on navigation icons"); ?>: </td>
+        <td><?php echo lang("Show text on navigation icons"); ?>: </td>
         <td>
          <input type="checkbox" name="navbar_text"<?php
            if ($phpgw_info["user"]["preferences"]["navbar_text"])
@@ -73,7 +73,7 @@
         </td>
        </tr>
        <tr>
-        <td><?php echo lang_pref("time zone offset"); ?>: </td>
+        <td><?php echo lang("time zone offset"); ?>: </td>
         <td>
          <select name="tz_offset"><?php
            for ($i = -23; $i<24; $i++) {
@@ -86,12 +86,12 @@
                   echo ">+$i</option>\n";
            }
          ?></select>
-         <?php echo lang_pref("This server is located in the x timezone",strftime("%Z")); ?>
+         <?php echo lang("This server is located in the x timezone",strftime("%Z")); ?>
         </td>
        </tr>
 
        <tr>
-        <td><?php echo lang_pref("date format"); ?>:</td>
+        <td><?php echo lang("date format"); ?>:</td>
         <td>
          <?php $df[$phpgw_info["user"]["preferences"]["dateformat"]] = " selected"; ?>
          <select name="dateformat">
@@ -114,7 +114,7 @@
         </td>
        </tr>
        <tr>
-        <td><?php echo lang_pref("time format"); ?>:</td>
+        <td><?php echo lang("time format"); ?>:</td>
         <td><?php
             $timeformat_select[$phpgw_info["user"]["preferences"]["timeformat"]] = " selected";
             echo "<select name=\"timeformat\">"
@@ -125,7 +125,7 @@
         </td>
        </tr>
        <tr>
-         <td><?php echo lang_pref("language"); ?></td>
+         <td><?php echo lang("language"); ?></td>
          <td>
           <?php $lang_select[$phpgw_info["user"]["preferences"]["lang"]] = " selected"; ?>
           <select name="lang">
@@ -150,7 +150,7 @@
          if ($phpgw_info["user"]["apps"]["calendar"]) {
             ?>
             <tr>
-             <td><?php echo lang_pref("show high priority events on main screen"); ?> ?</td>
+             <td><?php echo lang("show high priority events on main screen"); ?> ?</td>
 	     <td><input type="checkbox" name="mainscreen_showevents" value="Y" <?php if ($phpgw_info["user"]["preferences"]["mainscreen_showevents"] == "Y") echo " checked"; ?>></td>
 
             </tr>
@@ -158,11 +158,11 @@
             $t_weekday[$phpgw_info["user"]["preferences"]["weekdaystarts"]] = " selected";
 ?>
              <tr>
-              <td><?php echo lang_pref("weekday starts on"); ?></td>
+              <td><?php echo lang("weekday starts on"); ?></td>
               <td>
                <select name="weekdaystarts">
-	        <option value="Monday"<?php echo $t_weekday["monday"]; ?>><?php echo lang_common("monday"); ?></option>
-	        <option value="Sunday"<?php echo $t_weekday["sunday"]; ?>><?php echo lang_common("sunday"); ?></option>
+	        <option value="Monday"<?php echo $t_weekday["monday"]; ?>><?php echo lang("monday"); ?></option>
+	        <option value="Sunday"<?php echo $t_weekday["sunday"]; ?>><?php echo lang("sunday"); ?></option>
 	       </select>
               </td>
 <?php
@@ -170,7 +170,7 @@
             $t_workdaystarts[$phpgw_info["user"]["preferences"]["workdaystarts"]] = " selected";
 ?>
              <tr>
-              <td><?php echo lang_pref("work day starts on"); ?></td>
+              <td><?php echo lang("work day starts on"); ?></td>
               <td>
                <select name="workdaystarts">
 	       <?php
@@ -183,7 +183,7 @@
              </tr>
             <?php $t_workdayends[$phpgw_info["user"]["preferences"]["workdayends"]] = " selected"; ?>
              <tr>
-              <td><?php echo lang_pref("work day ends on"); ?></td>
+              <td><?php echo lang("work day ends on"); ?></td>
               <td>
                <select name="workdayends">
 	        <?php
@@ -196,7 +196,7 @@
              </tr>
 
              <tr>
-              <td><?php echo lang_pref("Default application"); ?></td>
+              <td><?php echo lang("Default application"); ?></td>
 	         <td><select name="default_app">
                    <option value="">&nbsp;</option>
                   <?php
@@ -207,7 +207,7 @@
 				  if ($phpgw_info["user"]["preferences"]["default_app"] == $permission[0]) {
 					 echo " selected";
                           }
-				  echo ">" . lang_common($phpgw_info["apps"][$permission[0]]["title"])
+				  echo ">" . lang($phpgw_info["apps"][$permission[0]]["title"])
 					 . "</option>";
                        }
                     }
@@ -215,7 +215,7 @@
              </tr>
 
              <tr>
-              <td><?php echo lang_pref("Default sorting order"); ?></td>
+              <td><?php echo lang("Default sorting order"); ?></td>
 	      <td><?php
                     $default_order_display[$phpgw_info["user"]["preferences"]["default_sorting"]] = " selected"; ?>
                   <select name="default_sorting">
@@ -230,7 +230,7 @@
          if ($phpgw_info["user"]["apps"]["headlines"]) {
 ?>
             <tr>
-             <td><?php echo lang_pref("select headline news sites"); ?>:</td>
+             <td><?php echo lang("select headline news sites"); ?>:</td>
 <?php
 	     echo "<td><select name=\"headlines[]\" multiple size=5>\n";
 
@@ -255,7 +255,7 @@
 
        <tr>
         <td colspan="2" align="center">
-         <input type="submit" name="submit" value="<?php echo lang_common("submit"); ?>">
+         <input type="submit" name="submit" value="<?php echo lang("submit"); ?>">
         </td>
        </tr>
        </table>