Index: plugins/blocks/mrbs/settings.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/settings.php,v
retrieving revision 1.4
diff -u -r1.4 settings.php
--- plugins/blocks/mrbs/settings.php	31 Jul 2008 12:00:20 -0000	1.4
+++ plugins/blocks/mrbs/settings.php	1 Aug 2008 03:56:10 -0000
@@ -1,4 +1,4 @@
-<?php  //$Id: settings.php,v 1.4 2008/07/31 12:00:20 arborrow Exp $
+<?php  //$Id: settings.php,v 1.3 2008/07/30 17:28:42 arborrow Exp $
 
 
 $settings->add(new admin_setting_configtext('block_mrbs_serverpath', get_string('serverpath', 'block_mrbs'),
Index: plugins/blocks/mrbs/web/del.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/del.php,v
retrieving revision 1.3
diff -u -r1.3 del.php
--- plugins/blocks/mrbs/web/del.php	31 Jul 2008 21:55:36 -0000	1.3
+++ plugins/blocks/mrbs/web/del.php	1 Aug 2008 03:56:10 -0000
@@ -1,5 +1,5 @@
 <?php
-# $Id: del.php,v 1.3 2008/07/31 21:55:36 arborrow Exp $
+# $Id: del.php,v 1.2 2007/12/28 05:53:05 arborrow Exp $
 require_once("../../../config.php"); //for Moodle integration
 require_once "grab_globals.inc.php";
 include "config.inc.php";
@@ -77,7 +77,7 @@
 		
 		echo "<center>";
 		echo "<H1>" .  get_string('sure','block_mrbs') . "</h1>";
-		echo "<H1><a href=\"del.php?type=room&room=$room&confirm=Y\">" . get_string('YES','block_mrbs') . "!</a> &nbsp;&nbsp;&nbsp; <a href=admin.php>" . get_string('NO','block_mrbs') . "!</a></h1>";
+		echo "<H1><a href=\"del.php?type=room&room=$room&confirm=Y\">" . get_string('yes') . "!</a> &nbsp;&nbsp;&nbsp; <a href=admin.php>" . get_string('no') . "!</a></h1>";
 		echo "</center>";
 		include "trailer.php";
 	}
Index: plugins/blocks/mrbs/web/functions.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/functions.php,v
retrieving revision 1.3
diff -u -r1.3 functions.php
--- plugins/blocks/mrbs/web/functions.php	31 Jul 2008 21:55:37 -0000	1.3
+++ plugins/blocks/mrbs/web/functions.php	1 Aug 2008 03:56:11 -0000
@@ -1,6 +1,6 @@
 <?php
 
-# $Id: functions.php,v 1.3 2008/07/31 21:55:37 arborrow Exp $
+# $Id: functions.php,v 1.2 2007/12/28 05:53:06 arborrow Exp $
 require_once("../../../config.php"); //for Moodle integration
 # probably a bad place to put this, but for error reporting purposes
 # $pview must be defined. if it's not then there's errors generated all
@@ -176,17 +176,17 @@
           </FORM>
          </TD>
          <TD CLASS="banner" BGCOLOR="#C0E0FF" ALIGN=CENTER>
-          <A HREF="help.php?day=<?php echo $day ?>&month=<?php echo $month ?>&year=<?php echo $year ?>"><?php echo get_string('help','block_mrbs') ?></A>
+          <A HREF="help.php?day=<?php echo $day ?>&month=<?php echo $month ?>&year=<?php echo $year ?>"><?php echo get_string('help') ?></A>
          </TD>
          <TD CLASS="banner" BGCOLOR="#C0E0FF" ALIGN=CENTER>
-          <A HREF="admin.php?day=<?php echo $day ?>&month=<?php echo $month ?>&year=<?php echo $year ?>"><?php echo get_string('admin','block_mrbs') ?></A>
+          <A HREF="admin.php?day=<?php echo $day ?>&month=<?php echo $month ?>&year=<?php echo $year ?>"><?php echo get_string('admin') ?></A>
          </TD>
          <TD CLASS="banner" BGCOLOR="#C0E0FF" ALIGN=CENTER>
-          <A HREF="report.php"><?php echo get_string('report','block_mrbs') ?></A>
+          <A HREF="report.php"><?php echo get_string('report') ?></A>
          </TD>
          <TD CLASS="banner" BGCOLOR="#C0E0FF" ALIGN=CENTER>
           <FORM METHOD=GET ACTION="search.php">
-           <FONT SIZE=2><A HREF="search.php?advanced=1"><?php echo get_string('search','block_mrbs') ?></A> </FONT>
+           <FONT SIZE=2><A HREF="search.php?advanced=1"><?php echo get_string('search') ?></A> </FONT>
            <INPUT TYPE=TEXT   NAME="search_str" VALUE="<?php echo $search_str ?>" SIZE=10>
            <INPUT TYPE=HIDDEN NAME=day        VALUE="<?php echo $day        ?>"        >
            <INPUT TYPE=HIDDEN NAME=month      VALUE="<?php echo $month      ?>"        >
@@ -234,22 +234,22 @@
 					if(($dur >= 52) && ($dur % 52 == 0))
 					{
 						$dur  /= 52;
-						$units = get_string('years','block_mrbs');
+						$units = get_string('years');
 					}
 					else
 						$units = get_string('weeks','block_mrbs');
 				}
 				else
-					$units = get_string('days','block_mrbs');
+					$units = get_string('days');
 			}
 			else
 				$units = get_string('hours','block_mrbs');
 		}
 		else
-			$units = get_string('minutes','block_mrbs');
+			$units = get_string('minutes');
 	}
 	else
-		$units = get_string('seconds','block_mrbs');
+		$units = get_string('secs');
 }
 
 
