[schoorbs commit] r725 - in trunk: . schoorbs-contrib schoorbs-includes/database schoorbs-includes/lang schoorbs-mi...

1 view
Skip to first unread message

codesite...@google.com

unread,
Mar 1, 2009, 11:11:01 AM3/1/09
to schoor...@googlegroups.com
Author: xhochy
Date: Sun Mar 1 08:08:19 2009
New Revision: 725

Added:
trunk/schoorbs-includes/lang/schoorbs-zh_CN.po
Modified:
trunk/add-entry.php
trunk/edit-entry.php
trunk/schoorbs-contrib/ (props changed)
trunk/schoorbs-contrib/release.rb
trunk/schoorbs-includes/database/entry.class.php
trunk/schoorbs-includes/lang/schoorbs-cs.po
trunk/schoorbs-includes/lang/schoorbs-da.po
trunk/schoorbs-includes/lang/schoorbs-de.po
trunk/schoorbs-includes/lang/schoorbs-el.po
trunk/schoorbs-includes/lang/schoorbs-en_GB.po
trunk/schoorbs-includes/lang/schoorbs-es.po
trunk/schoorbs-includes/lang/schoorbs-fi.po
trunk/schoorbs-includes/lang/schoorbs-fr.po
trunk/schoorbs-includes/lang/schoorbs-it.po
trunk/schoorbs-includes/lang/schoorbs-ja.po
trunk/schoorbs-includes/lang/schoorbs-ko.po
trunk/schoorbs-includes/lang/schoorbs-nl.po
trunk/schoorbs-includes/lang/schoorbs-pt.po
trunk/schoorbs-includes/lang/schoorbs-sv.po
trunk/schoorbs-includes/lang/schoorbs-zh_TW.po
trunk/schoorbs-includes/lang/schoorbs.pot
trunk/schoorbs-misc/themes/contented6/edit-entry.tpl.php

Log:
* Added some more input checking test to the edit-entry page
* Updated translations
* Fixed paths to new rainpress


Modified: trunk/add-entry.php
==============================================================================
--- trunk/add-entry.php (original)
+++ trunk/add-entry.php Sun Mar 1 08:08:19 2009
@@ -1,6 +1,6 @@
<?php
/**
- * This page will either add or modify a booking
+ * Add a new booking.
*
* @author jberanek, Uwe L. Korn <uw...@xhochy.org>
* @package Schoorbs
@@ -13,8 +13,6 @@
require_once 'config.inc.php';
/** The general 'things' when viewing Schoorbs on the web */
require_once 'schoorbs-includes/global.web.php';
-/** The general functions */
-require_once 'schoorbs-includes/global.functions.php';

/// Var Init ///


Modified: trunk/edit-entry.php
==============================================================================
--- trunk/edit-entry.php (original)
+++ trunk/edit-entry.php Sun Mar 1 08:08:19 2009
@@ -1,8 +1,8 @@
<?php
/**
- * This page will either add or modify a booking
+ * Modify an existing booking.
*
- * @author jberanek, Uwe L. Korn <uw...@xhochy.org>
+ * @author Uwe L. Korn <uw...@xhochy.org>
* @package Schoorbs
* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
*/
@@ -21,26 +21,135 @@
$nId = intval($_REQUEST['id']);
} else {
SchoorbsTPL::error(Lang::_('No entry id for editing was provided!'));
+ exit(1);
}

/// Main ///