@@ -266,7 +266,7 @@
         {
                 if( $start_period == 0 && $dur == $max_periods )
                 {
-                        $units = get_string('days','block_mrbs');
+                        $units = get_string('days');
                         $dur = 1;
                         return;
                 }
@@ -275,7 +275,7 @@
                 if(($dur >= 24) && is_int($dur))
                 {
                 	$dur /= 24;
-			$units = get_string('days','block_mrbs');
+			$units = get_string('days');
                         return;
                 }
                 else
@@ -520,7 +520,7 @@
   <INPUT TYPE=HIDDEN NAME=day        VALUE=\"$day\">
   <INPUT TYPE=HIDDEN NAME=month      VALUE=\"$month\">
   <INPUT TYPE=HIDDEN NAME=year       VALUE=\"$year\">
-  <input type=submit value=\"".get_string('change','block_mrbs')."\">
+  <input type=submit value=\"".get_string('savechanges')."\">
 </form>\n";
 
 	return $out_html;
@@ -547,7 +547,7 @@
   <INPUT TYPE=HIDDEN NAME=month      VALUE=\"$month\"        >
   <INPUT TYPE=HIDDEN NAME=year       VALUE=\"$year\"      >
   <INPUT TYPE=HIDDEN NAME=area       VALUE=\"$area\"         >
-  <input type=submit value=\"".get_string('change','block_mrbs')."\">
+  <input type=submit value=\"".get_string('savechanges')."\">
 </form>\n";
 
 	return $out_html;
Index: plugins/blocks/mrbs/web/lang.en.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/lang.en.php,v
retrieving revision 1.3
diff -u -r1.3 lang.en.php
--- plugins/blocks/mrbs/web/lang.en.php	31 Jul 2008 21:55:36 -0000	1.3
+++ plugins/blocks/mrbs/web/lang.en.php	1 Aug 2008 03:56:11 -0000
@@ -1,5 +1,5 @@
 <?php
-# $Id: lang.en.php,v 1.3 2008/07/31 21:55:36 arborrow Exp $
+# $Id: lang.en.php,v 1.2 2007/12/28 05:53:05 arborrow Exp $
 
 # This file contains PHP code that specifies language specific strings
 # The default strings come from lang.en, and anything in a locale
Index: plugins/blocks/mrbs/web/session_php.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/session_php.php,v
retrieving revision 1.2
diff -u -r1.2 session_php.php
--- plugins/blocks/mrbs/web/session_php.php	31 Jul 2008 21:55:36 -0000	1.2
+++ plugins/blocks/mrbs/web/session_php.php	1 Aug 2008 03:56:12 -0000
@@ -17,7 +17,7 @@
 *                                                                             *
 \*****************************************************************************/
 
-// $Id: session_php.php,v 1.2 2008/07/31 21:55:36 arborrow Exp $
+// $Id: session_php.php,v 1.1 2007/04/05 22:25:33 arborrow Exp $
 require_once("../../../config.php"); //for Moodle integration
 global $PHP_SELF, $USER;
 
@@ -47,7 +47,7 @@
         $NewPassword = unslashes($NewPassword);
         if (!authValidateUser($NewUserName, $NewUserPassword)) {
             print_header_mrbs(0, 0, 0, 0);
-            echo "<P>".get_string('unknown_user','block_mrbs')."</P>\n";
+            echo "<P>".get_string('usernamenotfound')."</P>\n";
             printLoginForm($TargetURL);
             exit();
         }
@@ -81,22 +81,22 @@
     global $PHP_SELF;
 ?>
 <p>
-  <?php echo get_string('please_login','block_mrbs') ?>
+  <?php echo get_string('loginsite') ?>
 </p>
 <form method="post" action="<?php echo basename($PHP_SELF) ?>">
   <table>
     <tr>
-      <td align="right"><?php echo get_string('user_name','block_mrbs') ?></td>
+      <td align="right"><?php echo get_string('username') ?></td>
       <td><input type="text" name="NewUserName" /></td>
     </tr>
     <tr>
-      <td align="right"><?php echo get_string('user_password','block_mrbs') ?></td>
+      <td align="right"><?php echo get_string('password') ?></td>
       <td><input type="password" name="NewUserPassword" /></td>
     </tr>
   </table>
   <input type="hidden" name="TargetURL" value="<?php echo $TargetURL ?>" /> <br />
   <input type="hidden" name="Action" value="SetName" /> <br />
-  <input type="submit" value=" <?php echo get_string('login','block_mrbs') ?> " /> <br />
+  <input type="submit" value=" <?php echo get_string('login') ?> " /> <br />
 </form>
 </body>
 </html>
@@ -182,10 +182,10 @@
 	    <input type="hidden" name="Action" value="SetName" />
 	    <input type="hidden" name="NewUserName" value="" />
 	    <input type="hidden" name="NewUserPassword" value="" />
-	    <input type="submit" value=" <?php echo get_string('logoff','block_mrbs') ?> " />
+	    <input type="submit" value=" <?php echo get_string('logout') ?> " />
 	  </FORM>
 <?php if (isset($user_list_link)) print "	  <br>\n	  " .
-	    "<A href='$user_list_link'>" . get_string('user_list','block_mrbs') . "</A><br>\n" ;
+	    "<A href='$user_list_link'>" . get_string('userlist') . "</A><br>\n" ;
 ?>
 	</TD>
 <?php
@@ -194,14 +194,14 @@
     {
 ?>
 	<TD CLASS="banner" BGCOLOR="#C0E0FF" ALIGN=CENTER>
-	  <A name="logonBox" href=""><?php echo get_string('unknown_user','block_mrbs'); ?></A><br>
+	  <A name="logonBox" href=""><?php echo get_string('usernamenotfound'); ?></A><br>
           <FORM METHOD=POST ACTION="admin.php">
 	    <input type="hidden" name="TargetURL" value="<?php echo $TargetURL ?>" />
 	    <input type="hidden" name="Action" value="QueryName" />
-	    <input type="submit" value=" <?php echo get_string('login','block_mrbs') ?> " />
+	    <input type="submit" value=" <?php echo get_string('login') ?> " />
 	  </FORM>
 <?php if (isset($user_list_link)) print "	  <br>\n	  " .
-	    "<A href=\"$user_list_link\">" . get_string('user_list','block_mrbs') . "</A><br>\n" ;
+	    "<A href=\"$user_list_link\">" . get_string('userlist') . "</A><br>\n" ;
 ?>
 	</TD>
 <?php
Index: plugins/blocks/mrbs/web/config.inc.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/config.inc.php,v
retrieving revision 1.5
diff -u -r1.5 config.inc.php
--- plugins/blocks/mrbs/web/config.inc.php	31 Jul 2008 21:55:37 -0000	1.5
+++ plugins/blocks/mrbs/web/config.inc.php	1 Aug 2008 03:56:10 -0000
@@ -1,6 +1,6 @@
 <?php
 
-# $Id: config.inc.php,v 1.5 2008/07/31 21:55:37 arborrow Exp $
+# $Id: config.inc.php,v 1.3 2008/07/30 22:18:05 arborrow Exp $
 
 ###########################################################################
 #   MRBS Configuration File
Index: plugins/blocks/mrbs/web/month.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/month.php,v
retrieving revision 1.4
diff -u -r1.4 month.php
--- plugins/blocks/mrbs/web/month.php	31 Jul 2008 21:55:36 -0000	1.4
+++ plugins/blocks/mrbs/web/month.php	1 Aug 2008 03:56:12 -0000
@@ -1,5 +1,5 @@
 <?php
-# $Id: month.php,v 1.4 2008/07/31 21:55:36 arborrow Exp $
+# $Id: month.php,v 1.3 2007/12/26 14:40:35 arborrow Exp $
 
 # mrbs/month.php - Month-at-a-time view
 require_once("../../../config.php"); //for Moodle integration
Index: plugins/blocks/mrbs/web/mrbs_sql.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/mrbs_sql.php,v
retrieving revision 1.3
diff -u -r1.3 mrbs_sql.php
--- plugins/blocks/mrbs/web/mrbs_sql.php	31 Jul 2008 21:55:37 -0000	1.3
+++ plugins/blocks/mrbs/web/mrbs_sql.php	1 Aug 2008 03:56:12 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: mrbs_sql.php,v 1.3 2008/07/31 21:55:37 arborrow Exp $
+// $Id: mrbs_sql.php,v 1.2 2008/07/31 02:06:19 arborrow Exp $
 require_once("../../../config.php"); //for Moodle integration
 /** mrbsCheckFree()
  * 
Index: plugins/blocks/mrbs/web/language.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/language.php,v
retrieving revision 1.3
diff -u -r1.3 language.php
--- plugins/blocks/mrbs/web/language.php	31 Jul 2008 21:55:38 -0000	1.3
+++ plugins/blocks/mrbs/web/language.php	1 Aug 2008 03:56:12 -0000
@@ -1,6 +1,6 @@
 <?php
 
-# $Id: language.php,v 1.3 2008/07/31 21:55:38 arborrow Exp $
+# $Id: language.php,v 1.2 2007/12/28 05:53:06 arborrow Exp $
 require_once("../../../config.php"); //for Moodle integration
 # A map is needed to convert from the HTTP language specifier to a
 # locale specifier for Windows
Index: plugins/blocks/mrbs/web/session_http.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/session_http.php,v
retrieving revision 1.2
diff -u -r1.2 session_http.php
--- plugins/blocks/mrbs/web/session_http.php	31 Jul 2008 21:55:36 -0000	1.2
+++ plugins/blocks/mrbs/web/session_http.php	1 Aug 2008 03:56:12 -0000
@@ -14,7 +14,7 @@
 *                                                                             *
 \*****************************************************************************/
 
-// $Id: session_http.php,v 1.2 2008/07/31 21:55:36 arborrow Exp $
+// $Id: session_http.php,v 1.1 2007/04/05 22:25:33 arborrow Exp $
 require_once("../../../config.php"); //for Moodle integration
 /* authGet()
  * 
@@ -98,7 +98,7 @@
          . get_string('show_my_entries','block_mrbs') . "\">" . get_string('you_are','block_mrbs')." "
          .$user ?></A><br>
 <?php if (isset($user_list_link)) print "	  <br>\n	  " .
-	    "<A href='$user_list_link'>" . get_string('user_list','block_mrbs') . "</A><br>\n" ;
+	    "<A href='$user_list_link'>" . get_string('userlist') . "</A><br>\n" ;
 ?>
     </TD>
 <?php
@@ -107,14 +107,14 @@
     {
 ?>
     <TD CLASS="banner" BGCOLOR="#C0E0FF" ALIGN=CENTER>
-       <A name="logonBox" href=""><?php echo get_string('unknown_user','block_mrbs').'http!'; ?></A><br>
+       <A name="logonBox" href=""><?php echo get_string('usernamenotfound').'http!'; ?></A><br>
           <FORM METHOD=POST ACTION="admin.php">
 	    <input type="hidden" name="TargetURL" value="<?php echo $TargetURL ?>" />
 	    <input type="hidden" name="Action" value="QueryName" />
-	    <input type="submit" value=" <?php echo get_string('login','block_mrbs') ?> " />
+	    <input type="submit" value=" <?php echo get_string('login') ?> " />
 	  </FORM>
 <?php if (isset($user_list_link)) print "	  <br>\n	  " .
-	    "<A href=\"$user_list_link\">" . get_string('user_list','block_mrbs') . "</A><br>\n" ;
+	    "<A href=\"$user_list_link\">" . get_string('userlist') . "</A><br>\n" ;
 ?>
 	</TD>
 <?php
Index: plugins/blocks/mrbs/web/help.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/help.php,v
retrieving revision 1.3
diff -u -r1.3 help.php
--- plugins/blocks/mrbs/web/help.php	31 Jul 2008 21:55:36 -0000	1.3
+++ plugins/blocks/mrbs/web/help.php	1 Aug 2008 03:56:11 -0000
@@ -1,6 +1,6 @@
 <?php
 
-# $Id: help.php,v 1.3 2008/07/31 21:55:36 arborrow Exp $
+# $Id: help.php,v 1.2 2007/12/28 05:53:05 arborrow Exp $
 require_once("../../../config.php"); //for Moodle integration
 require_once "grab_globals.inc.php";
 include "config.inc.php";
@@ -30,7 +30,7 @@
 echo "<BR>" . get_string('system','block_mrbs') . php_uname() . "\n";
 echo "<BR>PHP: " . phpversion() . "\n";
 
-echo "<H3>" . get_string('help','block_mrbs') . "</H3>\n";
+echo "<H3>" . get_string('help') . "</H3>\n";
 echo get_string('please_contact','block_mrbs') . '<a href="mailto:' . $mrbs_admin_email
 	. '">' . $mrbs_admin
 	. "</a> " . get_string('for_any_questions','block_mrbs') . "\n";
Index: plugins/blocks/mrbs/web/functions_mail.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/functions_mail.php,v
retrieving revision 1.3
diff -u -r1.3 functions_mail.php
--- plugins/blocks/mrbs/web/functions_mail.php	31 Jul 2008 21:55:37 -0000	1.3
+++ plugins/blocks/mrbs/web/functions_mail.php	1 Aug 2008 03:56:11 -0000
@@ -11,10 +11,10 @@
 // |        are likely to be used.                                             |
 // +---------------------------------------------------------------------------+
 // | @author    thierry_bo.                                                    |
-// | @version   $Revision: 1.3 $.                                              |
+// | @version   $Revision: 1.2 $.                                              |
 // +---------------------------------------------------------------------------+
 //
-// $Id: functions_mail.php,v 1.3 2008/07/31 21:55:37 arborrow Exp $
+// $Id: functions_mail.php,v 1.2 2007/12/28 05:53:06 arborrow Exp $
 
 require_once("../../../config.php"); //for Moodle integration
 // {{{ removeMailUnicode()
Index: plugins/blocks/mrbs/web/admin.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/admin.php,v
retrieving revision 1.3
diff -u -r1.3 admin.php
--- plugins/blocks/mrbs/web/admin.php	31 Jul 2008 21:55:37 -0000	1.3
+++ plugins/blocks/mrbs/web/admin.php	1 Aug 2008 03:56:10 -0000
@@ -1,6 +1,6 @@
 <?php
 
-# $Id: admin.php,v 1.3 2008/07/31 21:55:37 arborrow Exp $
+# $Id: admin.php,v 1.2 2007/12/28 05:53:05 arborrow Exp $
 require_once("../../../config.php");
 require_once "grab_globals.inc.php";
 include "config.inc.php";
@@ -54,7 +54,7 @@
 }
 ?>
 
-<h2><?php echo get_string('administration','block_mrbs') ?></h2>
+<h2><?php echo get_string('administration') ?></h2>
 
 <table border=1>
 <tr>
@@ -77,7 +77,7 @@
 	for ($i = 0; ($row = sql_row($res, $i)); $i++) {
 		$area_name_q = urlencode($row[1]);
 		echo "<li><a href=\"admin.php?area=$row[0]&area_name=$area_name_q\">"
-			. htmlspecialchars($row[1]) . "</a> (<a href=\"edit_area_room.php?area=$row[0]\">" . get_string('edit','block_mrbs') . "</a>) (<a href=\"del.php?type=area&area=$row[0]\">" .  get_string('delete','block_mrbs') . "</a>)\n";
+			. htmlspecialchars($row[1]) . "</a> (<a href=\"edit_area_room.php?area=$row[0]\">" . get_string('edit') . "</a>) (<a href=\"del.php?type=area&area=$row[0]\">" .  get_string('delete') . "</a>)\n";
 	}
 	echo "</ul>";
 }
@@ -95,7 +95,7 @@
 		echo "<ul>";
 		for ($i = 0; ($row = sql_row($res, $i)); $i++) {
 			echo "<li>" . htmlspecialchars($row[1]) . "(" . htmlspecialchars($row[2])
-			. ", $row[3]) (<a href=\"edit_area_room.php?room=$row[0]\">" . get_string('edit','block_mrbs') . "</a>) (<a href=\"del.php?type=room&room=$row[0]\">" . get_string('delete','block_mrbs') . "</a>)\n";
+			. ", $row[3]) (<a href=\"edit_area_room.php?room=$row[0]\">" . get_string('edit') . "</a>) (<a href=\"del.php?type=room&room=$row[0]\">" . get_string('delete') . "</a>)\n";
 		}
 		echo "</ul>";
 	}
@@ -113,7 +113,7 @@
 <input type=hidden name=type value=area>
 
 <TABLE>
-<TR><TD><?php echo get_string('name','block_mrbs') ?>:       </TD><TD><input type=text name=name></TD></TR>
+<TR><TD><?php echo get_string('name') ?>:       </TD><TD><input type=text name=name></TD></TR>
 </TABLE>
 <input type=submit value="<?php echo get_string('addarea','block_mrbs') ?>">
 </form>
@@ -127,8 +127,8 @@
 <input type=hidden name=area value=<?php echo $area; ?>>
 
 <TABLE>
-<TR><TD><?php echo get_string('name','block_mrbs') ?>:       </TD><TD><input type=text name=name></TD></TR>
-<TR><TD><?php echo get_string('description','block_mrbs') ?></TD><TD><input type=text name=description></TD></TR>
+<TR><TD><?php echo get_string('name') ?>:       </TD><TD><input type=text name=name></TD></TR>
+<TR><TD><?php echo get_string('description') ?></TD><TD><input type=text name=description></TD></TR>
 <TR><TD><?php echo get_string('capacity','block_mrbs') ?>:   </TD><TD><input type=text name=capacity></TD></TR>
 </TABLE>
 <input type=submit value="<?php echo get_string('addroom','block_mrbs') ?>">
Index: plugins/blocks/mrbs/web/search.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/search.php,v
retrieving revision 1.3
diff -u -r1.3 search.php
--- plugins/blocks/mrbs/web/search.php	31 Jul 2008 21:55:37 -0000	1.3
+++ plugins/blocks/mrbs/web/search.php	1 Aug 2008 03:56:12 -0000
@@ -1,5 +1,5 @@
 <?php
-# $Id: search.php,v 1.3 2008/07/31 21:55:37 arborrow Exp $
+# $Id: search.php,v 1.2 2007/12/28 05:53:06 arborrow Exp $
 require_once("../../../config.php"); //for Moodle integration
 require_once "grab_globals.inc.php";
 include "config.inc.php";
@@ -41,9 +41,9 @@
 	echo "<H3>" . get_string('advanced_search','block_mrbs') . "</H3>";
 	echo "<FORM METHOD=GET ACTION=\"search.php\">";
 	echo get_string('search_for','block_mrbs') . " <INPUT TYPE=TEXT SIZE=25 NAME=\"search_str\"><br>";
-	echo get_string('from','block_mrbs'). " ";
+	echo get_string('from'). " ";
 	genDateSelector ("", $day, $month, $year);
-	echo "<br><INPUT TYPE=SUBMIT VALUE=\"" . get_string('search_button','block_mrbs') ."\">";
+	echo "<br><INPUT TYPE=SUBMIT VALUE=\"" . get_string('search') ."\">";
 	include "trailer.php";
 	echo "</BODY>";
 	echo "</HTML>";
@@ -76,7 +76,7 @@
 
 if($total <= 0)
 {
-	echo "<B>" . get_string('nothing_found','block_mrbs') . "</B>\n";
+	echo "<B>" . get_string('nothingtodisplay') . "</B>\n";
 	include "trailer.php";
 	exit;
 }
@@ -114,7 +114,7 @@
 		echo "&total=$total&year=$year&month=$month&day=$day\">";
 	}
 
-	echo "<B>" . get_string('previous','block_mrbs') . "</B>";
+	echo "<B>" . get_string('previous') . "</B>";
 
 	if($has_prev)
 		echo "</A>";
@@ -130,7 +130,7 @@
 		echo "&total=$total&year=$year&month=$month&day=$day\">";
 	}
 
-	echo "<B>". get_string('next','block_mrbs') ."</B>";
+	echo "<B>". get_string('next') ."</B>";
 
 	if($has_next)
 		echo "</A>";
@@ -142,14 +142,14 @@
     <TH><?php echo get_string('entry','block_mrbs') ?></TH>
     <TH><?php echo get_string('createdby','block_mrbs') ?></TH>
     <TH><?php echo get_string('namebooker','block_mrbs') ?></TH>
-    <TH><?php echo get_string('description','block_mrbs') ?></TH>
+    <TH><?php echo get_string('description') ?></TH>
     <TH><?php echo get_string('start_date','block_mrbs') ?></TH>
    </TR>
 <?php
 for ($i = 0; ($row = sql_row($result, $i)); $i++)
 {
 	echo "<TR>";
-	echo "<TD><A HREF=\"view_entry.php?id=$row[0]\">".get_string('view','block_mrbs')."</A></TD>\n";
+	echo "<TD><A HREF=\"view_entry.php?id=$row[0]\">".get_string('view')."</A></TD>\n";
 	echo "<TD>" . htmlspecialchars($row[1]) . "</TD>\n";
 	echo "<TD>" . htmlspecialchars($row[2]) . "</TD>\n";
 	echo "<TD>" . htmlspecialchars($row[3]) . "</TD>\n";
Index: plugins/blocks/mrbs/web/mysqli.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/mysqli.php,v
retrieving revision 1.2
diff -u -r1.2 mysqli.php
--- plugins/blocks/mrbs/web/mysqli.php	31 Jul 2008 21:55:37 -0000	1.2
+++ plugins/blocks/mrbs/web/mysqli.php	1 Aug 2008 03:56:12 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: mysqli.php,v 1.2 2008/07/31 21:55:37 arborrow Exp $
+// $Id: mysqli.php,v 1.1 2008/07/30 22:18:05 arborrow Exp $
 
 // mysql.php - Simple PHP database support for MySQL.
 // Include this file after defining the following variables:
Index: plugins/blocks/mrbs/web/report.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/report.php,v
retrieving revision 1.4
diff -u -r1.4 report.php
--- plugins/blocks/mrbs/web/report.php	31 Jul 2008 21:55:37 -0000	1.4
+++ plugins/blocks/mrbs/web/report.php	1 Aug 2008 03:56:12 -0000
@@ -1,5 +1,5 @@
 <?php
-# $Id: report.php,v 1.4 2008/07/31 21:55:37 arborrow Exp $
+# $Id: report.php,v 1.3 2007/12/27 04:54:07 arborrow Exp $
 require_once("../../../config.php"); //for Moodle integration
 require_once "grab_globals.inc.php";
 include "config.inc.php";
@@ -149,7 +149,7 @@
 			echo "<hr><h2>". get_string('room','block_mrbs') . ": " . $area_room . "</h2>\n";
 		if ($date != $last_date || $area_room != $last_area_room)
 		{
-			echo "<hr noshade=\"true\"><h3>". get_string('date','block_mrbs') . " " . $date . "</h3>\n";
+			echo "<hr noshade=\"true\"><h3>". get_string('date') . " " . $date . "</h3>\n";
 			$last_date = $date;
 		}
 		# remember current area/room that is being processed.
@@ -162,7 +162,7 @@
 	# entries to be sorted on start date
 	{
 		if ($date != $last_date)
-			echo "<hr><h2>". get_string('date','block_mrbs') . " " . $date . "</h2>\n";
+			echo "<hr><h2>". get_string('date') . " " . $date . "</h2>\n";
 		if ($area_room != $last_area_room  || $date != $last_date)
 		{
 			echo "<hr noshade=\"true\"><h3>". get_string('room','block_mrbs') . ": " . $area_room . "</h3>\n";
@@ -198,7 +198,7 @@
 			"</td></tr>\n";
 
 	# Description:
-	echo "<tr><td class=\"BL\" colspan=2><b>".get_string('description','block_mrbs')."</b> " .
+	echo "<tr><td class=\"BL\" colspan=2><b>".get_string('description')."</b> " .
 		nl2br(htmlspecialchars($row[4])) . "</td></tr>\n";
 
 	# Entry Type:
@@ -206,7 +206,7 @@
 	echo "<tr><td class=\"BL\" colspan=2><b>".get_string('type','block_mrbs')."</b> $et</td></tr>\n";
 	# Created by and last update timestamp:
 	echo "<tr><td class=\"BL\" colspan=2><small><b>".get_string('createdby','block_mrbs')."</b> " .
-		htmlspecialchars($row[6]) . ", <b>".get_string('lastupdate','block_mrbs')."</b> " .
+		htmlspecialchars($row[6]) . ", <b>".get_string('lastmodified')."</b> " .
 		date_time_string($row[7]) . "</small></td></tr>\n";
 
 	echo "</table>\n";
@@ -289,7 +289,7 @@
 		$col_count_total[$c] = 0;
 		$col_hours_total[$c] = 0.0;
 	}
-	echo "<td class=\"BR\" align=right><br><b>".get_string('total','block_mrbs')."</b></td></tr>\n";
+	echo "<td class=\"BR\" align=right><br><b>".get_string('total')."</b></td></tr>\n";
 	$grand_count_total = 0;
 	$grand_hours_total = 0;
 
@@ -320,7 +320,7 @@
 		$grand_count_total += $row_count_total;
 		$grand_hours_total += $row_hours_total;
 	}
-	echo "<tr><td class=\"BR\" align=right><b>".get_string('total','block_mrbs')."</b></td>\n";
+	echo "<tr><td class=\"BR\" align=right><b>".get_string('total')."</b></td>\n";
 	for ($c = 0; $c < $n_rooms; $c++)
 		cell($col_count_total[$c], $col_hours_total[$c]);
 	cell($grand_count_total, $grand_hours_total);
@@ -544,7 +544,7 @@
 	$nmatch = sql_count($res);
 	if ($nmatch == 0)
 	{
-		echo "<P><B>" . get_string('nothing_found','block_mrbs') . "</B>\n";
+		echo "<P><B>" . get_string('nothingtodisplay') . "</B>\n";
 		sql_free($res);
 	}
 	else
Index: plugins/blocks/mrbs/web/week.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/week.php,v
retrieving revision 1.4
diff -u -r1.4 week.php
--- plugins/blocks/mrbs/web/week.php	31 Jul 2008 21:55:37 -0000	1.4
+++ plugins/blocks/mrbs/web/week.php	1 Aug 2008 03:56:12 -0000
@@ -1,5 +1,5 @@
 <?php
-# $Id: week.php,v 1.4 2008/07/31 21:55:37 arborrow Exp $
+# $Id: week.php,v 1.3 2007/12/26 14:40:35 arborrow Exp $
 
 # mrbs/week.php - Week-at-a-time view
 require_once("../../../config.php"); //for Moodle integration
@@ -297,7 +297,7 @@
 echo "<table cellspacing=0 border=1 width=\"100%\">";
 
 # The header row contains the weekday names and short dates.
-echo "<tr><th width=\"1%\"><br>".($enable_periods ? get_string('period','block_mrbs') : get_string('time','block_mrbs'))."</th>";
+echo "<tr><th width=\"1%\"><br>".($enable_periods ? get_string('period','block_mrbs') : get_string('time'))."</th>";
 if (empty($dateformat))
 	$dformat = "%a<br>%b %d";
 else
@@ -314,7 +314,7 @@
 if ( FALSE != $times_right_side )
 {
     echo "<th width=\"1%\"><br>"
-    . ( $enable_periods  ? get_string('period','block_mrbs') : get_string('time','block_mrbs') )
+    . ( $enable_periods  ? get_string('period','block_mrbs') : get_string('time') )
     . "</th>";
 }
 
Index: plugins/blocks/mrbs/web/pgsql.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/pgsql.php,v
retrieving revision 1.2
diff -u -r1.2 pgsql.php
--- plugins/blocks/mrbs/web/pgsql.php	31 Jul 2008 21:55:36 -0000	1.2
+++ plugins/blocks/mrbs/web/pgsql.php	1 Aug 2008 03:56:12 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: pgsql.php,v 1.2 2008/07/31 21:55:36 arborrow Exp $
+// $Id: pgsql.php,v 1.1 2007/04/05 22:25:33 arborrow Exp $
 
 // pgsql.php - Simple PHP database support for PostgreSQL.
 // Include this file after defining the following variables:
Index: plugins/blocks/mrbs/web/view_entry.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/view_entry.php,v
retrieving revision 1.5
diff -u -r1.5 view_entry.php
--- plugins/blocks/mrbs/web/view_entry.php	31 Jul 2008 21:55:36 -0000	1.5
+++ plugins/blocks/mrbs/web/view_entry.php	1 Aug 2008 03:56:12 -0000
@@ -1,5 +1,5 @@
 <?php
-# $Id: view_entry.php,v 1.5 2008/07/31 21:55:36 arborrow Exp $
+# $Id: view_entry.php,v 1.4 2008/07/31 02:06:19 arborrow Exp $
 require_once("../../../config.php"); //for Moodle integration
 require_once "grab_globals.inc.php";
 
@@ -195,7 +195,7 @@
 <H3><?php echo $name ?></H3>
  <table border=0>
    <tr>
-    <td><b><?php echo get_string('description','block_mrbs') ?></b></td>
+    <td><b><?php echo get_string('description') ?></b></td>
     <td><?php    echo nl2br($description) ?></td>
    </tr>
    <tr>
@@ -223,7 +223,7 @@
     <td><?php    echo $create_by ?></td>
    </tr>
    <tr>
-    <td><b><?php echo get_string('lastupdate','block_mrbs') ?></b></td>
+    <td><b><?php echo get_string('lastmodified') ?></b></td>
     <td><?php    echo $updated ?></td>
    </tr>
    <tr>
Index: plugins/blocks/mrbs/web/style.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/style.php,v
retrieving revision 1.3
diff -u -r1.3 style.php
--- plugins/blocks/mrbs/web/style.php	31 Jul 2008 21:55:37 -0000	1.3
+++ plugins/blocks/mrbs/web/style.php	1 Aug 2008 03:56:12 -0000
@@ -1,6 +1,6 @@
 <?php
 
-# $Id: style.php,v 1.3 2008/07/31 21:55:37 arborrow Exp $
+# $Id: style.php,v 1.2 2007/12/28 05:53:06 arborrow Exp $
 require_once("../../../config.php"); //for Moodle integration
 global $unicode_encoding;
 
Index: plugins/blocks/mrbs/web/day.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/day.php,v
retrieving revision 1.5
diff -u -r1.5 day.php
--- plugins/blocks/mrbs/web/day.php	31 Jul 2008 21:55:37 -0000	1.5
+++ plugins/blocks/mrbs/web/day.php	1 Aug 2008 03:56:10 -0000
@@ -1,5 +1,5 @@
 <?php
-# $Id: day.php,v 1.5 2008/07/31 21:55:37 arborrow Exp $
+# $Id: day.php,v 1.4 2007/12/28 05:53:06 arborrow Exp $
 require_once("../../../config.php");
 require_once "grab_globals.inc.php";
 include "config.inc.php";
@@ -241,7 +241,7 @@
 
 	#This is where we start displaying stuff
 	echo "<table cellspacing=0 border=1 width=\"100%\">";
-	echo "<tr><th width=\"1%\">".($enable_periods ? get_string('period','block_mrbs') : get_string('time','block_mrbs'))."</th>";
+	echo "<tr><th width=\"1%\">".($enable_periods ? get_string('period','block_mrbs') : get_string('time'))."</th>";
 
 	$room_column_width = (int)(95 / sql_count($res));
 	for ($i = 0; ($row = sql_row($res, $i)); $i++)
@@ -256,7 +256,7 @@
     # next line to display times on right side
     if ( FALSE != $times_right_side )
     {
-        echo "<th width=\"1%\">". ( $enable_periods  ? get_string('period','block_mrbs') : get_string('time','block_mrbs') )
+        echo "<th width=\"1%\">". ( $enable_periods  ? get_string('period','block_mrbs') : get_string('time') )
         ."</th>";
     }
     echo "</tr>\n";
Index: plugins/blocks/mrbs/web/edit_area_room.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/edit_area_room.php,v
retrieving revision 1.3
diff -u -r1.3 edit_area_room.php
--- plugins/blocks/mrbs/web/edit_area_room.php	31 Jul 2008 21:55:36 -0000	1.3
+++ plugins/blocks/mrbs/web/edit_area_room.php	1 Aug 2008 03:56:10 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: edit_area_room.php,v 1.3 2008/07/31 21:55:36 arborrow Exp $
+// $Id: edit_area_room.php,v 1.2 2007/12/28 05:53:06 arborrow Exp $
 require_once("../../../config.php"); //for Moodle integration
 require_once "grab_globals.inc.php";
 include "config.inc.php";
@@ -89,20 +89,20 @@
 <input type=hidden name="room" value="<?php echo $row["id"]?>">
 <CENTER>
 <TABLE>
-<TR><TD><?php echo get_string('name','block_mrbs') ?>:       </TD><TD><input type=text name="room_name" value="<?php
+<TR><TD><?php echo get_string('name') ?>:       </TD><TD><input type=text name="room_name" value="<?php
 echo htmlspecialchars($row["room_name"]); ?>"></TD></TR>
-<TR><TD><?php echo get_string('description','block_mrbs') ?></TD><TD><input type=text name=description value="<?php
+<TR><TD><?php echo get_string('description') ?></TD><TD><input type=text name=description value="<?php
 echo htmlspecialchars($row["description"]); ?>"></TD></TR>
 <TR><TD><?php echo get_string('capacity','block_mrbs') ?>:   </TD><TD><input type=text name=capacity value="<?php
 echo $row["capacity"]; ?>"></TD></TR>
 <TR><TD><?php echo get_string('room_admin_email','block_mrbs') ?></TD><TD><input type=text name=room_admin_email MAXLENGTH=75 value="<?php
 echo htmlspecialchars($row["room_admin_email"]); ?>"></TD>
 <?php if (FALSE == $valid_email) {
-    echo ("<TD>&nbsp;</TD><TD><STRONG>" . get_string('invalid_email','block_mrbs') . "<STRONG></TD>");
+    echo ("<TD>&nbsp;</TD><TD><STRONG>" . get_string('emailmustbereal') . "<STRONG></TD>");
 } ?></TR>
 </TABLE>
 <input type=submit name="change_room"
-value="<?php echo get_string('change','block_mrbs') ?>">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+value="<?php echo get_string('savechanges') ?>">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 <input type=submit name="change_done" value="<?php echo get_string('backadmin','block_mrbs') ?>">
 </CENTER>
 </form>
@@ -146,16 +146,16 @@
 <input type=hidden name="area" value="<?php echo $row["id"]?>">
 <CENTER>
 <TABLE>
-<TR><TD><?php echo get_string('name','block_mrbs') ?>:       </TD><TD><input type=text name="area_name" value="<?php
+<TR><TD><?php echo get_string('name') ?>:       </TD><TD><input type=text name="area_name" value="<?php
 echo htmlspecialchars($row["area_name"]); ?>"></TD></TR>
 <TR><TD><?php echo get_string('area_admin_email','block_mrbs') ?>:       </TD><TD><input type=text name="area_admin_email" MAXLENGTH=75 value="<?php
 echo htmlspecialchars($row["area_admin_email"]); ?>"></TD>
 <?php if (FALSE == $valid_email) {
-    echo ("<TD>&nbsp;</TD><TD><STRONG>" . get_string('invalid_email','block_mrbs') . "</STRONG></TD>");
+    echo ("<TD>&nbsp;</TD><TD><STRONG>" . get_string('emailmustbereal') . "</STRONG></TD>");
 } ?></TR>
 </TABLE>
 <input type=submit name="change_area"
-value="<?php echo get_string('change','block_mrbs') ?>">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+value="<?php echo get_string('savechanges') ?>">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 <input type=submit name="change_done" value="<?php echo get_string('backadmin','block_mrbs') ?>">
 </CENTER>
 </form>
Index: plugins/blocks/mrbs/web/mrbs_auth.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/mrbs_auth.php,v
retrieving revision 1.2
diff -u -r1.2 mrbs_auth.php
--- plugins/blocks/mrbs/web/mrbs_auth.php	31 Jul 2008 21:55:38 -0000	1.2
+++ plugins/blocks/mrbs/web/mrbs_auth.php	1 Aug 2008 03:56:12 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: mrbs_auth.php,v 1.2 2008/07/31 21:55:38 arborrow Exp $
+// $Id: mrbs_auth.php,v 1.1 2007/04/05 22:25:32 arborrow Exp $
 require_once("../../../config.php"); //for Moodle integration
 // include the authentification wrappers
 include "auth_$auth[type].php";
Index: plugins/blocks/mrbs/web/session_cookie.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/session_cookie.php,v
retrieving revision 1.2
diff -u -r1.2 session_cookie.php
--- plugins/blocks/mrbs/web/session_cookie.php	31 Jul 2008 21:55:38 -0000	1.2
+++ plugins/blocks/mrbs/web/session_cookie.php	1 Aug 2008 03:56:12 -0000
@@ -18,7 +18,7 @@
 *									      *
 \*****************************************************************************/
 
-// $Id: session_cookie.php,v 1.2 2008/07/31 21:55:38 arborrow Exp $
+// $Id: session_cookie.php,v 1.1 2007/04/05 22:25:33 arborrow Exp $
 require_once("../../../config.php"); //for Moodle integration
 /*
   Target of the form with sets the URL argument "Action=SetName".
@@ -43,7 +43,7 @@
         if (!authValidateUser($NewUserName, $NewUserPassword))
         {
             print_header_mrbs(0, 0, 0, 0);
-            echo "<P>".get_string('unknown_user','block_mrbs')."</P>\n";
+            echo "<P>".get_string('usernamenotfound')."</P>\n";
             printLoginForm($TargetURL);
             exit();
         }
@@ -76,22 +76,22 @@
     global $PHP_SELF;
 ?>
 <p>
-  <?php echo get_string('please_login','block_mrbs') ?>
+  <?php echo get_string('loginsite') ?>
 </p>
 <form method="post" action="<?php echo basename($PHP_SELF) ?>">
   <table>
     <tr>
-      <td align="right"><?php echo get_string('user_name','block_mrbs') ?></td>
+      <td align="right"><?php echo get_string('username') ?></td>
       <td><input type="text" name="NewUserName" /></td>
     </tr>
     <tr>
-      <td align="right"><?php echo get_string('user_password','block_mrbs') ?></td>
+      <td align="right"><?php echo get_string('password') ?></td>
       <td><input type="password" name="NewUserPassword" /></td>
     </tr>
   </table>
   <input type="hidden" name="TargetURL" value="<?php echo $TargetURL ?>" /> <br />
   <input type="hidden" name="Action" value="SetName" /> <br />
-  <input type="submit" value="<?php echo get_string('login','block_mrbs') ?> " /> <br />
+  <input type="submit" value="<?php echo get_string('login') ?> " /> <br />
 </form>
 </body>
 </html>
@@ -173,10 +173,10 @@
 	    <input type="hidden" name="Action" value="SetName" />
 	    <input type="hidden" name="UserName" value="" />
 	    <input type="hidden" name="UserPassword" value="" />
-	    <input type="submit" value=" <?php echo get_string('logoff','block_mrbs') ?> " />
+	    <input type="submit" value=" <?php echo get_string('logout') ?> " />
 	  </FORM>
 <?php if (isset($user_list_link)) print "	  <br>\n	  " .
-	    "<A href=\"$user_list_link\">" . get_string('user_list','block_mrbs') . "</A><br>\n" ;
+	    "<A href=\"$user_list_link\">" . get_string('userlist') . "</A><br>\n" ;
 ?>
 	</TD>
 <?php
@@ -185,14 +185,14 @@
     {
 ?>
 	<TD CLASS="banner" BGCOLOR="#C0E0FF" ALIGN=CENTER>
-	  <A name="logonBox" href=""><?php echo get_string('unknown_user','block_mrbs'); ?></A><br>
+	  <A name="logonBox" href=""><?php echo get_string('usernamenotfound'); ?></A><br>
           <FORM METHOD=POST ACTION="admin.php">
 	    <input type="hidden" name="TargetURL" value="<?php echo $TargetURL ?>" />
 	    <input type="hidden" name="Action" value="QueryName" />
-	    <input type="submit" value=" <?php echo get_string('login','block_mrbs') ?> " />
+	    <input type="submit" value=" <?php echo get_string('login') ?> " />
 	  </FORM>
 <?php if (isset($user_list_link)) print "	  <br>\n	  " .
-	    "<A href=\"$user_list_link\">" . get_string('user_list','block_mrbs') . "</A><br>\n" ;
+	    "<A href=\"$user_list_link\">" . get_string('userlist') . "</A><br>\n" ;
 ?>
 	</TD>
 <?php
Index: plugins/blocks/mrbs/web/lang.es.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/lang.es.php,v
retrieving revision 1.4
diff -u -r1.4 lang.es.php
--- plugins/blocks/mrbs/web/lang.es.php	31 Jul 2008 21:55:36 -0000	1.4
+++ plugins/blocks/mrbs/web/lang.es.php	1 Aug 2008 03:56:12 -0000
@@ -1,5 +1,5 @@
 <?
-# $Id: lang.es.php,v 1.4 2008/07/31 21:55:36 arborrow Exp $
+# $Id: lang.es.php,v 1.3 2007/04/15 23:44:37 arborrow Exp $
 
 # This file contains PHP code that specifies language specific strings
 # The default strings come from lang.en, and anything in a locale
Index: plugins/blocks/mrbs/web/edit_entry.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/edit_entry.php,v
retrieving revision 1.4
diff -u -r1.4 edit_entry.php
--- plugins/blocks/mrbs/web/edit_entry.php	31 Jul 2008 21:55:36 -0000	1.4
+++ plugins/blocks/mrbs/web/edit_entry.php	1 Aug 2008 03:56:11 -0000
@@ -1,5 +1,5 @@
 <?php
-# $Id: edit_entry.php,v 1.4 2008/07/31 21:55:36 arborrow Exp $
+# $Id: edit_entry.php,v 1.3 2008/07/31 02:06:19 arborrow Exp $
 require_once("../../../config.php"); //for Moodle integration
 require_once('grab_globals.inc.php');
 include "config.inc.php";
@@ -214,7 +214,7 @@
   // null strings and spaces only strings not allowed
   if(/(^$)|(^\s+$)/.test(document.forms["main"].name.value))
   {
-    alert ( "<?php echo get_string('you_have_not_entered','block_mrbs') . '\n' . get_string('brief_description','block_mrbs') ?>");
+    alert ( "<?php echo get_string('you_have_not_entered','block_mrbs') . '\n' . get_string('description') ?>");
     return false;
   }
   <?php if( ! $enable_periods ) { ?>
@@ -297,14 +297,14 @@
   <TD CLASS=TL><TEXTAREA NAME="description" ROWS=8 COLS=40 WRAP="virtual"><?php echo
 htmlspecialchars ( $description ); ?></TEXTAREA></TD></TR>
 
-<TR><TD CLASS=CR><B><?php echo get_string('date','block_mrbs')?></B></TD>
+<TR><TD CLASS=CR><B><?php echo get_string('date')?></B></TD>
  <TD CLASS=CL>
   <?php genDateSelector("", $start_day, $start_month, $start_year) ?>
  </TD>
 </TR>
 
 <?php if(! $enable_periods ) { ?>
-<TR><TD CLASS=CR><B><?php echo get_string('time','block_mrbs')?></B></TD>
+<TR><TD CLASS=CR><B><?php echo get_string('time')?></B></TD>
   <TD CLASS=CL><INPUT NAME="hour" SIZE=2 VALUE="<?php if (!$twentyfourhour_format && ($start_hour > 12)){ echo ($start_hour - 12);} else { echo $start_hour;} ?>" MAXLENGTH=2>:<INPUT NAME="minute" SIZE=2 VALUE="<?php echo $start_min;?>" MAXLENGTH=2>
 <?php
 if (!$twentyfourhour_format)
@@ -554,10 +554,10 @@
 <TR>
  <TD colspan=2 align=center>
   <SCRIPT LANGUAGE="JavaScript">
-   document.writeln ( '<INPUT TYPE="button" NAME="save_button" VALUE="<?php echo get_string('save','block_mrbs')?>" ONCLICK="validate_and_submit()">' );
+   document.writeln ( '<INPUT TYPE="button" NAME="save_button" VALUE="<?php echo get_string('savechanges')?>" ONCLICK="validate_and_submit()">' );
   </SCRIPT>
   <NOSCRIPT>
-   <INPUT TYPE="submit" VALUE="<?php echo get_string('save','block_mrbs')?>">
+   <INPUT TYPE="submit" VALUE="<?php echo get_string('savechanges')?>">
   </NOSCRIPT>
  </TD></TR>
 </TABLE>
Index: plugins/blocks/mrbs/web/mysql.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/mysql.php,v
retrieving revision 1.3
diff -u -r1.3 mysql.php
--- plugins/blocks/mrbs/web/mysql.php	31 Jul 2008 21:55:37 -0000	1.3
+++ plugins/blocks/mrbs/web/mysql.php	1 Aug 2008 03:56:12 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: mysql.php,v 1.3 2008/07/31 21:55:37 arborrow Exp $
+// $Id: mysql.php,v 1.2 2007/12/28 05:53:06 arborrow Exp $
 
 // mysql.php - Simple PHP database support for MySQL.
 // Include this file after defining the following variables:
Index: plugins/blocks/mrbs/web/trailer.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/trailer.php,v
retrieving revision 1.3
diff -u -r1.3 trailer.php
--- plugins/blocks/mrbs/web/trailer.php	31 Jul 2008 21:55:37 -0000	1.3
+++ plugins/blocks/mrbs/web/trailer.php	1 Aug 2008 03:56:12 -0000
@@ -1,5 +1,5 @@
 <?php
-# $Id: trailer.php,v 1.3 2008/07/31 21:55:37 arborrow Exp $
+# $Id: trailer.php,v 1.2 2007/12/28 05:53:06 arborrow Exp $
 require_once("../../../config.php"); //for Moodle integration
 if ( $pview != 1 ) {
 
Index: plugins/blocks/mrbs/web/edit_users.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/edit_users.php,v
retrieving revision 1.3
diff -u -r1.3 edit_users.php
--- plugins/blocks/mrbs/web/edit_users.php	31 Jul 2008 21:55:37 -0000	1.3
+++ plugins/blocks/mrbs/web/edit_users.php	1 Aug 2008 03:56:11 -0000
@@ -20,7 +20,7 @@
 *									      *
 \*****************************************************************************/
 
-// $Id: edit_users.php,v 1.3 2008/07/31 21:55:37 arborrow Exp $
+// $Id: edit_users.php,v 1.2 2007/12/28 05:53:06 arborrow Exp $
 require_once("../../../config.php"); //for Moodle integration
 require_once "grab_globals.inc.php";
 include "config.inc.php";
@@ -149,7 +149,7 @@
     }
     else
     {
-        print "<h2>" . get_string('add_new_user','block_mrbs') . "</h2>\n";
+        print "<h2>" . get_string('addnewuser') . "</h2>\n";
     }
 
     if (($Id >= 0) && ($level == 2)) /* Administrators get the right to delete users */
@@ -186,7 +186,7 @@
         (!isset($invalid_email)) ? $invalid_email = '' : '' ;
         if ( ($field_name[$i] == "email") && (1 == $invalid_email) )
         {
-            print ("<td><STRONG>" . get_string('invalid_email','block_mrbs') . "<STRONG></td>\n");
+            print ("<td><STRONG>" . get_string('emailmustbereal') . "<STRONG></td>\n");
         }
         print "    </tr>\n";
         }
@@ -197,14 +197,14 @@
     for ($i=0; $i<2; $i++)
         {
         print "    <tr>\n";
-        print "      <td align=right valign=center>" . get_string('user_password','block_mrbs') . "</td>\n";
+        print "      <td align=right valign=center>" . get_string('password') . "</td>\n";
         print "      <td><input type=password name=password$i value=\"\" /></td>\n";
         print "    </tr>\n";
         }
     print "  </table>\n";
 /*    print "  <input type=hidden name=Id value=\"$this_id\" /> <br />\n"; */
     print "  <input type=hidden name=Action value=Update /> <br />\n";
-    print "  <input type=submit value=\" " . get_string('ok','block_mrbs') . " \" /> <br />\n";
+    print "  <input type=submit value=\" " . get_string('ok') . " \" /> <br />\n";
     print "</form>\n</body>\n</html>\n";
 
     exit();
@@ -221,10 +221,10 @@
         {
 	print_header_mrbs(0, 0, 0, "");
 
-        print get_string('passwords_not_eq','block_mrbs') . "<br>\n";
+        print get_string('passwordsdiffer') . "<br>\n";
 
         print "<form method=post action=\"" . basename($PHP_SELF) . "\">\n";
-        print "  <input type=submit value=\" " . get_string('ok','block_mrbs') . " \" /> <br />\n";
+        print "  <input type=submit value=\" " . get_string('ok') . " \" /> <br />\n";
         print "</form>\n</body>\n</html>\n";
 
         exit();
@@ -284,7 +284,7 @@
         print sql_error() . "<br>\n";
         
         print "<form method=post action=\"" . basename($PHP_SELF) . "\">\n";
-        print "  <input type=submit value=\" " . get_string('ok','block_mrbs') . " \" /> <br />\n";
+        print "  <input type=submit value=\" " . get_string('ok') . " \" /> <br />\n";
         print "</form>\n</body>\n</html>\n";
 
         exit();
@@ -316,7 +316,7 @@
         print sql_error() . "<br>\n";
         
         print "<form method=post action=\"" . basename($PHP_SELF) . "\">\n";
-        print "  <input type=submit value=\" " . get_string('ok','block_mrbs') . " \" /> <br />\n";
+        print "  <input type=submit value=\" " . get_string('ok') . " \" /> <br />\n";
         print "</form>\n</body>\n</html>\n";
 
         exit();
@@ -333,7 +333,7 @@
 
 print_header_mrbs(0, 0, 0, "");
 
-print "<h2>" . get_string('user_list','block_mrbs') . "</h2>\n";
+print "<h2>" . get_string('userlist') . "</h2>\n";
 
 if ($initial_user_creation == 1)
 {
@@ -346,7 +346,7 @@
     print "<p><form method=post action=\"" . basename($PHP_SELF) . "\">\n";
     print "\t<input type=hidden name=Action value=Add />\n";
     print "\t<input type=hidden name=Id value=\"-1\" />\n";
-    print "\t<input style=\"margin:0\" type=submit value=\"" . get_string('add_new_user','block_mrbs') . "\" />\n";
+    print "\t<input style=\"margin:0\" type=submit value=\"" . get_string('addnewuser') . "\" />\n";
     print "</form></p>\n";
     }
 
@@ -354,10 +354,10 @@
 print "<table border=1>\n";
 print "<tr>";
 // The first 2 columns are the user rights and uaser name.
-print "<th>" . get_string('rights','block_mrbs') . "</th><th>" . get_string('user_name','block_mrbs') . "</th>";
+print "<th>" . get_string('rights','block_mrbs') . "</th><th>" . get_string('username') . "</th>";
 // The remaining columns are all the columns from the database, past the initial 3 (id, name, password).
 for ($i=3; $i<$nfields; $i++) print "<th>" . get_loc_field_name($i) . "</th>";
-print "<th>" . get_string('action','block_mrbs') . "</th>";
+print "<th>" . get_string('action') . "</th>";
 print "</tr>\n";
 $i = 0; 
 while ($line = sql_row($list, $i++))
@@ -378,9 +378,9 @@
             $name = $col_value;
             switch (authGetUserLevel($name, $auth["admin"]))
                 {
-                case 1: $right = get_string('user','block_mrbs'); break;
-                case 2: $right = get_string('administrator','block_mrbs'); break; // MRBS admin
-                case 3: $right = get_string('administrator','block_mrbs'); break; // Reserved for future user admin.
+                case 1: $right = get_string('user'); break;
+                case 2: $right = get_string('administrator'); break; // MRBS admin
+                case 3: $right = get_string('administrator'); break; // Reserved for future user admin.
                 default: $right = get_string('unknown','block_mrbs'); break;
                 }
             print "\t\t<td>$right</td>\n";
@@ -400,7 +400,7 @@
         print "\t\t    <form method=post action=\"" . basename($PHP_SELF) . "\">\n";
         print "\t\t\t<input type=hidden name=Action value=Edit />\n";
         print "\t\t\t<input type=hidden name=Id value=\"$this_id\" />\n";
-        print "\t\t\t<input style=\"margin:0\" type=submit value=\"" . get_string('edit','block_mrbs') . "\" />\n";
+        print "\t\t\t<input style=\"margin:0\" type=submit value=\"" . get_string('savechanges') . "\" />\n";
         print "\t\t    </form>\n";
         }
     else