-// Only allow loged-in users to create a new entry.
-if (!getAuthorised(1)) {
+// Get the booking
+$oEntry = Entry::getById($nId);
+
+// Only allow the owner or an administrator to change the booking
+if (!getAuthorised(1) || !getWritable($oEntry->getCreateBy(),
getUserName())) {
showAccessDenied();
}

-// Get the booking
-$oEntry = Entry::getById($nId);
+// Check if the name of the booking was provided in this HTTP request, if
it was
+// this indicates that the user has finished the editing of this booking.
+if (!isset($_REQUEST['name'])) {
+ // Case 1: name was not set -> Display edit page
+
+ // Get all booking types
+ $aTypes = array();
+ for ($c = 'A'; $c <= 'Z'; $c++) {
+ if (isset($typel[$c]) && (!empty($typel[$c]))) {
+ $aTypes[] = array('c' => $c, 'text' => $typel[$c]);
+ }
+ }

-// Get all booking types
-$aTypes = array();
-for ($c = 'A'; $c <= 'Z'; $c++) {
- if (isset($typel[$c]) && (!empty($typel[$c]))) {
- $aTypes[] = array('c' => $c, 'text' => $typel[$c]);
+ SchoorbsTPL::populateVar('types', $aTypes);
+ SchoorbsTPL::populateVar('entry', $oEntry);
+ SchoorbsTPL::renderPage('edit-entry');
+} else {
+ // Case 2: name was set -> Save entry
+
+ // For a clean request all needed values must be submitted, partial
+ // changes are not allowed via the WebGUI and may only be done through
+ // the REST-API. Remind that we will not guess a possible solution in
+ // Schoorbs, we rather request the data again from the user instead of
+ // saving false data without its knowledge.
+
+ /**
+ * @todo Add all this messages to the language files, maybe a soultion
+ * with lesser strings needs to be done
+ */
+
+ // We need a title for the booking.
+ if (empty($_REQUEST['name'])) {
+ SchoorbsTPL::error(Lang::_('An empty name for the booking was
supplied.'));
+ exit (1);
+ } else {
+ $sNewName = unslashes($_REQUEST['name']);
+ }
+
+ // Check if the description was included in the request, this is allowed
+ // to be empty, but as this must be a complete request, the variable has
+ // to be set.
+ if (!isset($_REQUEST['description'])) {
+ SchoorbsTPL::error(Lang::_('The description for the booking is not
set.'));
+ exit(1);
+ } else {
+ $sNewDescription = unslashes($_REQUEST['description']);
+ }
+
+ // Get the starting date, this consits out of the 3 components day,
+ // month and year. Check if we have got a valid date, invalid dates
+ // might indicate a failure in the request.
+ if (!isset($_REQUEST['edit_day']) || !isset($_REQUEST['edit_month']) |
| !isset($_REQUEST['edit_year'])) {
+ SchoorbsTPL::error(Lang::_('Not all needed components(day, month, year)
for the date were set.'));
+ exit(1);
+ } else {
+ // Get the components of the date as integers and check
+ // afterwards if the parsed values are equal to the supplied
+ // strings.
+ $nNewDay = intval($_REQUEST['edit_day']);
+ if (strval($nNewDay) !== $_REQUEST['edit_day']) {
+ SchoorbsTPL::error(Lang::_('Supplied value for the date is not
valid.'));
+ exit(1);
+ }
+ $nNewMonth = intval($_REQUEST['edit_month']);
+ if (strval($nNewMonth) !== $_REQUEST['edit_month']) {
+ SchoorbsTPL::error(Lang::_('Supplied value for the date is not
valid.'));
+ exit(1);
+ }
+ $nNewYear = intval($_REQUEST['edit_year']);
+ if (strval($nNewYear) !== $_REQUEST['edit_year']) {
+ SchoorbsTPL::error(Lang::_('Supplied value for the date is not
valid.'));
+ exit(1);
+ }
+
+ // Check if the combination out of day, month, year is valid,
+ // so that the is no false value like the 29th February 2007
+ if (!checkdate($nNewMonth, $nNewDay, $nNewYear)) {
+ SchoorbsTPL::error(Lang::_('Supplied value for the date is not
valid.'));
+ exit(1);
+ }
+ }
+
+ if (Entry::perioded()) {
+ // If the system works on a perioded basis, check that the period
+ // is in the range 0..count(periods)-1
+ if (!isset($_REQUEST['period'])) {
+ SchoorbsTPL::error(Lang::_('A starting period was not supplied.'));
+ }
+
+ $nPeriod = intval($_REQUEST['period']);
+ if (($nPeriod >= count($GLOBALS['periods'])) || ($nPeriod < 0)) {
+ SchoorbsTPL::error(Lang::_('Supplied value for the period is not
valid.'));
+ }
+
+ if (!in_array($_REQUEST['dur_units'], array('periods', 'days'))) {
+ SchoorbsTPL::error(Lang::_('Supplied value for the duration unit is not
valid.'));
+ }
+ } else {
+ // If the system runs on a non-perioded basis, check if the
+ // starting is a valid timestamp
+ if (!isset($_REQUEST['hour']) || !isset($_REQUEST['minute'])) {
+ SchoorbsTPL::error(Lang::_('Not all needed components(hour, minute) for
the time were set.'));
+ exit(1);
+ }
+
+ $nHour = intval($_REQUEST['hour']);
+ $nMinute = intval($_REQUEST['minute']);
+ if (($nHour < 0) || ($nHour > 23)) {
+ SchoorbsTPL::error(Lang::_('Supplied value for the hour is not
valid.'));
+ }
+ if (($nMinute < 0) || ($nHour > 59)) {
+ SchoorbsTPL::error(Lang::_('Supplied value for the minute is not
valid.'));
+ }
+
+ if (!in_array($_REQUEST['dur_units'],
array('periods', 'days', 'minutes', 'hours', 'weeks'))) {
+ SchoorbsTPL::error(Lang::_('Supplied value for the duration unit is not
valid.'));
+ }
}
}
-
-SchoorbsTPL::populateVar('types', $aTypes);
-SchoorbsTPL::populateVar('entry', $oEntry);
-SchoorbsTPL::renderPage('edit-entry');

Modified: trunk/schoorbs-contrib/release.rb
==============================================================================
--- trunk/schoorbs-contrib/release.rb (original)
+++ trunk/schoorbs-contrib/release.rb Sun Mar 1 08:08:19 2009
@@ -20,7 +20,7 @@

require 'fileutils'
require File.join(File.dirname(__FILE__), 'packr', '/packr.rb')
-require File.join(File.dirname(__FILE__), 'rainpress', '/packer.rb')
+require File.join(File.dirname(__FILE__), 'rainpress', '/rainpress.rb')

## CLEAN targets ##


Modified: trunk/schoorbs-includes/database/entry.class.php
==============================================================================
--- trunk/schoorbs-includes/database/entry.class.php (original)
+++ trunk/schoorbs-includes/database/entry.class.php Sun Mar 1 08:08:19
2009
@@ -205,8 +205,14 @@
*
* If this field is = -1 then this object was newly created and never
* checked into the database.
+ *
+ * This is a readonly property since the id is generated with the
+ * creation of the database row for this entry and will never be
+ * changed, so that not depend on any other property this booking
+ * could uniquely be referenced by its id.
*
* @var int
+ * @see Entry::getId()
*/
private $nId = -1;

@@ -214,6 +220,8 @@
* The room in which this entry will take place.
*
* @var Room
+ * @see Entry::getRoom()
+ * @see Entry::setRoom()
*/
private $oRoom = null;

@@ -221,6 +229,8 @@
* The time, where this entry starts.
*
* @var int
+ * @see Entry::getStartTime()
+ * @see Entry::setStartTime()
*/
private $nStartTime = 0;

@@ -228,6 +238,8 @@
* The time where this entry ends.
*
* @var int
+ * @see Entry::getEndTime()
+ * @see Entry::setEndTime()
*/
private $nEndTime = 0;

@@ -235,6 +247,8 @@
* entry_type?
*
* @var int
+ * @see Entry::getEntryType()
+ * @see Entry::setEntryType()
*/
private $nEntryType = 0;

@@ -253,6 +267,7 @@
* repeated.
*
* @var int
+ * @see Entry::$oRepetition
*/
private $nRepeatId = 0;

@@ -262,6 +277,8 @@
* This is only fetched on demand. On single entries this stays on
null.
*
* @var Repeat
+ * @see Entry::getRepetition()
+ * @see Entry::isRepeated()
*/
private $oRepetition = null;

@@ -269,6 +286,8 @@
* The creator of this entry.
*
* @var string
+ * @see Entry::getCreateBy()
+ * @see Entry::setCreateBy()
*/
private $sCreateBy = '';

@@ -281,6 +300,7 @@
* Attention: This variable should be considered as read-only.
*
* @var int
+ * @see Entry::getTimestamp()
*/
private $nTimestamp = 0;

@@ -288,6 +308,8 @@
* The name/title of this entry.
*
* @var string
+ * @see Entry::getName()
+ * @see Entry::setName()
*/
private $sName = '';

@@ -297,6 +319,8 @@
* This should be a letter out of 'A'..'Z'
*
* @var string
+ * @see Entry::setType()
+ * @see Entry::getType()
*/
private $sType = 'I';

@@ -304,6 +328,8 @@
* A long description of this entry.
*
* @var string
+ * @see Entry::getDescription()
+ * @see Entry::setDescription()
*/
private $sDescription = '';

@@ -333,15 +359,7 @@

/**
* Return the starttime of this entry
- *public static function formatTimePeriodString($nTime) {
- global $periods;
-
- $aTime = getdate($nTime);
- $nPnum = $aTime['minutes'];
- if($nPnum < 0 ) $nPnum = 0;
- if($nPnum >= count($periods) - 1) $nPnum = count($periods) - 1;
- return $periods[$nPnum];
- }
+ *
* @author Uwe L. Korn <uw...@xhochy.org>
* @return int Unix Timestamp
*/

Modified: trunk/schoorbs-includes/lang/schoorbs-cs.po
==============================================================================
--- trunk/schoorbs-includes/lang/schoorbs-cs.po (original)
+++ trunk/schoorbs-includes/lang/schoorbs-cs.po Sun Mar 1 08:08:19 2009
@@ -9,7 +9,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-10-06 18:04+0000\n"
+"X-Launchpad-Export-Date: 2009-03-01 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"

msgid "Sunday"
@@ -918,4 +918,7 @@
msgid ""
"The bottom line is: <strong>every piece of this system, from the
operating "
"system to the application, is completely free - source code and
all</strong>."
+msgstr ""
+
+msgid "No entry id for editing was provided!"
msgstr ""

Modified: trunk/schoorbs-includes/lang/schoorbs-da.po
==============================================================================
--- trunk/schoorbs-includes/lang/schoorbs-da.po (original)
+++ trunk/schoorbs-includes/lang/schoorbs-da.po Sun Mar 1 08:08:19 2009
@@ -4,12 +4,12 @@
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-01-05 15:06+0100\n"
"PO-Revision-Date: 2008-08-27 13:11+0000\n"
-"Last-Translator: a0peter <Unknown>\n"
+"Last-Translator: Peter Skov <Unknown>\n"
"Language-Team: LANGUAGE <L...@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-10-06 18:04+0000\n"
+"X-Launchpad-Export-Date: 2009-03-01 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"

msgid "Sunday"
@@ -918,4 +918,7 @@
msgid ""
"The bottom line is: <strong>every piece of this system, from the
operating "
"system to the application, is completely free - source code and
all</strong>."
+msgstr ""
+
+msgid "No entry id for editing was provided!"
msgstr ""

Modified: trunk/schoorbs-includes/lang/schoorbs-de.po
==============================================================================
--- trunk/schoorbs-includes/lang/schoorbs-de.po (original)
+++ trunk/schoorbs-includes/lang/schoorbs-de.po Sun Mar 1 08:08:19 2009
@@ -8,13 +8,13 @@
"Project-Id-Version: schoorbs\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2008-01-05 15:06+0100\n"
-"PO-Revision-Date: 2008-09-13 10:35+0000\n"
+"PO-Revision-Date: 2009-03-01 15:26+0000\n"
"Last-Translator: Uwe L. Korn <uw...@xhochy.org>\n"
"Language-Team: German <d...@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-10-06 18:04+0000\n"
+"X-Launchpad-Export-Date: 2009-03-01 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"

msgid "Sunday"
@@ -227,8 +227,7 @@
msgid ""
"Full Description:<br />&nbsp;&nbsp;(Number of people,<br "
"/>&nbsp;&nbsp;Internal/External etc)"
-msgstr ""
-"Vollständige Beschreibung:<br />&nbsp;&nbsp;(Anzahl der Teilnehmer etc;)"
+msgstr "Vollständige Beschreibung (Anzahl der Teilnehmer etc.):"

msgid "Date:"
msgstr "Tag:"
@@ -818,21 +817,21 @@
"Belanger</em> and <em>MyPassword</em>."
msgstr ""
"Das System kann mit verschiedenen Authentifizierungsmethoden
konfiguriert "
-"werden, dazu
\n"
+"werden, dazu \r\n"
"gehören LDAP,Netware und SMB. Wenden Sie sich bitte an ihren "
-"Systemadministrator, wenn Sie
\n"
-" Schwierigkeiten bei der Anmeldung haben.
\n"
+"Systemadministrator, wenn Sie\r\n"
+" Schwierigkeiten bei der Anmeldung haben.\r\n"
" Einige Systemfunktionen können auf bestimmte Benutzer beschränkt sein, "
-"und
\n"
+"und\r\n"
" daher werden die übrigen Benutzer die Meldung: <em>Sie haben keine "
-"Berechtigung, diesen
\n"
-"Eintrag zu ändern</em> erhalten. Wenden Sie sich bitte an Ihren
\n"
-" Systemadministratoren, wenn ihre Benutzerberechtigungen nicht korrekt
\n"
-" für Sie eingestellt sind.
\n"
-" Wenn das System auf der Grundlage der Authentifizierungsmethode LDAP
\n"
-" eingerichtet ist, dann bedeutet dies, dass sie Zugang zu dem System mit
\n"
+"Berechtigung, diesen \r\n"
+"Eintrag zu ändern</em> erhalten. Wenden Sie sich bitte an Ihren\r\n"
+" Systemadministratoren, wenn ihre Benutzerberechtigungen nicht
korrekt\r\n"
+" für Sie eingestellt sind.\r\n"
+" Wenn das System auf der Grundlage der Authentifizierungsmethode LDAP\r\n"
+" eingerichtet ist, dann bedeutet dies, dass sie Zugang zu dem System
mit\r\n"
" dem gleichen Benutzernamen und Passwort z.B. <em>Mark Belanger</em> "
-"<em>MyPassword</em>
\n"
+"<em>MyPassword</em>\r\n"
" wie zu Ihrem E-Mail System haben."

msgid "Top"
@@ -845,10 +844,10 @@
"deleted or changed."
msgstr ""
"Nur die Person, die die Besprechung im System angelegt hat, kann diese "
-"auch
\n"
+"auch\r\n"
" löschen bzw. abändern. Nehmen Sie Kontakt mit einem der Administratoren "
-"der
\n"
-" Besprechungszimmer oder mit der Person, die die Besprechung ursprünglich
\n"
+"der\r\n"
+" Besprechungszimmer oder mit der Person, die die Besprechung
ursprünglich\r\n"
" angelegt hat, auf um diese löschen bzw. ändern zu lassen."

msgid ""
@@ -857,17 +856,17 @@
"time, until the <em>Repeat End Date</em>, on the days determined by the "
"Repeat Type."
msgstr ""
-"Wenn sie auf die gewünschte Besprechungszeit klicken, kommen Sie auf den
\n"
-" Bildschirm zum Anlegen einer Besprechung.
\n"
-" Nach Eingabe einer <em>Kurzbeschreibung</em> und evtl. einer optionalen
\n"
+"Wenn sie auf die gewünschte Besprechungszeit klicken, kommen Sie auf
den\r\n"
+" Bildschirm zum Anlegen einer Besprechung.\r\n"
+" Nach Eingabe einer <em>Kurzbeschreibung</em> und evtl. einer optionalen
\r\n"
"<em>Vollständigen Beschreibung</em>, sowie von <em>Tag</em>,
<em>Dauer</em>, "
-"
\n"
+"\r\n"
"<em>Bereiche</em>, <em>Räume</em> (halten Sie die [STRG]-Taste beim
Klicken "
-"
\n"
-"gedrückt um mehrere zu selektieren), wählen Sie die geeignete Art der
\n"
-" Wiederholung aus. Der Raum wird für die gleiche Uhrzeit an den Tagen,
\n"
-" die durch Ihren Wiederholungsschlüssel (Art der Wiederholung)
\n"
-" festgelegt sind, bis zum Endtermin (Ende der Wiederholung)
\n"
+"\r\n"
+"gedrückt um mehrere zu selektieren), wählen Sie die geeignete Art der\r\n"
+" Wiederholung aus. Der Raum wird für die gleiche Uhrzeit an den
Tagen,\r\n"
+" die durch Ihren Wiederholungsschlüssel (Art der Wiederholung)\r\n"
+" festgelegt sind, bis zum Endtermin (Ende der Wiederholung)\r\n"
" eingeplant."

msgid "A <em>Daily</em> repeat schedules every day."
@@ -914,7 +913,7 @@
"Entry</em>."
msgstr ""
"Wählen Sie den entsprechenden Besprechungstermin aus und gehen Sie
danach "
-"auf
\n"
+"auf\r\n"
" die Auswahl <em>Eintrag löschen</em>."

msgid ""
@@ -922,18 +921,19 @@
"simultaneously. You must schedule each one separately. Make sure that
the "
"time you want is available at both sites before making a booking."
msgstr ""
-"Das ist nicht möglich. Gegenwärtig kann das System nicht mehrere Räume
\n"
+"Das ist nicht möglich. Gegenwärtig kann das System nicht mehrere
Räume\r\n"
" gleichzeitig einplanen. Sie müssen jeden Raum separat einplanen.
Stellen "
-"Sie bitte
\n"
-" sicher, dass die Räume an den verschiedenen Orten zu der gewünschten Zeit
\n"
+"Sie bitte\r\n"
+" sicher, dass die Räume an den verschiedenen Orten zu der gewünschten "
+"Zeit\r\n"
" verfügbar sind, bevor sie eine Belegung vornehmen."

msgid ""
"No meeting can create more than 365 entries. There needs to be some limit
on "
"the number of meetings created. This number can be increased if
necessary."
msgstr ""
-"Die Obergrenze für die Anzahl der Wiederholungseinträge eines
\n"
-" Besprechungseintrags liegt im System bei 365. Die Zahl kann aber bei
\n"
+"Die Obergrenze für die Anzahl der Wiederholungseinträge eines\r\n"
+" Besprechungseintrags liegt im System bei 365. Die Zahl kann aber bei\r\n"
" Bedarf erhöht werden. Bitte informieren Sie den Buchungsadministrator."

msgid ""
@@ -943,10 +943,11 @@
"users."
msgstr ""
"Die einfache Antwort ist: der Erste, der den Button <em>Speichern</em> "
-"drückt,
\n"
-" macht das Rennen. Hinter den Kulissen benutzt das System eine einwandfrei
\n"
+"drückt,\r\n"
+" macht das Rennen. Hinter den Kulissen benutzt das System eine "
+"einwandfrei\r\n"
" arbeitende für mehrere Benutzer und gleichzeitige Verarbeitung mehrerer "
-"Anforderungen
\n"
+"Anforderungen \r\n"
"ausgerichtete relationale Datenbank, die viele Tausende von
gleichzeitigen "
"Benutzern bedienen kann."

@@ -960,16 +961,16 @@
"the main calendar view."
msgstr ""
"Standardmäßig gibt es im System Schoorbs zwei Besprechungsarten. "
-"<em>Intern</em>
\n"
+"<em>Intern</em>\r\n"
" bedeutet, dass an der Besprechung nur Firmenangestellte teilnehmen. "
-"<em>Extern</em> heißt,
\n"
+"<em>Extern</em> heißt,\r\n"
" dass als Teilnehmer auch Kunden, Lieferanten, Geldanleger, usw.
vorgesehen "
"sind. Sie können für ihren Standort bis zu 10 Besprechungsarten nach
ihren "
-"eigenen
\n"
+"eigenen \r\n"
"Bedürfnissen definieren. Jeder Besprechungsart ist eine Farbe zugeordnet
und "
-"die Besprechung
\n"
+"die Besprechung\r\n"
" werden in der Kalenderübersicht entsprechend farblich unterlegt. Eine "
-"Übersicht
\n"
+"Übersicht\r\n"
" über die Besprechungsarten und ihre farbliche Darstellung befindet sich
am "
"Fuß der Kalenderübersicht."

@@ -982,9 +983,9 @@
"that is distributed under the Gnu Public License(GPLv2). This means that "
"software is free to use, distribute, and modify."
msgstr ""
-"<a href=\"http://schoorbs.xhochy.com/\">Schoorbs</a> ist eine Open Source
\n"
+"<a href=\"http://schoorbs.xhochy.com/\">Schoorbs</a> ist eine Open
Source\r\n"
" Software, die unter GNU Public License (GPL) vertrieben wird. Das
bedeutet, "
-"die
\n"
+"die\r\n"
" Software kann unentgeltlich benutzt, vertrieben und geändert werden."

msgid ""
@@ -995,7 +996,7 @@
msgstr ""
"Der größte Teil des Systems ist in <a
href=\"http://www.php.net\">PHP</a>, "
"geschrieben, dies ist eine Open Source Programmiersprache, die in
Webseiten "
-"eingebettet werden kann, vergleichbar den
\n"
+"eingebettet werden kann, vergleichbar den\r\n"
" Microsoft Active Server Pages. PHP eignet sich besonders gut für den "
"Zugriff auf Datenbanken."

@@ -1008,14 +1009,14 @@
"open source Object Relational SQL database server."
msgstr ""
"Das Datenbanksystem, das dem Anwendungssystem zugrunde liegt, ist
entweder "
-"<a href=\"http://www.mysql.com\">MySQL</a>
\n"
+"<a href=\"http://www.mysql.com\">MySQL</a>\r\n"
" oder <a href=\"http://www.postgresql.org\">PostgreSQL</a>. MySQL ist
ein "
-"sehr schneller, für mehrere
\n"
+"sehr schneller, für mehrere\r\n"
" Benutzer und parallele Verarbeitung verschiedener Benutzeranforderungen "
-"ausgerichteter,
\n"
+"ausgerichteter,\r\n"
" leistungsfähiger SQL (Structured Query Language) Datenbankserver. "
"PostgreSQL ist ein Multi User, Open Source und SQL Datenbankserver mit
allen "
-"
\n"
+"\r\n"
"Leistungsmerkmalen."

msgid ""
@@ -1024,7 +1025,7 @@
"Linux, is a free, open source, unix-like operating system."
msgstr ""
"Das System läuft auf vielen Plattformen, auch auf einer PC-Architektur
mit "
-"einem <a ref=\"http://www.linux.com\">Linux</a>
\n"
+"einem <a ref=\"http://www.linux.com\">Linux</a>\r\n"
"-Betriebssystem. Linux ist eine kostenloses, Open Source und
UNIX-ähnliches "
"Betriebssystem."

@@ -1034,7 +1035,7 @@
"the world's most popular web server."
msgstr ""
"Auch der eingesetzte Webserver ist eine kostenlose Open Source Software.
Der "
-"<a href=\"http://www.apache.org\">Apache</a>
\n"
+"<a href=\"http://www.apache.org\">Apache</a>\r\n"
" Webserver ist der weitverbreiteste Webserver."

msgid ""
@@ -1042,5 +1043,8 @@
"system to the application, is completely free - source code and
all</strong>."
msgstr ""
"Die Quintessenz lautet: <strong>Jeder Bestandteil des Systems vom "
-"Betriebssystem bis zur Anwendungssoftware
\n"
+"Betriebssystem bis zur Anwendungssoftware\r\n"
"ist vollkommen kostenloser Quellcode.</strong>"
+
+msgid "No entry id for editing was provided!"
+msgstr "Keine Eintrags id zum bearbeiten wurde angegeben!"

Modified: trunk/schoorbs-includes/lang/schoorbs-el.po
==============================================================================
--- trunk/schoorbs-includes/lang/schoorbs-el.po (original)
+++ trunk/schoorbs-includes/lang/schoorbs-el.po Sun Mar 1 08:08:19 2009
@@ -9,7 +9,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-10-06 18:04+0000\n"
+"X-Launchpad-Export-Date: 2009-03-01 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"

msgid "Sunday"
@@ -923,4 +923,7 @@
msgid ""
"The bottom line is: <strong>every piece of this system, from the
operating "
"system to the application, is completely free - source code and
all</strong>."
+msgstr ""
+
+msgid "No entry id for editing was provided!"
msgstr ""

Modified: trunk/schoorbs-includes/lang/schoorbs-en_GB.po
==============================================================================
--- trunk/schoorbs-includes/lang/schoorbs-en_GB.po (original)
+++ trunk/schoorbs-includes/lang/schoorbs-en_GB.po Sun Mar 1 08:08:19 2009
@@ -8,13 +8,13 @@
"Project-Id-Version: schoorbs\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2008-01-05 15:06+0100\n"
-"PO-Revision-Date: 2008-09-13 09:00+0000\n"
+"PO-Revision-Date: 2009-02-26 21:16+0000\n"
"Last-Translator: Uwe L. Korn <uw...@xhochy.org>\n"
"Language-Team: English (United Kingdom) <en...@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-10-06 18:04+0000\n"
+"X-Launchpad-Export-Date: 2009-03-01 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"

msgid "Sunday"
@@ -1001,3 +1001,6 @@
msgstr ""
"The bottom line is: <strong>every piece of this system, from the
operating "
"system to the application, is completely free - source code and
all</strong>."
+
+msgid "No entry id for editing was provided!"
+msgstr "No entry id for editing was provided!"

Modified: trunk/schoorbs-includes/lang/schoorbs-es.po
==============================================================================
--- trunk/schoorbs-includes/lang/schoorbs-es.po (original)
+++ trunk/schoorbs-includes/lang/schoorbs-es.po Sun Mar 1 08:08:19 2009
@@ -8,13 +8,13 @@
"Project-Id-Version: schoorbs\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2008-01-05 15:06+0100\n"
-"PO-Revision-Date: 2008-08-29 14:11+0000\n"
-"Last-Translator: Ricardo Varas Santana <rvar...@yahoo.com>\n"
+"PO-Revision-Date: 2009-03-01 15:28+0000\n"
+"Last-Translator: Uwe L. Korn <uw...@xhochy.org>\n"
"Language-Team: Spanish <e...@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-10-06 18:04+0000\n"
+"X-Launchpad-Export-Date: 2009-03-01 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"

msgid "Sunday"
@@ -99,34 +99,34 @@
msgstr "Sab"

msgid "Su"
-msgstr ""
+msgstr "Do"

msgid "Mo"
-msgstr ""
+msgstr "Lu"

msgid "Tu"
-msgstr ""
+msgstr "Ma"

msgid "We"
-msgstr ""
+msgstr "Mi"

msgid "Th"
-msgstr ""
+msgstr "Ju"

msgid "Fr"
-msgstr ""
+msgstr "Vi"

msgid "Sa"
-msgstr ""
+msgstr "Sa"

msgid "No name for the area was provided!"
-msgstr ""
+msgstr "¡No se entregó nombre de área!"

msgid "An error occured"
msgstr "Ocurrió un error"

msgid "No question to ask was provided!"
-msgstr ""
+msgstr "¡No se entregó ninguna pregunta!"

msgid "No url to refer to was provided!"
msgstr ""
@@ -135,10 +135,10 @@
msgstr ""

msgid "Do you want to delete the area '%s'?"
-msgstr ""
+msgstr "¿Deséa eliminar el área '%s'?"

msgid "Do you want to delete the room '%s' in the area '%s'?"
-msgstr ""
+msgstr "¿Deséa eliminar la sala '%s' en el área '%s'?"

msgid "No valid area(-id) for deletion was provided!"
msgstr ""
@@ -153,10 +153,10 @@
msgstr ""

msgid "Booked by"
-msgstr ""
+msgstr "Reservado por"

msgid "The area '%s' has no rooms."
-msgstr ""
+msgstr "El área '%s' no tiene salas."

msgid "Schoorbs - Room Booking System"
msgstr "Sistema de Reservas de Salas de Reuni&oacute;n"
@@ -412,12 +412,14 @@
msgstr "Error al obtener acceso a la Base de Datos"

msgid "Invalid booking"
-msgstr ""
+msgstr "Reserva inválida"

msgid ""
"You must set a brief description for the booking. Please go back and
enter "
"one."
msgstr ""
+"Usted debe ingresar una descripción breve de la reserva. Por favor,
regrese "
+"e ingrese una."

msgid "Access Denied"
msgstr "Acceso Denegado"
@@ -492,6 +494,8 @@

msgid "No users in database, allowing initial user creation"
msgstr ""
+"No existen usuarios en la base de datos, permitiendo creación de usuario "
+"inicial"

msgid ""
"Create a user configured as administrator and then you can log in and
create "
@@ -753,7 +757,7 @@
msgstr "Error: No se pudo conectar a la Base de Datos"

msgid "Authentication"
-msgstr ""
+msgstr "Autentificación"

msgid "How do I login?"
msgstr ""
@@ -784,13 +788,13 @@

msgid ""
"What is the difference between <em>Internal</em> and <em>External</em>?"
-msgstr ""
+msgstr "¿Cuál es la diferencia entre <em>Interno</em> y <em>Externo</em>?"

msgid "How much did the system cost?"
-msgstr ""
+msgstr "¿Cuánto costó el sistema?"

msgid "How does the system work and who wrote it?"
-msgstr ""
+msgstr "¿Cómo funciona el sistema y quién lo escribió?"

msgid ""
"The system can be configured to use one of several methods of "
@@ -805,7 +809,7 @@
msgstr ""

msgid "Top"
-msgstr ""
+msgstr "Arriba"

msgid ""
"In order to delete or alter a meeting, you must be logged in as the same "
@@ -854,6 +858,8 @@
"Select the day/room/time that you want to delete and select <em>Delete "
"Entry</em>."
msgstr ""
+"Seleccione el día/sala/hora que desea eliminar y seleccione <em>Eliminar "
+"Entrada</em>."

msgid ""
"You don't. Presently the system cannot book two different rooms "
@@ -884,7 +890,7 @@
msgstr ""

msgid "Nothing. See the next section for more information."
-msgstr ""
+msgstr "Nada. Véa la siguiente sección para más información."

msgid ""
"<a href=\"http://schoorbs.xhochy.com/\">Schoorbs</a> is open source
software "
@@ -923,4 +929,7 @@
msgid ""
"The bottom line is: <strong>every piece of this system, from the
operating "
"system to the application, is completely free - source code and
all</strong>."
+msgstr ""
+
+msgid "No entry id for editing was provided!"
msgstr ""

Modified: trunk/schoorbs-includes/lang/schoorbs-fi.po
==============================================================================
--- trunk/schoorbs-includes/lang/schoorbs-fi.po (original)
+++ trunk/schoorbs-includes/lang/schoorbs-fi.po Sun Mar 1 08:08:19 2009
@@ -9,7 +9,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-10-06 18:04+0000\n"
+"X-Launchpad-Export-Date: 2009-03-01 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"

msgid "Sunday"
@@ -922,4 +922,7 @@
msgid ""
"The bottom line is: <strong>every piece of this system, from the
operating "
"system to the application, is completely free - source code and
all</strong>."
+msgstr ""
+
+msgid "No entry id for editing was provided!"
msgstr ""

Modified: trunk/schoorbs-includes/lang/schoorbs-fr.po
==============================================================================
--- trunk/schoorbs-includes/lang/schoorbs-fr.po (original)
+++ trunk/schoorbs-includes/lang/schoorbs-fr.po Sun Mar 1 08:08:19 2009
@@ -9,7 +9,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-10-06 18:04+0000\n"
+"X-Launchpad-Export-Date: 2009-03-01 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"

msgid "Sunday"
@@ -925,4 +925,7 @@
msgid ""
"The bottom line is: <strong>every piece of this system, from the
operating "
"system to the application, is completely free - source code and
all</strong>."
+msgstr ""
+
+msgid "No entry id for editing was provided!"
msgstr ""

Modified: trunk/schoorbs-includes/lang/schoorbs-it.po
==============================================================================
--- trunk/schoorbs-includes/lang/schoorbs-it.po (original)
+++ trunk/schoorbs-includes/lang/schoorbs-it.po Sun Mar 1 08:08:19 2009
@@ -9,7 +9,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-10-06 18:04+0000\n"
+"X-Launchpad-Export-Date: 2009-03-01 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"

msgid "Sunday"
@@ -919,4 +919,7 @@
msgid ""
"The bottom line is: <strong>every piece of this system, from the
operating "
"system to the application, is completely free - source code and
all</strong>."
+msgstr ""
+
+msgid "No entry id for editing was provided!"
msgstr ""

Modified: trunk/schoorbs-includes/lang/schoorbs-ja.po
==============================================================================
--- trunk/schoorbs-includes/lang/schoorbs-ja.po (original)
+++ trunk/schoorbs-includes/lang/schoorbs-ja.po Sun Mar 1 08:08:19 2009
@@ -9,7 +9,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-10-06 18:04+0000\n"
+"X-Launchpad-Export-Date: 2009-03-01 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"

msgid "Sunday"
@@ -912,4 +912,7 @@
msgid ""
"The bottom line is: <strong>every piece of this system, from the
operating "
"system to the application, is completely free - source code and
all</strong>."
+msgstr ""
+
+msgid "No entry id for editing was provided!"
msgstr ""

Modified: trunk/schoorbs-includes/lang/schoorbs-ko.po
==============================================================================
--- trunk/schoorbs-includes/lang/schoorbs-ko.po (original)
+++ trunk/schoorbs-includes/lang/schoorbs-ko.po Sun Mar 1 08:08:19 2009
@@ -9,15 +9,9 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-10-06 18:04+0000\n"
+"X-Launchpad-Export-Date: 2009-03-01 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"

-#~ msgid ""
-#~ "Are you sure\n"
-#~ "you want to\n"
-#~ "delete this entry?"
-#~ msgstr "예약을 취소하시겠습니까?"
-
msgid "Sunday"
msgstr ""

@@ -917,3 +911,12 @@
"The bottom line is: <strong>every piece of this system, from the
operating "
"system to the application, is completely free - source code and
all</strong>."
msgstr ""
+
+msgid "No entry id for editing was provided!"
+msgstr ""
+
+#~ msgid ""
+#~ "Are you sure\n"
+#~ "you want to\n"
+#~ "delete this entry?"
+#~ msgstr "예약을 취소하시겠습니까?"

Modified: trunk/schoorbs-includes/lang/schoorbs-nl.po
==============================================================================
--- trunk/schoorbs-includes/lang/schoorbs-nl.po (original)
+++ trunk/schoorbs-includes/lang/schoorbs-nl.po Sun Mar 1 08:08:19 2009
@@ -9,7 +9,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-10-06 18:04+0000\n"
+"X-Launchpad-Export-Date: 2009-03-01 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"

msgid "Sunday"
@@ -923,4 +923,7 @@
msgid ""
"The bottom line is: <strong>every piece of this system, from the
operating "
"system to the application, is completely free - source code and
all</strong>."
+msgstr ""
+
+msgid "No entry id for editing was provided!"
msgstr ""

Modified: trunk/schoorbs-includes/lang/schoorbs-pt.po
==============================================================================
--- trunk/schoorbs-includes/lang/schoorbs-pt.po (original)
+++ trunk/schoorbs-includes/lang/schoorbs-pt.po Sun Mar 1 08:08:19 2009
@@ -3,13 +3,13 @@
"Project-Id-Version: schoorbs\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-01-05 15:06+0100\n"
-"PO-Revision-Date: 2008-09-16 15:29+0000\n"
-"Last-Translator: Tiago Silva <Unknown>\n"
+"PO-Revision-Date: 2009-02-22 20:14+0000\n"
+"Last-Translator: Flávio Martins <xha...@gmail.com>\n"
"Language-Team: LANGUAGE <L...@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-10-06 18:04+0000\n"
+"X-Launchpad-Export-Date: 2009-03-01 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"

msgid "Sunday"
@@ -674,7 +674,7 @@
msgstr "Não há salas."

msgid "Administration"
-msgstr "Administration"
+msgstr "Administração"

msgid "Edit Area"
msgstr "Editar Área"
@@ -919,4 +919,7 @@
msgid ""
"The bottom line is: <strong>every piece of this system, from the
operating "
"system to the application, is completely free - source code and
all</strong>."
+msgstr ""
+
+msgid "No entry id for editing was provided!"
msgstr ""

Modified: trunk/schoorbs-includes/lang/schoorbs-sv.po
==============================================================================
--- trunk/schoorbs-includes/lang/schoorbs-sv.po (original)
+++ trunk/schoorbs-includes/lang/schoorbs-sv.po Sun Mar 1 08:08:19 2009
@@ -9,7 +9,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-10-06 18:04+0000\n"
+"X-Launchpad-Export-Date: 2009-03-01 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"

msgid "Sunday"
@@ -924,4 +924,7 @@
msgid ""
"The bottom line is: <strong>every piece of this system, from the
operating "
"system to the application, is completely free - source code and
all</strong>."
+msgstr ""
+
+msgid "No entry id for editing was provided!"
msgstr ""

Added: trunk/schoorbs-includes/lang/schoorbs-zh_CN.po
==============================================================================
--- (empty file)
+++ trunk/schoorbs-includes/lang/schoorbs-zh_CN.po Sun Mar 1 08:08:19 2009
@@ -0,0 +1,921 @@
+# Simplified Chinese translation for schoorbs
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the schoorbs package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: schoorbs\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2008-01-05 15:06+0100\n"
+"PO-Revision-Date: 2008-11-02 04:16+0000\n"
+"Last-Translator: forinec <for...@googlemail.com>\n"
+"Language-Team: Simplified Chinese <zh...@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-03-01 15:32+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+msgid "Sunday"
+msgstr "星期日"
+
+msgid "Monday"
+msgstr "星期一"
+
+msgid "Tuesday"
+msgstr "星期二"
+
+msgid "Wednesday"
+msgstr "星期三"
+
+msgid "Thursday"
+msgstr "星期四"
+
+msgid "Friday"
+msgstr "星期五"
+
+msgid "Saturday"
+msgstr "星期六"
+
+msgid "January"
+msgstr "一月"
+
+msgid "February"
+msgstr "二月"
+
+msgid "March"
+msgstr "三月"
+
+msgid "April"
+msgstr "四月"
+
+msgid "May"
+msgstr "五月"
+
+msgid "June"
+msgstr "六月"
+
+msgid "July"
+msgstr "七月"
+
+msgid "August"
+msgstr "八月"
+
+msgid "September"
+msgstr "九月"
+
+msgid "October"
+msgstr "十月"
+
+msgid "November"
+msgstr "十一月"
+
+msgid "December"
+msgstr "十二月"
+
+msgid "Time"
+msgstr "时间"
+
+msgid "Sun"
+msgstr "周日"
+
+msgid "Mon"
+msgstr "周一"
+
+msgid "Tue"
+msgstr "周二"
+
+msgid "Wed"
+msgstr "周三"
+
+msgid "Thu"
+msgstr "周四"
+
+msgid "Fri"
+msgstr "周五"
+
+msgid "Sat"
+msgstr "周六"
+
+msgid "Su"
+msgstr "日"
+
+msgid "Mo"
+msgstr "一"
+
+msgid "Tu"
+msgstr "二"
+
+msgid "We"
+msgstr "三"
+
+msgid "Th"
+msgstr "四"
+
+msgid "Fr"
+msgstr "五"
+
+msgid "Sa"
+msgstr "六"
+
+msgid "No name for the area was provided!"
+msgstr ""
+
+msgid "An error occured"
+msgstr "发生了一个错误"
+
+msgid "No question to ask was provided!"
+msgstr ""
+
+msgid "No url to refer to was provided!"
+msgstr ""
+
+msgid "No url to return to after a negative answer was provided!"
+msgstr ""
+
+msgid "Do you want to delete the area '%s'?"
+msgstr ""
+
+msgid "Do you want to delete the room '%s' in the area '%s'?"
+msgstr ""
+
+msgid "No valid area(-id) for deletion was provided!"
+msgstr ""
+
+msgid "No valid room(-id) for deletion was provided!"
+msgstr ""
+
+msgid "No valid area(-id) was provided!"
+msgstr ""
+
+msgid "No valid room(-id) was provided!"
+msgstr ""
+
+msgid "Booked by"
+msgstr ""
+
+msgid "The area '%s' has no rooms."
+msgstr ""
+
+msgid "Schoorbs - Room Booking System"
+msgstr ""
+
+msgid "Report"
+msgstr ""
+
+msgid "Admin"
+msgstr ""
+
+msgid "Help"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "<h1>WARNING: This probably doesn't work with PHP3</h1>"
+msgstr ""
+
+msgid "Bookings for"
+msgstr ""
+
+msgid "Areas"
+msgstr ""
+
+msgid "Go To Day Before"
+msgstr ""
+
+msgid "Go To Day After"
+msgstr ""
+
+msgid "Go To Today"
+msgstr ""
+
+msgid "goto"
+msgstr ""
+
+msgid "Highlight this line"
+msgstr ""
+
+msgid "Click on the cell to make a reservation."
+msgstr ""
+
+msgid "View Day"
+msgstr ""
+
+msgid "View Week"
+msgstr ""
+
+msgid "View Month"
+msgstr ""
+
+msgid "Print Preview"
+msgstr ""
+
+msgid "Add Entry"
+msgstr ""
+
+msgid "Edit Entry"
+msgstr ""
+
+msgid "Edit Series"
+msgstr ""
+
+msgid "Brief Description:"
+msgstr ""
+
+msgid ""
+"Full Description:<br />&nbsp;&nbsp;(Number of people,<br "
+"/>&nbsp;&nbsp;Internal/External etc)"
+msgstr ""
+
+msgid "Date:"
+msgstr ""
+
+msgid "Start Time:"
+msgstr ""
+
+msgid "End Time:"
+msgstr ""
+
+msgid "Time:"
+msgstr ""
+
+msgid "Period:"
+msgstr ""
+
+msgid "Duration:"
+msgstr ""
+
+msgid "seconds"
+msgstr ""
+
+msgid "minutes"
+msgstr ""
+
+msgid "hours"
+msgstr ""
+
+msgid "days"
+msgstr ""
+
+msgid "weeks"
+msgstr ""
+
+msgid "years"
+msgstr ""
+
+msgid "periods"
+msgstr ""
+
+msgid "All day"
+msgstr ""
+
+msgid "Type:"
+msgstr ""
+
+msgid "Internal"
+msgstr ""
+
+msgid "External"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Repeat Type:"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "Daily"
+msgstr ""
+
+msgid "Weekly"
+msgstr ""
+
+msgid "Monthly"
+msgstr ""
+
+msgid "Yearly"
+msgstr ""
+
+msgid "Monthly, corresponding day"
+msgstr ""
+
+msgid "n-Weekly"
+msgstr ""
+
+msgid "Repeat End Date:"
+msgstr ""
+
+msgid "Repeat Day:"
+msgstr ""
+
+msgid "(for (n-)weekly)"
+msgstr ""
+
+msgid "Frequency:"
+msgstr ""
+
+msgid "Number of weeks"
+msgstr ""
+
+msgid "(for n-weekly)"
+msgstr ""
+
+msgid "Use Control-Click to select more than one room"
+msgstr ""
+
+msgid "Entry ID "
+msgstr ""
+
+msgid "Repeat ID "
+msgstr ""
+
+msgid "You have not entered a"
+msgstr ""
+
+msgid "You have not selected a"
+msgstr ""
+
+msgid "room."
+msgstr ""
+
+msgid "valid time of day."
+msgstr ""
+
+msgid "Brief Description."
+msgstr ""
+
+msgid "useful n-weekly value."
+msgstr ""
+
+msgid "Description:"
+msgstr ""
+
+msgid "Room"
+msgstr ""
+
+msgid "Created By:"
+msgstr ""
+
+msgid "Last Updated:"
+msgstr ""
+
+msgid "Delete Entry"
+msgstr ""
+
+msgid "Delete Series"
+msgstr ""
+
+msgid ""
+"Are you sure\n"
+"you want to\n"
+"delete this entry?\n"
+"\n"
+msgstr ""
+
+msgid "Return to previous page"
+msgstr ""
+
+msgid "Invalid entry id."
+msgstr ""
+
+msgid "Invalid series id."
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Scheduling Conflict"
+msgstr ""
+
+msgid "The new booking will conflict with the following entry(s):"
+msgstr ""
+
+msgid ""
+"The selected options will create too many entries.<BR>Please use
different "
+"options!"
+msgstr ""
+
+msgid "Return to calendar view"
+msgstr ""
+
+msgid "Failed to acquire exclusive database access"
+msgstr ""
+
+msgid "Invalid booking"
+msgstr ""
+
+msgid ""
+"You must set a brief description for the booking. Please go back and
enter "
+"one."
+msgstr ""
+
+msgid "Access Denied"
+msgstr ""
+
+msgid "You do not have access rights to modify this item."
+msgstr ""
+
+msgid "Please log in"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Unknown user"
+msgstr ""
+
+msgid "You are"
+msgstr ""
+
+msgid "Log in"
+msgstr ""
+
+msgid "Log Off"
+msgstr ""
+
+msgid "User list"
+msgstr ""
+
+msgid "Edit user"
+msgstr ""
+
+msgid "Delete this user"
+msgstr ""
+
+msgid "Email address"
+msgstr ""
+
+msgid ""
+"If you wish to change the password, please type the new password twice"
+msgstr ""
+
+msgid "Error: The passwords do not match."
+msgstr ""
+
+msgid "Add a new user"
+msgstr ""
+
+msgid "Rights"
+msgstr ""
+
+msgid "Action"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Administrator"
+msgstr ""
+
+msgid "Unknown"
+msgstr ""
+
+msgid "OK"
+msgstr ""
+
+msgid "Click to display all my upcoming entries"
+msgstr ""
+
+msgid "No users in database, allowing initial user creation"
+msgstr ""
+
+msgid ""
+"Create a user configured as administrator and then you can log in and
create "
+"more users."
+msgstr ""
+
+msgid "Empty or invalid search string."
+msgstr ""
+
+msgid "Search Results for:"
+msgstr ""
+
+msgid "No matching entries found."
+msgstr ""
+
+msgid "Records "
+msgstr ""
+
+msgid " through "
+msgstr ""
+
+msgid " of "
+msgstr ""
+
+msgid "Previous"
+msgstr ""
+
+msgid "Next"
+msgstr ""
+
+msgid "Entry"
+msgstr ""
+
+msgid "View"
+msgstr ""
+
+msgid "Advanced search"
+msgstr ""
+
+msgid "Search For"
+msgstr ""
+
+msgid "From"
+msgstr ""
+
+msgid "Report on Meetings:"
+msgstr ""
+
+msgid "Report start date:"
+msgstr ""
+
+msgid "Report end date:"
+msgstr ""
+
+msgid "Match area:"
+msgstr ""
+
+msgid "Match room:"
+msgstr ""
+
+msgid "Match type:"
+msgstr ""
+
+msgid "Use Control-Click to select more than one type"
+msgstr ""
+
+msgid "Match brief description:"
+msgstr ""
+
+msgid "Match full description:"
+msgstr ""
+
+msgid "Include:"
+msgstr ""
+
+msgid "Report only"
+msgstr ""
+
+msgid "Summary only"
+msgstr ""
+
+msgid "Report and Summary"
+msgstr ""
+
+msgid "Summarize by:"
+msgstr ""
+
+msgid "Brief description"
+msgstr ""
+
+msgid "Creator"
+msgstr ""
+
+msgid "entry found"
+msgstr ""
+
+msgid "entries found"
+msgstr ""
+
+msgid "Summary of (Entries) Hours"
+msgstr ""
+
+msgid "Summary of (Entries) Periods"
+msgstr ""
+
+msgid "Total"
+msgstr ""
+
+msgid "Run Report"
+msgstr ""
+
+msgid "Sort Report by:"
+msgstr ""
+
+msgid "Start Date/Time"
+msgstr ""
+
+msgid "Display in report:"
+msgstr ""
+
+msgid "Duration"
+msgstr ""
+
+msgid "End Time"
+msgstr ""
+
+msgid "Go To Week Before"
+msgstr ""
+
+msgid "Go To Week After"
+msgstr ""
+
+msgid "Go To This Week"
+msgstr ""
+
+msgid "Go To Month Before"
+msgstr ""
+
+msgid "Go To Month After"
+msgstr ""
+
+msgid "Go To This Month"
+msgstr ""
+
+msgid "No rooms defined for this area"
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
+msgid "Rooms"
+msgstr ""
+
+msgid "in"
+msgstr ""
+
+msgid "No Areas"
+msgstr ""
+
+msgid "Add Area"
+msgstr ""
+
+msgid "No area selected"
+msgstr ""
+
+msgid "Your browser is set to use"
+msgstr ""
+
+msgid "language."
+msgstr ""
+
+msgid "Add Room"
+msgstr ""
+
+msgid "Capacity"
+msgstr ""
+
+msgid "No rooms."
+msgstr ""
+
+msgid "Administration"
+msgstr ""
+
+msgid "Edit Area"
+msgstr ""
+
+msgid "Change"
+msgstr ""
+
+msgid "Back to Admin"
+msgstr ""
+
+msgid "Edit Area or Room Description"
+msgstr ""
+
+msgid "Edit Room"
+msgstr ""
+
+msgid "Update room failed: "
+msgstr ""
+
+msgid "Error: room "
+msgstr ""
+
+msgid " not found"
+msgstr ""
+
+msgid "Update area failed: "
+msgstr ""
+
+msgid "Error: area "
+msgstr ""
+
+msgid "Room admin email:"
+msgstr ""
+
+msgid "Area admin email:"
+msgstr ""
+
+msgid "Invalid email!"
+msgstr ""
+
+msgid "This will delete the following bookings"
+msgstr ""
+
+msgid "Are you sure?"
+msgstr ""
+
+msgid "YES"
+msgstr ""
+
+msgid "NO"
+msgstr ""
+
+msgid "You must delete all rooms in this area before you can delete it<p>"
+msgstr ""
+
+msgid "About Schoorbs"
+msgstr ""
+
+msgid "Database: "
+msgstr ""
+
+msgid "System: "
+msgstr ""
+
+msgid "Please contact "
+msgstr ""
+
+msgid "for any questions that aren't answered here."
+msgstr ""
+
+msgid "Fatal Error: Failed to connect to database"
+msgstr ""
+
+msgid "Authentication"
+msgstr ""
+
+msgid "How do I login?"
+msgstr ""
+
+msgid "Why can't I delete/alter a meeting?"
+msgstr ""
+
+msgid "Making/Altering Meetings"
+msgstr ""
+
+msgid "How do I make a recurring meeting?"
+msgstr ""
+
+msgid "How do I delete one instance of a recurring meeting?"
+msgstr ""
+
+msgid "How do I schedule rooms at different sites?"
+msgstr ""
+
+msgid "My meeting failed to be created because of <em>too many
entries</em>!"
+msgstr ""
+
+msgid "What happens if multiple people schedule the same meeting?"
+msgstr ""
+
+msgid "Miscellaneous"
+msgstr ""
+
+msgid ""
+"What is the difference between <em>Internal</em> and <em>External</em>?"
+msgstr ""
+
+msgid "How much did the system cost?"
+msgstr ""
+
+msgid "How does the system work and who wrote it?"
+msgstr ""
+
+msgid ""
+"The system can be configured to use one of several methods of "
+"authentication, including LDAP, Netware, and SMB. See your system "
+"administrator if you are having trouble logging in. Some functions are "
+"restricted to certain users, and other users will get the message <em>You
do "
+"not have access rights to modify this item</em>. See your system "
+"administrator if this is not working correctly for you. If the system is "
+"configured to use LDAP authentication, this means that you login with
the "
+"same username and password as you use for getting email e.g. <em>Mark "
+"Belanger</em> and <em>MyPassword</em>."
+msgstr ""
+
+msgid "Top"
+msgstr ""
+
+msgid ""
+"In order to delete or alter a meeting, you must be logged in as the same "
+"person that made the meeting. Contact one of the meeting room "
+"administrators or the person who initially made the meeting to have it "
+"deleted or changed."
+msgstr ""
+
+msgid ""
+"Clicking on the desired time brings you into the booking screen. Select
the "
+"appropriate <em>Repeat Type</em>. The room will be scheduled at the same "
+"time, until the <em>Repeat End Date</em>, on the days determined by the "
+"Repeat Type."
+msgstr ""
+
+msgid "A <em>Daily</em> repeat schedules every day."
+msgstr ""
+
+msgid ""
+"A <em>Weekly</em> repeat schedules those days of the week that you check "
+"under <em>Repeat Day</em>. For example, use Weekly repeat to schedule
the "
+"room every Monday, Tuesday, and Thursday; check those days under Repeat
Day. "
+"If you check no days under Repeat Day, the schedule will repeat on the
same "
+"day of each week as the first scheduled day."
+msgstr ""
+
+msgid ""
+"A <em>Monthly</em> repeat schedules the same day of each month, for
example "
+"the 15th of the month."
+msgstr ""
+
+msgid ""
+"A <em>Yearly</em> repeat schedules the same month and day of the month,
for "
+"example every March 15th."
+msgstr ""
+
+msgid ""
+"Finally, a <em>Monthly, corresponding day</em> repeat schedules one day
each "
+"month, the same weekday and ordinal position within the month. Use this "
+"repeat type to schedule the first Monday, second Tuesday, or fourth
Friday "
+"of each month, for example. Do not use this repeat type after the 28th
day "
+"of the month."
+msgstr ""
+
+msgid ""
+"Select the day/room/time that you want to delete and select <em>Delete "
+"Entry</em>."
+msgstr ""
+
+msgid ""
+"You don't. Presently the system cannot book two different rooms "
+"simultaneously. You must schedule each one separately. Make sure that
the "
+"time you want is available at both sites before making a booking."
+msgstr ""
+
+msgid ""
+"No meeting can create more than 365 entries. There needs to be some limit
on "
+"the number of meetings created. This number can be increased if
necessary."
+msgstr ""
+
+msgid ""
+"The short answer is: The first person to click on the <em>Submit</em>
button "
+"wins. Behind the scenes, the system is using a proper multi-user, multi-"
+"threaded relational database than can handle many thousands of
simultaneous "
+"users."
+msgstr ""
+
+msgid ""
+"By default, MRBS defines two meeting types. <em>Internal</em> means that
the "
+"meeting will only be attended by employees. An <em>External</em> meeting "
+"might also be attended by customers, vendors, investors, etc. Your site
can "
+"define up to a total of 10 meeting types, according to your needs.
Meetings "
+"are highlighted in the main calendar view with a color corresponding to "
+"their type, and a color key of all defined types is shown at the bottom
of "
+"the main calendar view."
+msgstr ""
+
+msgid "Nothing. See the next section for more information."
+msgstr ""
+
+msgid ""
+"<a href=\"http://schoorbs.xhochy.com/\">Schoorbs</a> is open source
software "
+"that is distributed under the Gnu Public License(GPLv2). This means that "
+"software is free to use, distribute, and modify."
+msgstr ""
+
+msgid ""
+"The system is written mostly in <a href=\"http://www.php.net\">PHP</a>, "
+"which is an open source programming language that can be embedded in web "
+"pages similar in concept to Microsoft active server pages. PHP is "
+"especially good at accessing databases."
+msgstr ""
+
+msgid ""
+"The database used for the system is either <a "
+"href=\"http://www.mysql.com/\">MySQL</a> or <a "
+"href=\"http://www.postgresql.org/\">PostgreSQL</a>. MySQL is a very
fast, "
+"multi-threaded, multi-user and robust SQL (Structured Query Language) "
+"database server that is also GPL. PostgreSQL is a full-featured
multi-user "
+"open source Object Relational SQL database server."
+msgstr ""
+
+msgid ""
+"The system will run on multiple platforms, including the PC architecture "
+"using the <a href=\"http://www.linux.com/\">Linux</a> operating system. "
+"Linux, is a free, open source, unix-like operating system."
+msgstr ""
+
+msgid ""
+"The web server being used is yet another piece of free, open source "
+"software. The <a href=\"http://www.apache.org/\">Apache</a> web server
is "
+"the world's most popular web server."
+msgstr ""
+
+msgid ""
+"The bottom line is: <strong>every piece of this system, from the
operating "
+"system to the application, is completely free - source code and
all</strong>."
+msgstr ""
+
+msgid "No entry id for editing was provided!"
+msgstr ""

Modified: trunk/schoorbs-includes/lang/schoorbs-zh_TW.po
==============================================================================
--- trunk/schoorbs-includes/lang/schoorbs-zh_TW.po (original)
+++ trunk/schoorbs-includes/lang/schoorbs-zh_TW.po Sun Mar 1 08:08:19 2009
@@ -9,7 +9,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-10-06 18:04+0000\n"
+"X-Launchpad-Export-Date: 2009-03-01 15:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"

msgid "Sunday"
@@ -913,4 +913,7 @@
msgid ""
"The bottom line is: <strong>every piece of this system, from the
operating "
"system to the application, is completely free - source code and
all</strong>."
+msgstr ""
+
+msgid "No entry id for editing was provided!"
msgstr ""

Modified: trunk/schoorbs-includes/lang/schoorbs.pot
==============================================================================
--- trunk/schoorbs-includes/lang/schoorbs.pot (original)
+++ trunk/schoorbs-includes/lang/schoorbs.pot Sun Mar 1 08:08:19 2009
@@ -915,3 +915,21 @@

msgid "No entry id for editing was provided!"
msgstr ""
+
+msgid "Not all needed components(hour, minute) for the time were set."
+msgstr ""
+
+msgid "A starting period was not supplied."
+msgstr ""
+
+msgid "Supplied value for the period is not valid."
+msgstr ""
+
+msgid "Supplied value for the hour is not valid."
+msgstr ""
+
+msgid "Supplied value for the minute is not valid."
+msgstr ""
+
+msgid "Supplied value for the duration unit is not valid."
+msgstr ""

Modified: trunk/schoorbs-misc/themes/contented6/edit-entry.tpl.php
==============================================================================
--- trunk/schoorbs-misc/themes/contented6/edit-entry.tpl.php (original)
+++ trunk/schoorbs-misc/themes/contented6/edit-entry.tpl.php Sun Mar 1
08:08:19 2009
@@ -48,9 +48,8 @@
<option value="weeks"<?php echo (Lang::_('weeks') ==
$sDurationUnit ? ' selected="selected"' : '') ?>><?php echo
Lang::_('weeks'); ?></option>
<?php } ?>
</select><br />
- <label for="main-all-day"><?php echo Lang::_('All day'); ?>:</label>
<input name="all_day" id="main-all-day" type="checkbox" value="yes" /><br />
- <label for="main-rooms"><?php echo Lang::_('Rooms'); ?>:</label><br
/>
- <select name="rooms[]" id="main-rooms" multiple="multiple" size="5"
style="width: 300px;">
+ <label for="main-rooms"><?php echo Lang::_('Room'); ?>:</label>
+ <select name="room" id="main-rooms" style="width: 150px;">
<?php $nActiveRoom = $entry->getRoom()->getId(); ?>
<?php foreach (Area::getAreas() as $oArea) { ?>
<optgroup label="<?php echo $oArea->getName(); ?>">
@@ -60,7 +59,6 @@
</optgroup>
<?php } ?>
</select><br />
- <label for="main-minute" style="width: 400px;"><?php echo
Lang::_('Use Control-Click to select more than one type'); ?></label><br />
<label for="main-type"><?php echo Lang::_('Type:'); ?></label>
<select id="main-type" name="type">
<?php foreach ($types as $aType) { ?>
@@ -70,9 +68,7 @@
<?php if (isset($_SERVER['HTTP_REFERER'])) { ?>
<input type="hidden" name="returl" value="<?php echo
htmlentities($_SERVER['HTTP_REFERER']); ?>" />
<?php } ?>
- <?php if ($entry != null) { ?>
- <input type="hidden" id="main-id" name="id" value="<?php echo
$entry->getId(); ?>" />
- <?php } ?>
+ <input type="hidden" id="main-id" name="id" value="<?php echo
$entry->getId(); ?>" />
<input type="submit"value="<?php echo Lang::_('Save'); ?>" />
</form>
</div>
Reply all
Reply to author
Forward
0 new messages