Index: plugins/blocks/mrbs/web/edit_entry_handler.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/web/edit_entry_handler.php,v
retrieving revision 1.3
diff -u -r1.3 edit_entry_handler.php
--- plugins/blocks/mrbs/web/edit_entry_handler.php	31 Jul 2008 21:55:37 -0000	1.3
+++ plugins/blocks/mrbs/web/edit_entry_handler.php	1 Aug 2008 03:56:11 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: edit_entry_handler.php,v 1.3 2008/07/31 21:55:37 arborrow Exp $
+// $Id: edit_entry_handler.php,v 1.2 2007/12/28 05:53:06 arborrow Exp $
 require_once("../../../config.php"); //for Moodle integration
 require_once "grab_globals.inc.php";
 include "config.inc.php";
Index: plugins/blocks/mrbs/lang/en_utf8/block_mrbs.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/lang/en_utf8/block_mrbs.php,v
retrieving revision 1.4
diff -u -r1.4 block_mrbs.php
--- plugins/blocks/mrbs/lang/en_utf8/block_mrbs.php	31 Jul 2008 21:55:38 -0000	1.4
+++ plugins/blocks/mrbs/lang/en_utf8/block_mrbs.php	1 Aug 2008 03:56:10 -0000
@@ -1,15 +1,10 @@
-<?php // $Id: block_mrbs.php,v 1.4 2008/07/31 21:55:38 arborrow Exp $
+<?php // $Id: block_mrbs.php,v 1.3 2008/07/30 17:28:42 arborrow Exp $
 $string['about_mrbs']         = 'About MRBS';
 $string['accessdenied']       = 'Access Denied';
 $string['accessmrbs'] = 'Schedule a Resource (Computer Room)';
-$string['action']             = 'Action';
-$string['add_new_user']       = 'Add a new user';
 $string['addarea']            = 'Add Area';
 $string['addentry']           = 'Add Entry';
 $string['addroom']            = 'Add Room';
-$string['admin']              = 'Admin';
-$string['administration']     = 'Administration';
-$string['administrator']      = 'Administrator';
 $string['adminview'] = 'What is URL to your MRBS Install?';
 $string['advanced_search']    = 'Advanced search';
 $string['all_day']            = 'All day';
@@ -22,7 +17,6 @@
 $string['brief_description']  = 'Brief Description.';
 $string['browserlang']        = 'Your browser is set to use';
 $string['capacity']           = 'Capacity';
-$string['change']             = 'Change';
 $string['charset']            = 'UTF-8';
 $string['click_to_reserve']   = 'Click on the cell to make a reservation.';
 $string['config_admin_email'] = 'MRBS admin email';
@@ -57,20 +51,15 @@
 $string['ctrl_click_type']    = 'Use Control-Click to select more than one type';
 $string['ctrl_click']         = 'Use Control-Click to select more than one room';
 $string['database']           = 'Database: ';
-$string['date']               = 'Date:';
 $string['dayafter']           = 'Go To Day After';
 $string['daybefore']          = 'Go To Day Before';
-$string['days']               = 'days';
 $string['delarea']            = 'You must delete all rooms in this area before you can delete it<p>';
 $string['delete_user']        = 'Delete this user';
-$string['delete']             = 'Delete';
 $string['deleteentry']        = 'Delete Entry';
 $string['deletefollowing']    = 'This will delete the following bookings';
 $string['deleteseries']       = 'Delete Series';
-$string['description']        = 'Description:';
 $string['duration']           = 'Duration:';
 $string['edit_user']          = 'Edit user';
-$string['edit']               = 'Edit';
 $string['editarea']           = 'Edit Area';
 $string['editentry']          = 'Edit Entry';
 $string['editroom']           = 'Edit Room';
@@ -83,30 +72,23 @@
 $string['entryid']            = 'Entry ID ';
 $string['error_area']         = 'Error: area ';
 $string['error_room']         = 'Error: room ';
-$string['error']              = 'Error';
 $string['external']           = 'Non-class';
 $string['failed_connect_db']  = 'Fatal Error: Failed to connect to database';
 $string['failed_to_acquire']  = 'Failed to acquire exclusive database access';
 $string['for_any_questions']  = 'for any questions that are not answered here.';
-$string['from']               = 'From';
 $string['fulldescription']    = 'Full Description:<br>&nbsp;&nbsp;(Number of people,<br>&nbsp;&nbsp;Internal/External etc)';
 $string['goto']               = 'goto';
 $string['gotothismonth']      = 'Go To This Month';
 $string['gotothisweek']       = 'Go To This Week';
 $string['gototoday']          = 'Go To Today';
-$string['help']               = 'Help';
 $string['highlight_line']     = 'Highlight this line';
 $string['hours']              = 'hours';
 $string['in']                 = 'in';
 $string['include']            = 'Include:';
 $string['internal']           = 'Class';
-$string['invalid_email']      = 'Invalid email!';
 $string['invalid_entry_id']   = 'Invalid entry id.';
 $string['invalid_search']     = 'Empty or invalid search string.';
 $string['invalid_series_id']  = 'Invalid series id.';
-$string['lastupdate']         = 'Last Updated:';
-$string['login']              = 'Log in';
-$string['logoff']             = 'Log Off';
 $string['mail_body_changed_entry'] = 'changed_entry'; //$mail was prepended to this string
 $string['mail_body_del_entry'] = 'deleted_entry'; //$mail was prepended to this string
 $string['mail_body_new_entry'] = 'new_entry'; //$mail was prepended to this string
@@ -117,39 +99,30 @@
 $string['match_entry']        = 'Match brief description:';
 $string['match_room']         = 'Match room:';
 $string['match_type']         = 'Match type:';
-$string['minutes']            = 'minutes';
 $string['monthafter']         = 'Go To Month After';
 $string['monthbefore']        = 'Go To Month Before';
 $string['mrbs:administermrbs'] = 'Access MRBS (Read / Write / Admin)';
 $string['mrbs:editmrbs'] = 'Access MRBS (Read / Write)';
 $string['mrbs:viewmrbs'] = 'Access MRBS (Read only)';
 $string['mrbs']               = 'Meeting Room Booking System';
-$string['mustlogin'] = 'You must be logged in to Moodle before you can access the calendar';
-$string['name']               = 'Name';
+$string['mustlogin'] = 'You must be logged in to Moodle before you can access the MRBS calendar block';
 $string['namebooker']         = 'Brief Description:';
-$string['next']               = 'Next';
 $string['no_rooms_for_area']  = 'No rooms defined for this area';
 $string['no_users_create_first_admin'] = 'Create a user configured as administrator and then you can log in and create more users.';
 $string['no_users_initial']   = 'No users in database, allowing initial user creation';
-$string['NO']                 = 'NO';
 $string['noarea']             = 'No area selected';
 $string['noareas']            = 'No Areas';
 $string['norights']           = 'You do not have access rights to modify this item.';
 $string['norooms']            = 'No rooms.';
 $string['not_found']          = ' not found';
 $string['not_php3']             = '<H1>WARNING: This probably does not work with PHP3</H1>';
-$string['nothing_found']      = 'No matching entries found.';
 $string['of']                 = ' of ';
-$string['ok']                 = 'OK';
 $string['password_twice']     = 'If you wish to change the password, please type the new password twice';
-$string['passwords_not_eq']   = 'Error: The passwords do not match.';
 $string['period']             = 'Period:';
 $string['periods']            = 'periods';
 $string['please_contact']     = 'Please contact ';
-$string['please_login']       = 'Please log in';
 $string['postbrowserlang']    = 'language.';
 $string['ppreview']           = 'Print Preview';
-$string['previous']           = 'Previous';
 $string['records']            = 'Records ';
 $string['rep_dsp_dur']        = 'Duration';
 $string['rep_dsp_end']        = 'End Time';
@@ -174,7 +147,6 @@
 $string['report_on']          = 'Report on Meetings:';
 $string['report_only']        = 'Report only';
 $string['report_start']       = 'Report start date:';
-$string['report']             = 'Report';
 $string['resolution_units'] = ' Minutes';
 $string['returncal']          = 'Return to calendar view';
 $string['returnprev']         = 'Return to previous page';
@@ -182,12 +154,9 @@
 $string['room_admin_email']   = 'Room admin email:';
 $string['room']               = 'Room';
 $string['rooms']              = 'Rooms';
-$string['save']               = 'Save';
 $string['sched_conflict']     = 'Scheduling Conflict';
-$string['search_button']      = 'Search';
 $string['search_for']         = 'Search For';
 $string['search_results']     = 'Search Results for:';
-$string['search']             = 'Search:';
 $string['seconds']            = 'seconds';
 $string['serverpath'] = 'MRBS Installation path';
 $string['show_my_entries']    = 'Click to display all my upcoming entries';
@@ -204,33 +173,21 @@
 $string['sure']               = 'Are you sure?';
 $string['system']             = 'System: ';
 $string['through']            = ' through ';
-$string['time']               = 'Time:';
 $string['too_may_entrys']     = 'The selected options will create too many entries.<BR>Please use different options!';
-$string['total']              = 'Total';
 $string['type']               = 'Type:';
-$string['unknown_user']       = 'Unknown user';
 $string['unknown']            = 'Unknown';
 $string['update_area_failed'] = 'Update area failed: ';
 $string['update_room_failed'] = 'Update room failed: ';
 $string['useful_n-weekly_value'] = 'useful n-weekly value.';
-$string['user_email']         = 'Email address';
-$string['user_list']          = 'User list';
-$string['user_name']          = 'Username';
-$string['user_password']      = 'Password';
-$string['user']               = 'User';
 $string['valid_room']         = 'room.';
 $string['valid_time_of_day']  = 'valid time of day.';
-$string['view']               = 'View';
 $string['viewday']            = 'View Day';
 $string['viewmonth']          = 'View Month';
 $string['viewweek']           = 'View Week';
 $string['weekafter']          = 'Go To Week After';
 $string['weekbefore']         = 'Go To Week Before';
 $string['weeks']              = 'weeks';
-$string['years']              = 'years';
-$string['YES']                = 'YES';
 $string['you_are']            = 'You are';
 $string['you_have_not_entered'] = 'You have not entered a';
 $string['you_have_not_selected'] = 'You have not selected a';
-
 ?>
Index: plugins/blocks/mrbs/lang/es_utf8/block_mrbs.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/lang/es_utf8/block_mrbs.php,v
retrieving revision 1.3
diff -u -r1.3 block_mrbs.php
--- plugins/blocks/mrbs/lang/es_utf8/block_mrbs.php	31 Jul 2008 21:55:38 -0000	1.3
+++ plugins/blocks/mrbs/lang/es_utf8/block_mrbs.php	1 Aug 2008 03:56:10 -0000
@@ -1,15 +1,10 @@
-<?php // $Id: block_mrbs.php,v 1.3 2008/07/31 21:55:38 arborrow Exp $
+<?php // $Id: block_mrbs.php,v 1.2 2007/04/15 23:42:57 arborrow Exp $
 $string['about_mrbs']         = 'Acerca de MRBS';
 $string['accessdenied']       = 'Acceso denegado';
 $string['accessmrbs'] = 'Reservar locales';
-$string['action']             = 'Acción';
-$string['add_new_user']       = 'Añadir un nuevo usuario';
 $string['addarea']            = 'Agregar área';
 $string['addentry']           = 'Nueva reserva';
 $string['addroom']            = 'Agregar sala';
-$string['admin']              = 'Administración';
-$string['administration']     = 'Administración';
-$string['administrator']      = 'Administrador';
 $string['adminview'] = '¿Cuál es la ruta de tu instalación de MRBS?';
 $string['advanced_search']    = 'Búsqueda avanzada';
 $string['all_day']            = 'Día completo';
@@ -22,7 +17,6 @@
 $string['brief_description']  = 'Breve descripción.';
 $string['browserlang']        = 'Su visor esta configurado para usar los siguientes idiomas:';
 $string['capacity']           = 'Capacidad (personas)';
-$string['change']             = 'Cambiar';
 $string['charset']            = 'utf-8';
 $string['click_to_reserve']   = 'Pulsa sobre la celda para hacer una reserva.';
 $string['confirmdel']         = '¿Está seguro de querer borrar esta reserva?';
@@ -31,20 +25,15 @@
 $string['ctrl_click_type']    = 'Utilice Control+Clic para seleccionar más de un ítem';
 $string['ctrl_click']         = 'Utilice Control+Clic para seleccionar más de una sala';
 $string['database']           = 'Base de datos: ';
-$string['date']               = 'Fecha:';
 $string['dayafter']           = 'Día siguiente ';
 $string['daybefore']          = 'Día anterior';
-$string['days']               = 'días';
 $string['delarea']            = 'Debe borrar todas las salas antes de poder borrar la zona o área<p>';
 $string['delete_user']        = 'Borrar este usuario';
-$string['delete']             = 'Borrar';
 $string['deleteentry']        = 'Borrar reserva';
 $string['deletefollowing']    = 'Se borrarán las siguientes reservas';
 $string['deleteseries']       = 'Borrar serie';
-$string['description']        = 'Descripción:';
 $string['duration']           = 'Duración:';
 $string['edit_user']          = 'Editar usuario';
-$string['edit']               = 'Editar';
 $string['editarea']           = 'Editar la zona o área';
 $string['editentry']          = 'Editar reserva';
 $string['editroom']           = 'Editar sala';
@@ -57,30 +46,23 @@
 $string['entryid']            = 'Reserva nº ';
 $string['error_area']         = 'Error: Área ';
 $string['error_room']         = 'Error: sala ';
-$string['error']              = 'Error';
 $string['external']           = 'Externa';
 $string['failed_connect_db']  = 'Error grave: No se puede conectar con la base de datos';
 $string['failed_to_acquire']  = 'No ha sido posible tener acceso exclusivo a la base de datos'; 
 $string['for_any_questions']  = 'para cualquier duda que tenga.';
-$string['from']               = 'A partir de';
 $string['fulldescription']    = 'Descripción completa:<br>&nbsp;&nbsp;(Número de personas,<br>&nbsp;&nbsp;Interna/Externa, etc)';
 $string['goto']               = 'Ir a';
 $string['gotothismonth']      = 'Ir al mes actual';
 $string['gotothisweek']       = 'Ir a la semana actual';
 $string['gototoday']          = 'Día actual';
-$string['help']               = 'Ayuda';
 $string['highlight_line']     = 'Resaltar esta línea';
 $string['hours']              = 'horas';
 $string['in']                 = 'en';
 $string['include']            = 'Incluir:';
 $string['internal']           = 'Interna';
-$string['invalid_email']      = 'Dirección de correo inválida';
 $string['invalid_entry_id']   = 'Número de reserva no válida.';
 $string['invalid_search']     = 'Búsqueda no válida.';
 $string['invalid_series_id']  = 'Serie id. no válida.';
-$string['lastupdate']         = 'Última actualización:';
-$string['login']              = 'Entrar';
-$string['logoff']             = 'Salir';
 $string['mail_body_changed_entry'] = 'changed_entry'; //removed prepended $mail
 $string['mail_body_del_entry'] = 'deleted_entry'; //removed prepended $mail
 $string['mail_body_new_entry'] = 'new_entry'; //removed prepended $mail
@@ -91,7 +73,6 @@
 $string['match_entry']        = 'Descripción breve:';
 $string['match_room']         = 'Sala:';
 $string['match_type']         = 'Tipo:';
-$string['minutes']            = 'minutos';
 $string['monthafter']         = 'Ir al mes siguiente';
 $string['monthbefore']        = 'Ir al mes anterior';
 $string['mrbs:administermrbs'] = 'Acceso MRBS (Lectura / Escritura / Administración)';
@@ -99,29 +80,21 @@
 $string['mrbs:viewmrbs'] = 'Acceso MRBS (Lectura)';
 $string['mrbs']               = 'Gestor de Reserva de Salas';
 $string['mustlogin'] = 'Tienes que autenticarte en tu sitio Moodle antes de poder acceder al calendario';
-$string['name']               = 'Nombre';
 $string['namebooker']         = 'Título breve:';
-$string['next']               = 'Siguiente';
 $string['no_rooms_for_area']  = 'No hay salas definidas para esta área o zona';
-$string['NO']                 = 'NO';
 $string['noarea']             = 'No se seleccionó una zona o área';
 $string['noareas']            = 'No hay áreas';
 $string['norights']           = 'No tiene permisos suficientes para modificar este dato.';
 $string['norooms']            = 'No hay salas.';
 $string['not_found']          = ' no encontrado';
 $string['not_php3']             = '<H1>ATENCIÓN: Es probable que no funcione con PHP3</H1>';
-$string['nothing_found']      = 'No se encontraron coincidencias.';
 $string['of']                 = ' de ';
-$string['ok']                 = 'OK';
 $string['password_twice']     = 'Si desea cambiar la contraseña, escriba la nueva contraseña dos veces';
-$string['passwords_not_eq']   = 'Error: las contraseñas no coinciden.';
 $string['period']             = 'Periodo:';
 $string['periods']            = 'periodos';
 $string['please_contact']     = 'Por favor, póngase en contacto con ';
-$string['please_login']       = 'Por favor, autentíquese';
 $string['postbrowserlang']    = '.';
 $string['ppreview']           = 'Previsualización de impresión';
-$string['previous']           = 'Anterior';
 $string['records']            = 'Registros ';
 $string['rep_dsp_dur']        = 'Duración';
 $string['rep_dsp_end']        = 'Hora final';
@@ -146,20 +119,15 @@
 $string['report_on']          = 'Informe de reservas:';
 $string['report_only']        = 'Sólo el Informe';
 $string['report_start']       = 'Desde:';
-$string['report']             = 'Informes';
 $string['returncal']          = 'Volver al calendario';
 $string['returnprev']         = 'Volver a la página anterior';
 $string['rights']             = 'Permisos';
 $string['room_admin_email']   = 'Correo del administrador de la Sala:';
 $string['room']               = 'Sala';
 $string['rooms']              = 'Salas';
-$string['save']               = 'Guardar';
 $string['sched_conflict']     = 'Conflicto de planificación';
-$string['search_button']      = 'Búsqueda';
 $string['search_for']         = 'Búsqueda para';
 $string['search_results']     = 'Resultados de la búsqueda para:';
-$string['search']             = 'Búsqueda:';
-$string['seconds']            = 'segundos';
 $string['show_my_entries']    = 'Pulsa para mostrar todas mis reservas subidas';
 $string['sort_rep_time']      = 'Inicio Fecha/Hora';
 $string['sort_rep']           = 'Ordenar informes por:';
@@ -174,31 +142,20 @@
 $string['sure']               = '¿Está seguro?';
 $string['system']             = 'Sistema: ';
 $string['through']            = ' a través ';
-$string['time']               = 'Hora:';
 $string['too_may_entrys']     = 'Las opciones seleccionadas crearán demasiadas entradas.<BR>Por favor, revise las opciones';
-$string['total']              = 'Total';
 $string['type']               = 'Tipo:';
-$string['unknown_user']       = 'Usuario desconocido';
 $string['unknown']            = 'Desconocido';
 $string['update_area_failed'] = 'Error en la Actualización del área: ';
 $string['update_room_failed'] = 'Error en la actualización de la sala: ';
 $string['useful_n-weekly_value'] = 'un intervalo de semanas válido.';
-$string['user_email']         = 'Direcciones de correo';
-$string['user_list']          = 'Lista de usuarios';
-$string['user_name']          = 'Nombre';
-$string['user_password']      = 'Contraseña';
-$string['user']               = 'Usuario';
 $string['valid_room']         = 'sala.';
 $string['valid_time_of_day']  = 'horario válido del día.';
-$string['view']               = 'Ver';
 $string['viewday']            = 'Ver día';
 $string['viewmonth']          = 'Ver mes';
 $string['viewweek']           = 'Ver semana';
 $string['weekafter']          = 'Ir a la semana siguiente';
 $string['weekbefore']         = 'Ir a la semana anterior';
 $string['weeks']              = 'semanas';
-$string['years']              = 'años';
-$string['YES']                = 'SÍ';
 $string['you_are']            = 'Está como';
 $string['you_have_not_entered'] = 'No ha introducido';
 $string['you_have_not_selected'] = 'No ha seleccionado';
Index: plugins/blocks/mrbs/lang/de_utf8/block_mrbs.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/blocks/mrbs/lang/de_utf8/block_mrbs.php,v
retrieving revision 1.4
diff -u -r1.4 block_mrbs.php
--- plugins/blocks/mrbs/lang/de_utf8/block_mrbs.php	31 Jul 2008 21:55:38 -0000	1.4
+++ plugins/blocks/mrbs/lang/de_utf8/block_mrbs.php	1 Aug 2008 03:56:10 -0000
@@ -1,15 +1,10 @@
-<?php // $Id: block_mrbs.php,v 1.4 2008/07/31 21:55:38 arborrow Exp $
+<?php // $Id: block_mrbs.php,v 1.3 2008/07/30 17:28:42 arborrow Exp $
 $string['about_mrbs']         = '�ber MRBS';
 $string['accessdenied']       = 'Zugang verweigert';
 $string['accessmrbs'] = 'Buchen einer Resource (Computerraum)';
-$string['action']             = 'Action';
-$string['add_new_user']       = 'Benutzer hinzuf�gen';
 $string['addarea']            = 'Bereich hinzuf�gen';
 $string['addentry']           = 'Eintrag hinzuf�gen';
 $string['addroom']            = 'Raum hinzuf�gen';
-$string['admin']              = 'Admin';
-$string['administration']     = 'Administration';
-$string['administrator']      = 'Administrator';
 $string['adminview'] = 'Unter welcher URL ist Ihr  MRBS installiert?';
 $string['advanced_search']    = 'Erweiterte Suche';
 $string['all_day']            = 'Ganzt�gig';
@@ -22,8 +17,7 @@
 $string['brief_description']  = 'Kurzbeschreibung.';
 $string['browserlang']        = 'Die Spracheinstellung Ihres Browsers ist';
 $string['capacity']           = 'Kapazit�t';
-$string['change']             = '�ndern';
-$string['charset']            = 'iso-8859-1';
+$string['charset']            = 'utf-8';
 $string['click_to_reserve']   = 'Click on the cell to make a reservation.';
 $string['config_admin_email'] = 'MRBS Administrator E-Mail';
 $string['config_admin_email2'] = 'E-Mail Adresse vom MRBS Administrator';
@@ -57,20 +51,15 @@
 $string['ctrl_click_type']    = 'Strg-Click um mehr als einen Typus auszuw�hlen';
 $string['ctrl_click']         = 'Strg-Click um mehr als einen Raum auszuw�hlen';
 $string['database']           = 'Datenbank: ';
-$string['date']               = 'Tag:';
 $string['dayafter']           = 'gehe zum n�chsten Tag';
 $string['daybefore']          = 'gehe zum vorherigen Tag';
-$string['days']               = 'Tage';
 $string['delarea']            = 'Sie m�ssen alle R�ume dieses Bereiches l�schen, damit Sie den Bereich l�schen k�nnen<p>';
 $string['delete_user']        = 'L�sche diesen Benutzer';
-$string['delete']             = 'L�schen';
 $string['deleteentry']        = 'Eintrag l�schen';
 $string['deletefollowing']    = 'Dadurch werden die folgenden Eintr�ge gel�scht';
 $string['deleteseries']       = 'Alle Eintr�ge l�schen';
-$string['description']        = 'Beschreibung:';
 $string['duration']           = 'Dauer:';
 $string['edit_user']          = 'Bearbeite Benutzer';
-$string['edit']               = 'Bearbeiten';
 $string['editarea']           = 'Bereich bearbeiten';
 $string['editentry']          = 'Eintrag �ndern';
 $string['editroom']           = 'Raum bearbeiten';
@@ -83,30 +72,23 @@
 $string['entryid']            = 'Entry ID ';
 $string['error_area']         = 'Fehler: Bereich ';
 $string['error_room']         = 'Error: Raum ';
-$string['error']              = 'Fehler';
 $string['external']           = 'Extern';
 $string['failed_connect_db']  = 'Fataler Fehler: Kann nicht an Datenbank anbinden';
 $string['failed_to_acquire']  = 'Konnte nicht exclusiv auf die Datenbank zugreifen'; 
 $string['for_any_questions']  = 'f�r Fragen die hier nicht beantwortet sind.';
-$string['from']               = 'Von';
 $string['fulldescription']    = 'Vollst�ndige Beschreibung:<br>&nbsp;&nbsp;(Anzahl der Teilnehmer etc;)';
 $string['goto']               = 'Start';
 $string['gotothismonth']      = 'gehe zu diesen Monat';
 $string['gotothisweek']       = 'gehe zu dieser Woche';
 $string['gototoday']          = 'gehe zum heutigen Tag';
-$string['help']               = 'Hilfe';
 $string['highlight_line']     = 'Markieren Sie diese Zeile';
 $string['hours']              = 'Stunden';
 $string['in']                 = 'in';
 $string['include']            = 'Generiere:';
 $string['internal']           = 'Intern';
-$string['invalid_email']      = 'Ung�ltige e-mail Adresse !';
 $string['invalid_entry_id']   = 'Invalid entry id.';
 $string['invalid_search']     = 'Leerer oder ung�ltiger Suchbegriff.';
 $string['invalid_series_id']  = 'Invalid series id.';
-$string['lastupdate']         = 'Letzte �nderung:';
-$string['login']              = 'Einloggen';
-$string['logoff']             = 'Ausloggen';
 $string['mail_body_changed_entry'] = $mail['changed_entry'];
 $string['mail_body_del_entry'] = $mail['deleted_entry'];
 $string['mail_body_new_entry'] = $mail['new_entry'];
@@ -117,7 +99,6 @@
 $string['match_entry']        = 'Suche Kurzbeschreibung:';
 $string['match_room']         = 'Suche Raum:';
 $string['match_type']         = 'Nach typ:';
-$string['minutes']            = 'Minuten';
 $string['monthafter']         = 'gehe zum n�chsten Monat';
 $string['monthbefore']        = 'gehe zum vorigen Monat';
 $string['mrbs:administermrbs'] = 'Zugriff MRBS (lesen / schreiben / administration)';
@@ -125,29 +106,21 @@
 $string['mrbs:viewmrbs'] = 'Zugriff MRBS (nur lesen)';
 $string['mrbs']               = 'Raumbuchungssystem MRBS';
 $string['mustlogin'] = 'Sie mÃ¼ssen sich anmelden um den Kalender zu sehen';
-$string['name']               = 'Name';
 $string['namebooker']         = 'Kurzbeschreibung ';
-$string['next']               = 'N�chste';
 $string['no_rooms_for_area']  = 'Der Bereich enth�lt keinen Raum';
-$string['NO']                 = 'NEIN';
 $string['noarea']             = 'Kein Bereich ausgew�hlt';
 $string['noareas']            = 'Keine Bereiche';
 $string['norights']           = 'Sie haben keine Berechtigung, diesen Eintrag zu �ndern';
 $string['norooms']            = 'Keine R�ume vorhanden.';
 $string['not_found']          = ' nicht gefunden';
 $string['not_php3']             = '<H1>WARNUNG: Funktioniert warscheinlich nicht mit PHP3</H1>';
-$string['nothing_found']      = 'Keine passenden Suchergebnisse gefunden.';
 $string['of']                 = ' von ';
-$string['ok']                 = 'OK';
 $string['password_twice']     = 'Falls Sie Ihr Passwort �ndern wollen, geben Sie das neue Passwort zwei mal ein.';
-$string['passwords_not_eq']   = 'Fehler: Die Passw�rter stimmen nicht �berein.';
 $string['period']             = 'Period:';
 $string['periods']            = 'periods';
 $string['please_contact']     = 'Bitte kontaktieren Sie ';
-$string['please_login']       = 'Bitte einloggen';
 $string['postbrowserlang']    = '.';
 $string['ppreview']           = 'Druckansicht';
-$string['previous']           = 'Vorige';
 $string['records']            = 'Ergebnisse ';
 $string['rep_dsp_dur']        = 'Dauer';
 $string['rep_dsp_end']        = 'Endzeit';
@@ -172,7 +145,6 @@
 $string['report_on']          = 'Bericht �ber Termine:';
 $string['report_only']        = 'nur Bericht';
 $string['report_start']       = 'Bericht Beginn:';
-$string['report']             = 'Bericht';
 $string['resolution_units'] = ' Minuten';
 $string['returncal']          = 'Zur�ck zur Kalenderansicht';
 $string['returnprev']         = 'Zur�ck zur vorigen Seite';
@@ -180,13 +152,9 @@
 $string['room_admin_email']   = 'E-mail des Raumadministrators';
 $string['room']               = 'Raum';
 $string['rooms']              = 'R�ume';
-$string['save']               = 'Speichern';
 $string['sched_conflict']     = 'Konflikt in der Planung';
-$string['search_button']      = 'Suche';
 $string['search_for']         = 'Suche nach';
 $string['search_results']     = 'Suchergebnis f�r:';
-$string['search']             = 'Suche:';
-$string['seconds']            = 'Sekunden';
 $string['serverpath'] = 'MRBS Installationspfad';
 $string['show_my_entries']    = 'Click to display all my upcoming entries';
 $string['sort_rep_time']      = 'Startzeit/Datum ';
@@ -202,31 +170,20 @@
 $string['sure']               = 'Sind Sie sicher?';
 $string['system']             = 'System: ';
 $string['through']            = ' bis ';
-$string['time']               = 'Zeit:';
 $string['too_may_entrys']     = 'Die gew�hlten Optionen w�rden zu viele Eintr�ge erzeugen.<BR>�ndern Sie bitte die Optionen!';
-$string['total']              = 'Gesamt';
 $string['type']               = 'Art:';
-$string['unknown_user']       = 'Unbekannter Benutzer';
 $string['unknown']            = 'Unbekannt';
 $string['update_area_failed'] = 'Update area failed: ';
 $string['update_room_failed'] = 'Raum aktualisieren gescheitert: ';
 $string['useful_n-weekly_value'] = 'useful n-weekly value.';
-$string['user_email']         = 'Email Addresse';
-$string['user_list']          = 'Benutzerliste';
-$string['user_name']          = 'Benutzername';
-$string['user_password']      = 'Passwort';
-$string['user']               = 'Benutzer';
 $string['valid_room']         = 'room.';
 $string['valid_time_of_day']  = 'G�ltige Uhrzeit.';
-$string['view']               = '�ffnen';
 $string['viewday']            = 'Zeige Tag';
 $string['viewmonth']          = 'Zeige Monat';
 $string['viewweek']           = 'Zeige Woche';
 $string['weekafter']          = 'gehe zur n�chsten Woche';
 $string['weekbefore']         = 'gehe zur vorigen Woche';
 $string['weeks']              = 'Wochen';
-$string['years']              = 'Jahre';
-$string['YES']                = 'JA';
 $string['you_are']            = 'Sie sind';
 $string['you_have_not_entered'] = 'Sie haben folgendes Feld nicht ausgef�llt :';
 $string['you_have_not_selected'] = 'You have not selected a';
