|
From: <mah...@us...> - 2010-08-17 08:40:32
|
Revision: 375
http://dccss.svn.sourceforge.net/dccss/?rev=375&view=rev
Author: maher_karim
Date: 2010-08-17 08:40:23 +0000 (Tue, 17 Aug 2010)
Log Message:
-----------
2010-08-17 Maher Abdel Karim <mah...@do...>
* dataobject/public_billing_info.php: add billing info table
class.
* dataobject/public_subscriber.php: add more fields.
* Query.php: adjust query page to allow query billing information
* include/dcmmaputil.php:
* map.php: add functionality to add meter cabinet
* ar/LC_messages/dccss.po:
* i18n.php: add more translation
Modified Paths:
--------------
branches/ms4w/apps/dccss/changelog
branches/ms4w/apps/dccss/conf/dccss_pewssa_ar.map
branches/ms4w/apps/dccss/include/dataobject/Public_subscriber.php
branches/ms4w/apps/dccss/include/dcmmaputil.php
branches/ms4w/apps/dccss/include/i18n.php
branches/ms4w/apps/dccss/locale/ar/LC_MESSAGES/dccss.po
branches/ms4w/apps/dccss/map.php
branches/ms4w/apps/dccss/query.php
Added Paths:
-----------
branches/ms4w/apps/dccss/include/dataobject/Public_billing_info.php
Modified: branches/ms4w/apps/dccss/changelog
===================================================================
--- branches/ms4w/apps/dccss/changelog 2010-05-10 08:50:33 UTC (rev 374)
+++ branches/ms4w/apps/dccss/changelog 2010-08-17 08:40:23 UTC (rev 375)
@@ -1,3 +1,14 @@
+2010-08-17 Maher Abdel Karim <mah...@do...>
+
+ * dataobject/public_billing_info.php: add billing info table
+ class.
+ * dataobject/public_subscriber.php: add more fields.
+ * Query.php: adjust query page to allow query billing information
+ * include/dcmmaputil.php:
+ * map.php: add functionality to add meter cabinet
+ * ar/LC_messages/dccss.po:
+ * i18n.php: add more translation
+
2010-05-10 Maher Abdel karim <mah...@do...>
* print_workorder.php:
Modified: branches/ms4w/apps/dccss/conf/dccss_pewssa_ar.map
===================================================================
--- branches/ms4w/apps/dccss/conf/dccss_pewssa_ar.map 2010-05-10 08:50:33 UTC (rev 374)
+++ branches/ms4w/apps/dccss/conf/dccss_pewssa_ar.map 2010-08-17 08:40:23 UTC (rev 375)
@@ -327,8 +327,8 @@
CONNECTION "dbname=dccss user=dcmms password=dcmms host=localhost"
name "cabinet"
type point
- status Off
- labelitem "pewssaid"
+ status default
+ labelitem "id"
DATA "the_geom from metercabinet using unique gid"
CLASS
NAME "route"
@@ -338,8 +338,8 @@
SIZE 15
COLOR 255 0 0
label
- color 38 119 38
- position uc
+ color 255 0 0
+ #position uc
font arial
type truetype
size 9
Added: branches/ms4w/apps/dccss/include/dataobject/Public_billing_info.php
===================================================================
--- branches/ms4w/apps/dccss/include/dataobject/Public_billing_info.php (rev 0)
+++ branches/ms4w/apps/dccss/include/dataobject/Public_billing_info.php 2010-08-17 08:40:23 UTC (rev 375)
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Table Definition for public.bill
+ */
+require_once 'DB/DataObject.php';
+
+class DataObject_Public_billing_info extends DB_DataObject
+{
+ ###START_AUTOCODE
+ /* the code below is auto generated do not remove the above tag */
+
+ var $__table = 'public.billing_info'; // table name
+ var $logbook; // int4(4)
+ var $sequence; // int4(4)
+ var $name; // varchar(-1)
+ var $subscribernumber; // varchar(-1)
+ var $meternumber; // int4(4)
+ var $meterlocation; // varchar(-1)
+
+ /* ZE2 compatibility trick*/
+ function __clone() { return $this;}
+
+ /* Static get */
+ function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('DataObject_Public_bill',$k,$v); }
+
+ /* the code above is auto generated do not remove the tag below */
+ ###END_AUTOCODE
+
+ /**
+ * Return an HTML_Table containing all available translations. The table
+ * includes a link to a page for subscriber editing.
+ * @param $strBacklink is a link back to the page that links to translation
+ * management.
+ * @param $strPagePath is the link from the current page to the translation
+ * management page ('' or 'admin/').
+ * @return An HTML_Table.
+ */
+ function getTable($strBacklink = '', $strPagePath = '',$action='') {
+ $objTable = new HTML_Table(NULL);
+ $objTable->setAutoGrow(true);
+
+ $objTable->setCellContents(0, 0, _("ID"), "TH");
+ $objTable->setCellContents(0, 1, _("DeliveryPoint #"), "TH");
+ $objTable->setCellContents(0, 2, _("Logbook"), "TH");
+ $objTable->setCellContents(0, 3, _("Subscriber number"), "TH");
+ $objTable->setCellContents(0, 4, _("Name"), "TH");
+ $objTable->setCellContents(0, 5, _("Meter"), "TH");
+ $objTable->setCellContents(0, 6, _("Sequence"), "TH");
+ $objTable->setCellContents(0, 7, _("Subsequence"), "TH");
+
+ $objTable->setCellContents(0, 10, _("Action"), "TH");
+ $objTable->setCellContents(0, 8, _("Route ID"), "TH");
+$objTable->setCellContents(0, 9, _("DeliveryPoint"), "TH");
+
+ $i = 1;
+ $showadd=true;
+ while($this->fetch()) {
+ if($this->geocode != '') {
+ $objTable->setCellContents($i, 0, $this->id);
+ $objTable->setCellContents($i, 1, $this->geocode);
+ $objTable->setCellContents($i, 2, $this->logbooknumber);
+ $objTable->setCellContents($i, 3, $this->subscription);
+ $objTable->setCellContents($i, 4, $this->name);
+ $objTable->setCellContents($i, 5, $this->serialnumber);
+ $objTable->setCellContents($i, 6, $this->sequence);
+ $objTable->setCellContents($i, 7, $this->subsequence);
+ $objTable->setCellContents($i, 8, $this->routeid);
+$objTable->setCellContents($i, 9, $this->dpsequence);
+
+ if ($action=='view'){
+ $ref='<a href="deliverypointpage.php?PHPSESSID='.session_id().
+ '&action=map&geocode='. $this->geocode.'">'.
+ _('[View on Map]').'</a>';
+ $ref=$ref.'<a href="print_ac.php?PHPSESSID='.session_id().
+ '&action=map&id='.$this->id.'&geocode='. $this->geocode.'">'.
+ _('[Print]').'</a>';
+ $showadd=false;
+ }
+ $objTable->setCellContents($i, 10, $ref);
+ $i++;
+ }
+ }
+ if ($showadd){
+ $objTable->setCellContents($i, 0,
+ "<a href=\"subscriberpage.php?geocode=".$this->geocode.
+ "&backlink=".urlencode($strBacklink)."\">"._("[Add]")."</a>");
+ }
+ return $objTable;
+ }
+
+ }
Modified: branches/ms4w/apps/dccss/include/dataobject/Public_subscriber.php
===================================================================
--- branches/ms4w/apps/dccss/include/dataobject/Public_subscriber.php 2010-05-10 08:50:33 UTC (rev 374)
+++ branches/ms4w/apps/dccss/include/dataobject/Public_subscriber.php 2010-08-17 08:40:23 UTC (rev 375)
@@ -205,7 +205,11 @@
$objTable->setCellContents(0, 5, _("Meter"), "TH");
$objTable->setCellContents(0, 6, _("Sequence"), "TH");
$objTable->setCellContents(0, 7, _("Subsequence"), "TH");
- $objTable->setCellContents(0, 8, _("Action"), "TH");
+
+ $objTable->setCellContents(0, 10, _("Action"), "TH");
+ $objTable->setCellContents(0, 8, _("Route ID"), "TH");
+$objTable->setCellContents(0, 9, _("DeliveryPoint"), "TH");
+
$i = 1;
$showadd=true;
while($this->fetch()) {
@@ -218,6 +222,9 @@
$objTable->setCellContents($i, 5, $this->serialnumber);
$objTable->setCellContents($i, 6, $this->sequence);
$objTable->setCellContents($i, 7, $this->subsequence);
+ $objTable->setCellContents($i, 8, $this->routeid);
+$objTable->setCellContents($i, 9, $this->dpsequence);
+
if ($action=='view'){
$ref='<a href="deliverypointpage.php?PHPSESSID='.session_id().
'&action=map&geocode='. $this->geocode.'">'.
@@ -227,7 +234,7 @@
_('[Print]').'</a>';
$showadd=false;
}
- $objTable->setCellContents($i, 8, '<a href="'.$strPagePath.
+ $objTable->setCellContents($i, 10, '<a href="'.$strPagePath.
'subscriberpage.php?'.
"action=edit&id=".$this->id."&geocode=".$this->geocode.
"&backlink=".urlencode($strBacklink)."\">"._("[Edit]")."</a>".$ref);
Modified: branches/ms4w/apps/dccss/include/dcmmaputil.php
===================================================================
--- branches/ms4w/apps/dccss/include/dcmmaputil.php 2010-05-10 08:50:33 UTC (rev 374)
+++ branches/ms4w/apps/dccss/include/dcmmaputil.php 2010-08-17 08:40:23 UTC (rev 375)
@@ -251,7 +251,7 @@
"&CMD=DeliveryPoint\">".
_("Cancel Move")."</a> ]";
} else {
-
+
// Specify the list of actions that can be berformed for the
// deliverypint. Available acions (if a deliverypoint is selected)
// Edit,Move, and delete.
@@ -381,4 +381,147 @@
return($strHtml);
}
}
+
+class metercabinetTool extends HTML_QuickForm_radio {
+
+ /**
+ * Whether the current user is administrator or not.
+ */
+ var $boolmetercabinetEditor = TRUE;
+
+ /**
+ * The ID of a selected metercabinet.
+ */
+ var $intSelectedID = NULL;
+
+ /**
+ * The X coordinate of the mouse click.
+ */
+ var $intX = NULL;
+
+ /**
+ * The Y coordinate of the mouse click.
+ */
+ var $intY = NULL;
+
+ /**
+ * The action that is currently performed.
+ */
+ var $strAction = "";
+
+ /**
+ * Return the metercabinetTool object.
+ * @param $strUser The user name.
+ * @param $intGeoX The X coordinate of the mouse click (geographic).
+ * @param $intGeoY The Y coordinate of the mouse click (geographic).
+ * @returns The metercabinetTool object.
+ */
+ function metercabinetTool($strUser, $intGeoX, $intGeoY) {
+ parent::HTML_QuickForm_radio("CMD", _("Meter Cabinet"));
+ $this->intX = $intGeoX;
+ $this->intY = $intGeoY;
+ }
+
+ /**
+ * Select a metercabinet for editing.
+ * @param $intID is the metercabinet ID.
+ * @returns Nothing.
+ */
+ function setSelected($intID) {
+ $this->intSelectedID = $intID;
+ }
+
+ /**
+ * Set the action of the tool
+ * @param $strAction is a string describing the current action.
+ * @returns Nothing.
+ */
+ function setAction($strAction) {
+ $this->strAction = $strAction;
+ if($strAction == "movemetercabinet") {
+ $this->setValue("MOVE_metercabinet");
+ }
+ }
+
+ /**
+ * Return the HTML code of the metercabinet tool.
+ * @returns A string containing the generated HTML code.
+ * \todo Re-add tooltips, keep image size settings when moving landmark
+ */
+ function toHtml() {
+ $strImage = "icon_landmark.png";
+ if($this->strAction == "movemetercabinet") {
+ $strImage = "move_landmark.png";
+ }
+ $strHtml = "<img src=\"images/$strImage\" width=\"24\" ".
+ "height=\"24\" border=\"0\" alt=\""._("Meter cabinet")."\" /></td><td>";
+ $strHtml = $strHtml.parent::toHtml()._("Meter cabinet")." ";
+ if($this->intSelectedID != NULL) {
+ if($this->boolmetercabinetEditor) {
+ if($this->strAction == "movemetercabinet") {
+ if($this->intX != NULL) {
+ $strHtml = $strHtml." [ <a href=\"map.php?metercabinetID=".$this->intSelectedID."&PHPSESSID=".session_id().
+ "&action=acceptedmetercabinetMove&gravitymain=Y&pressurizedmain=Y&ViewRegion=Quick+".
+ "View&minx=".$_REQUEST["minx"]."&miny=".$_REQUEST["miny"]."&maxx=".
+ $_REQUEST["maxx"]."&maxy=".$_REQUEST["maxy"]."&imagewidth=400&".
+ "imageheight=300&CMD=metercabinet".
+ "&KEYMAPXSIZE=120&KEYMAPYSIZE=66&MapSize=400%2C300&PREVIOUS_MODE=1".
+ "&CMD=metercabinet&metercabinetID=".
+ $this->intSelectedID."&sequence=".$this->intSelectedID."&metercabinetX=".$this->intX."&metercabinetY=".
+ $this->intY."\">".
+ _("Accept Move")."</a> ]";
+ }
+ $strHtml = $strHtml." [ <a href=\"map.php?PHPSESSID=".session_id().
+ "&gravitymain=Y&pressurizedmain=Y&ViewRegion=Quick+".
+ "View&minx=".$_REQUEST["minx"]."&miny=".$_REQUEST["miny"]."&maxx=".
+ $_REQUEST["maxx"]."&maxy=".$_REQUEST["maxy"]."&imagewidth=400&".
+ "imageheight=300".
+ "&KEYMAPXSIZE=120&KEYMAPYSIZE=66&MapSize=400%2C300&PREVIOUS_MODE=1".
+ "&CMD=metercabinet\">".
+ _("Cancel Move")."</a> ]";
+ } else {
+
+
+ // Specify the list of actions that can be berformed for the
+ // deliverypint. Available acions (if a deliverypoint is selected)
+ // Edit,Move, and delete.
+ $strHtml = $strHtml." [ ".
+ "<a href=\"map.php?PHPSESSID=".session_id().
+ "&gravitymain=Y&pressurizedmain=Y&ViewRegion=Quick+".
+ "View&minx=".$_REQUEST["minx"]."&miny=".$_REQUEST["miny"]."&maxx=".
+ $_REQUEST["maxx"]."&maxy=".$_REQUEST["maxy"]."&imagewidth=400&".
+ "imageheight=300&CMD=MOVE_metercabinet".
+ "&KEYMAPXSIZE=120&KEYMAPYSIZE=66&MapSize=400%2C300&PREVIOUS_MODE=1".
+ "&metercabinetID=".$this->intSelectedID."&action=movemetercabinet".
+ "&sequence=".$this->intSelectedID."\">".
+ _("Move")."</a> ][ ".
+ "<a href=\"map.php?PHPSESSID=".session_id().
+ "&gravitymain=Y&pressurizedmain=Y&ViewRegion=Quick+".
+ "View&minx=".$_REQUEST["minx"]."&miny=".$_REQUEST["miny"]."&maxx=".
+ $_REQUEST["maxx"]."&maxy=".$_REQUEST["maxy"]."&imagewidth=400&".
+ "imageheight=300&CMD=MOVE_metercabinet".
+ "&KEYMAPXSIZE=120&KEYMAPYSIZE=66&MapSize=400%2C300&PREVIOUS_MODE=1".
+ "&metercabinetID=".$this->intSelectedID."&action=deletemetercabinet".
+ "&sequence=".$this->intSelectedID."\">".
+ _("Delete")."</a> ]";
+ }
+ } else {
+ $strHtml = $strHtml."<a href=\"metercabinetpage.php?action=view&PHPSESSID=".
+ session_id()."&id=".$this->intSelectedID."\">"._("[View]")."</a>";
+ }
+ } else {
+ if(($this->intX != NULL)&&($this->getChecked())) {
+ $strInsert= "insert into metercabinet (the_geom,id,username) values
+ (GeometryFromText('POINT(".$this->intX." ".$this->intY.")', -1),nextval('deliverypoint_seq'),'".$_SESSION['UserName']."')";
+ //echo ($strInsert);
+ pg_query($strInsert);
+ }
+ }
+ if($this->intSelectedID != NULL) {
+ $strHtml = $strHtml."<input type=\"hidden\" name=\"metercabinetID\"".
+ " value=\"".$this->intSelectedID."\" />";
+ }
+ return $strHtml;
+ }
+}
?>
Modified: branches/ms4w/apps/dccss/include/i18n.php
===================================================================
--- branches/ms4w/apps/dccss/include/i18n.php 2010-05-10 08:50:33 UTC (rev 374)
+++ branches/ms4w/apps/dccss/include/i18n.php 2010-08-17 08:40:23 UTC (rev 375)
@@ -143,6 +143,9 @@
_("paracode");
_("routeid");
_("pewssaid");
+_('Route ID');
+_('DeliveryPoint');
+
?>
Modified: branches/ms4w/apps/dccss/locale/ar/LC_MESSAGES/dccss.po
===================================================================
--- branches/ms4w/apps/dccss/locale/ar/LC_MESSAGES/dccss.po 2010-05-10 08:50:33 UTC (rev 374)
+++ branches/ms4w/apps/dccss/locale/ar/LC_MESSAGES/dccss.po 2010-08-17 08:40:23 UTC (rev 375)
@@ -1,12 +1,13 @@
msgid ""
msgstr ""
"Project-Id-Version: DCCSS\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: 2009-01-20 11:50+0200\n"
-"Last-Translator: Maher Karim <Mah...@do...>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-05-23 15:00+0200\n"
+"PO-Revision-Date: 2010-05-23 15:03+0200\n"
+"Last-Translator: \n"
"Language-Team: Dorsch <mah...@do...>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-Poedit-Basepath: .\n"
@@ -50,12 +51,7 @@
# e:\program
#: ../../.././dataentry_performance_report.php:33
#: ../../.././logon.php:35
-#: ../../.././map.php:34
-#: ../../.././Copy of include/dccsspage.php:31
-#: include/header.php:34
-#: ../../.././include/dccsspage.php:31
-#: ../../.././include/header.php:34
-#: ../../.././include/dcmms/include/dcmmspage.php:37
+#: ../../.././map.php:35
#, php-format
msgid "FATAL ERROR: PHP extension '%s' is not loaded."
msgstr ""
@@ -68,33 +64,25 @@
# C:\Program
#: ../../.././dataentry_performance_report.php:55
-#: ../../.././surveyor_report.php:35
msgid "Select From Date"
msgstr "اختر بداية الفتره"
# e:\program
#: ../../.././dataentry_performance_report.php:56
-#: ../../.././surveyor_report.php:36
msgid "Select To Date"
msgstr "اختر تاريخ نهاية الفتره"
-# c:\program
-#: ../../.././dataentry_performance_report.php:71
-msgid "Data Entry performance report for the period from"
-msgstr "تقرير اداء مدخلي البيانات للفترة من"
-
# C:\Program
#: ../../.././dataentry_performance_report.php:72
-#: ../../.././surveyor_report.php:51
-msgid "\t\t"
-msgstr ""
-
-# C:\Program
-#: ../../.././dataentry_performance_report.php:72
-#: ../../.././surveyor_report.php:51
msgid "To"
msgstr "الى"
+# c:\program
+#: ../../.././dataentry_performance_report.php:71
+#, fuzzy
+msgid "Data Entry performance report for the period from\t\t"
+msgstr "تقرير اداء مدخلي البيانات للفترة من"
+
# e:\program
#: ../../.././dataentry_performance_report.php:155
msgid "Entered delivery Point"
@@ -107,13 +95,6 @@
# e:\program
#: ../../.././deliverypointpage.php:37
-#: ../../.././Copy of
-#: include/dcmmaputil.php:191
-#: include/dcmmaputil.php:228
-#: include/dcmmaputil.php:229
-#: ../../.././include/dcmmaputil.php:191
-#: ../../.././include/dcmmaputil.php:228
-#: ../../.././include/dcmmaputil.php:229
msgid "Delivery Point"
msgstr "رمز العنوان الجغرافي"
@@ -145,27 +126,11 @@
# c:\program
#: ../../.././deliverypointpage.php:168
-#: ../../.././subscriberpage.php:223
-#: ../../.././Copy of include/dataobject/Public_deliverypoint.php:164
-#: include/dataobject/Public_subscriber.php:112
-#: ../../.././include/dataobject/Public_deliverypoint.php:164
-#: ../../.././include/dataobject/Public_subscriber.php:112
-#: ../../.././include/dcmms/include/dataobject/Dcmmsuser.php:123
-#: ../../.././include/dcmms/include/dataobject/Equipment.php:59
-#: ../../.././include/dcmms/include/dataobject/Landmark.php:111
-#: ../../.././include/dcmms/include/dataobject/Maintenance.php:113
-#: ../../.././include/dcmms/include/dataobject/Material.php:58
-#: ../../.././include/dcmms/include/dataobject/Seal.php:67
-#: ../../.././include/dcmms/include/dataobject/Staff.php:124
-#: ../../.././include/dcmms/include/dataobject/Team.php:107
-#: ../../.././include/dcmms/include/dataobject/Translation.php:67
-#: ../../.././include/dcmms/include/dataobject/Workorder.php:106
msgid "Submit"
msgstr "حفظ"
# c:\program
#: ../../.././deliverypointpage.php:180
-#: ../../.././subscriberpage.php:110
msgid "Failed to save record(s)."
msgstr "لم تتم عملية حفظ السجل/السجلات بنجاح"
@@ -181,13 +146,12 @@
# e:\program
#: ../../.././deliverypointpage.php:221
-#: ../../.././query.php:177
-#: ../../.././subscriberpage.php:185
msgid "Back to delivery point"
msgstr "البحث عن نقطة المدخل باستخدام رقم التعريف"
# e:\program
#: ../../.././index.php:27
+#: ../../.././map.php:454
msgid "DC Comprehensive Subscribers Survey"
msgstr "DC مشروع المسح الميداني الشامل للمشتركين"
@@ -208,7 +172,6 @@
# e:\program
#: ../../.././index.php:56
-#: ../../.././include/dcmms/include/resourcepage.php:72
msgid "Map"
msgstr "الخريطة"
@@ -219,7 +182,6 @@
# e:\program
#: ../../.././index.php:59
-#: ../../.././reports.php:30
msgid "Reports"
msgstr "التقارير"
@@ -241,13 +203,11 @@
# c:\program
#: ../../.././index.php:68
#: ../../.././index.php:69
-#: ../../.././include/dcmms/include/i18n.php:30
msgid "Administration"
msgstr "الادارة"
# c:\program
#: ../../.././index.php:73
-#: ../../.././admin/shapefile_loader.php:31
msgid "Shapefile Loader"
msgstr "تحميل البيانات الجغرافية"
@@ -307,7 +267,6 @@
# e:\program
#: ../../.././index.php:105
-#: ../../.././admin/move_subscriber.php:50
msgid "Move Subscriber"
msgstr "نقل مشترك"
@@ -327,11 +286,6 @@
# C:\Program
#: ../../.././logbook_report.php:55
#: ../../.././logbook_report_subscriber.php:51
-#: ../../.././Copy of
-#: include/i18n.php:95
-#: include/i18n.php:102
-#: ../../.././include/i18n.php:95
-#: ../../.././include/i18n.php:102
msgid "Log Book based CSS form printing"
msgstr "طباعة نماذج المسح الميداني حسب المجلد"
@@ -344,7 +298,6 @@
# C:\Program
#: ../../.././logbook_report.php:58
#: ../../.././logbook_report_subscriber.php:54
-#: ../../.././taskforce_report.php:63
msgid "Batch:"
msgstr "المجموعة:"
@@ -369,28 +322,6 @@
#: ../../.././logbook_report.php:69
#: ../../.././logbook_report_subscriber.php:63
#: ../../.././meter_query_report.php:64
-#: ../../.././query.php:112
-#: ../../.././taskforce_report.php:79
-#: ../../.././admin/move_subscriber.php:76
-#: ../../.././admin/processing.php:48
-#: ../../.././admin/purge_subscriber.php:63
-#: ../../.././Copy of include/i18n.php:62
-#: include/i18n.php:73
-#: include/dataobject/Public_deliverypoint.php:116
-#: include/dataobject/Public_subscriber.php:166
-#: ../../.././include/i18n.php:62
-#: ../../.././include/i18n.php:73
-#: ../../.././include/dataobject/Public_deliverypoint.php:116
-#: ../../.././include/dataobject/Public_subscriber.php:166
-#: ../../.././include/dcmms/include/dcmmsreport.php:111
-#: ../../.././include/dcmms/include/dataobject/Dcmmsuser.php:140
-#: ../../.././include/dcmms/include/dataobject/Landmark.php:87
-#: ../../.././include/dcmms/include/dataobject/Maintenance.php:174
-#: ../../.././include/dcmms/include/dataobject/Seal.php:95
-#: ../../.././include/dcmms/include/dataobject/Staff.php:146
-#: ../../.././include/dcmms/include/dataobject/Team.php:127
-#: ../../.././include/dcmms/include/dataobject/Translation.php:89
-#: ../../.././include/dcmms/include/dataobject/Workorder.php:191
msgid "denotes required field"
msgstr "الرجاء تعبئة الحقول المطلوبة."
@@ -419,9 +350,6 @@
# c:\program
#: ../../.././logbook_report.php:89
-#: ../../.././Copy of
-#: include/dataobject/Public_deliverypoint.php:137
-#: ../../.././include/dataobject/Public_deliverypoint.php:137
msgid "Survey Date:"
msgstr "تاريخ جمع المعلومات :"
@@ -437,15 +365,11 @@
# c:\program
#: ../../.././logbook_report.php:96
-#: ../../.././Copy of include/i18n.php:75
-#: ../../.././include/i18n.php:75
msgid "Arabic"
msgstr "دار عربي"
# c:\program
#: ../../.././logbook_report.php:97
-#: ../../.././Copy of include/i18n.php:78
-#: ../../.././include/i18n.php:78
msgid "Apartment Building"
msgstr "مجمع سكني"
@@ -456,15 +380,11 @@
# c:\program
#: ../../.././logbook_report.php:99
-#: ../../.././Copy of include/i18n.php:82
-#: ../../.././include/i18n.php:82
msgid "Government Dept."
msgstr "دوائر رسمية"
# c:\program
#: ../../.././logbook_report.php:100
-#: ../../.././Copy of include/i18n.php:76
-#: ../../.././include/i18n.php:76
msgid "Factory"
msgstr "مصنع"
@@ -472,30 +392,21 @@
#: ../../.././logbook_report.php:101
#: ../../.././logbook_report.php:180
#: ../../.././logbook_report_subscriber.php:133
-#: ../../.././Copy of
-#: include/i18n.php:45
-#: ../../.././include/i18n.php:45
msgid "Hospital"
msgstr "مشفى"
# c:\program
#: ../../.././logbook_report.php:102
-#: ../../.././Copy of include/i18n.php:79
-#: ../../.././include/i18n.php:79
msgid "Religious"
msgstr "دور عباده"
# c:\program
#: ../../.././logbook_report.php:103
-#: ../../.././Copy of include/i18n.php:83
-#: ../../.././include/i18n.php:83
msgid "Villa"
msgstr "فيلا"
# c:\program
#: ../../.././logbook_report.php:104
-#: ../../.././Copy of include/i18n.php:77
-#: ../../.././include/i18n.php:77
msgid "Farm"
msgstr "مزرعة"
@@ -503,10 +414,6 @@
#: ../../.././logbook_report.php:105
#: ../../.././logbook_report.php:160
#: ../../.././logbook_report_subscriber.php:113
-#: ../../.././Copy of
-#: include/i18n.php:81
-#: ../../.././include/i18n.php:81
-#: ../../.././include/dcmms/include/i18n.php:222
msgid "Other"
msgstr "أخرى"
@@ -542,15 +449,6 @@
#: ../../.././logbook_report.php:147
#: ../../.././logbook_report_subscriber.php:98
#: ../../.././logbook_report_subscriber.php:101
-#: ../../.././Copy of
-#: include/i18n.php:27
-#: include/dataobject/Public_deliverypoint.php:151
-#: include/dataobject/Public_deliverypoint.php:152
-#: include/dataobject/Public_deliverypoint.php:153
-#: ../../.././include/i18n.php:27
-#: ../../.././include/dataobject/Public_deliverypoint.php:151
-#: ../../.././include/dataobject/Public_deliverypoint.php:152
-#: ../../.././include/dataobject/Public_deliverypoint.php:153
msgid "Yes"
msgstr "نعم"
@@ -561,15 +459,6 @@
#: ../../.././logbook_report.php:148
#: ../../.././logbook_report_subscriber.php:99
#: ../../.././logbook_report_subscriber.php:102
-#: ../../.././Copy of
-#: include/i18n.php:25
-#: include/dataobject/Public_deliverypoint.php:151
-#: include/dataobject/Public_deliverypoint.php:152
-#: include/dataobject/Public_deliverypoint.php:153
-#: ../../.././include/i18n.php:25
-#: ../../.././include/dataobject/Public_deliverypoint.php:151
-#: ../../.././include/dataobject/Public_deliverypoint.php:152
-#: ../../.././include/dataobject/Public_deliverypoint.php:153
msgid "No"
msgstr "لا"
@@ -595,8 +484,6 @@
# c:\program
#: ../../.././logbook_report.php:120
-#: ../../.././Copy of include/i18n.php:69
-#: ../../.././include/i18n.php:69
msgid "Tanker"
msgstr "صهاريج"
@@ -607,16 +494,12 @@
# c:\program
#: ../../.././logbook_report.php:122
-#: ../../.././Copy of include/i18n.php:70
-#: ../../.././include/i18n.php:70
msgid "Tube Well"
msgstr "بئر ماء"
# C:\Program
#: ../../.././logbook_report.php:123
#: ../../.././logbook_report.php:153
-#: ../../.././Copy of include/i18n.php:104
-#: ../../.././include/i18n.php:104
msgid "Legal Connection"
msgstr "وصله نظاميه"
@@ -848,9 +731,6 @@
# c:\program
#: ../../.././logbook_report.php:179
#: ../../.././logbook_report_subscriber.php:132
-#: ../../.././Copy of
-#: include/i18n.php:43
-#: ../../.././include/i18n.php:43
msgid "Domestic"
msgstr "منزلي"
@@ -869,10 +749,6 @@
# c:\program
#: ../../.././logbook_report.php:183
#: ../../.././logbook_report_subscriber.php:136
-#: ../../.././Copy of
-#: include/i18n.php:42
-#: ../../.././include/i18n.php:42
-#: ../../.././include/dcmms/include/i18n.php:61
msgid "Commercial"
msgstr "تجاري"
@@ -1192,7 +1068,6 @@
# e:\program
#: ../../.././logon.php:171
-#: ../../.././include/dcmms/include/i18n.php:175
#, php-format
msgid "Logged off user '%s'."
msgstr "خروج المستخدم '%s'"
@@ -1214,9 +1089,6 @@
# e:\program
#: ../../.././logon.php:192
-#: ../../.././Copy of
-#: include/dataobject/Public_subscriber.php:103
-#: ../../.././include/dataobject/Public_subscriber.php:103
msgid "User Name:"
msgstr "اسم المستخدم:"
@@ -1236,148 +1108,152 @@
msgstr "الدخول"
# e:\program
-#: ../../.././map.php:117
+#: ../../.././map.php:120
#, php-format
msgid "Moving DeliveryPoint %s."
msgstr "تحريك نقطة الوصول رقم %s"
# e:\program
-#: ../../.././map.php:145
-msgid "Deleted DeliveryPoint."
-msgstr "تم تحريك نقطة الوصول"
+#: ../../.././map.php:127
+#, php-format
+msgid "Moving meter cabinet %s."
+msgstr "تحريك الكابينة رقم %s"
-# D:\dccss\dccss/map.php:134
-#: ../../.././map.php:145
-msgid " "
-msgstr ""
-
# e:\program
-#: ../../.././map.php:145
-msgid "DeliveryPointID:"
-msgstr "نقطة الوصول"
+#: ../../.././map.php:165
+#, fuzzy
+msgid "Deleted DeliveryPoint. DeliveryPointID:"
+msgstr "تم تحريك نقطة الوصول"
# c:\program
-#: ../../.././map.php:145
-msgid "sequence"
-msgstr "رقم التخصيص"
+#: ../../.././map.php:175
+msgid "Deleted metercabinet."
+msgstr "كابينة محذوفة."
# c:\program
-#: ../../.././map.php:184
+#: ../../.././map.php:175
+msgid "metercabinetID:"
+msgstr "رقم كابينة المؤسسة:"
+
+# c:\program
+#: ../../.././map.php:215
+#: ../../.././map.php:270
msgid "NO geocode value returned"
msgstr "لم يتم ارسال اي رمز جغرافي"
# e:\program
-#: ../../.././map.php:211
+#: ../../.././map.php:242
msgid "Moved DeliveryPoint."
msgstr "تم تحريك نقطة الوصول"
+# c:\program
+#: ../../.././map.php:290
+msgid "Moved Meter cabinet."
+msgstr "jpvd; hg;hfdkm"
+
# e:\program
-#: ../../.././map.php:365
+#: ../../.././map.php:499
msgid "Legend"
msgstr "مفتاح الخريطة"
# c:\program
-#: ../../.././map.php:387
+#: ../../.././map.php:521
msgid "Display the Water network"
msgstr "اظهار شبكة المياه"
# e:\program
-#: ../../.././map.php:388
+#: ../../.././map.php:522
msgid "Water Network"
msgstr "شبكة المياه"
# e:\program
-#: ../../.././map.php:400
-#: ../../.././include/dcmms/include/dcmmaputil.php:174
-#: ../../.././include/dcmms/include/dcmmaputil.php:229
-#: ../../.././include/dcmms/include/dcmmaputil.php:230
+#: ../../.././map.php:534
msgid "Landmark"
msgstr "معلم"
# c:\program
-#: ../../.././map.php:408
+#: ../../.././map.php:542
msgid "Refresh the map display"
msgstr "تحديث الخريطة"
# e:\program
-#: ../../.././map.php:409
+#: ../../.././map.php:543
msgid "Redraw Map"
msgstr "اعادة رسم الخريطة"
# c:\program
-#: ../../.././map.php:417
+#: ../../.././map.php:551
msgid "Zoom to grid"
msgstr "التكبير الى الشبكة"
# c:\program
-#: ../../.././map.php:440
+#: ../../.././map.php:574
msgid "Full View"
msgstr "منظر عام"
# c:\program
-#: ../../.././map.php:465
+#: ../../.././map.php:599
msgid "Select the map size from the list."
msgstr "اختر حجم الخريطة من القائمة"
# e:\program
-#: ../../.././map.php:466
+#: ../../.././map.php:600
msgid "Map Size"
msgstr "حجم الخريطة"
# e:\program
-#: ../../.././map.php:503
+#: ../../.././map.php:637
msgid "Keymap"
msgstr "خريطة الدليل"
# e:\program
-#: ../../.././map.php:507
+#: ../../.././map.php:641
msgid "Click on the key map to view an area."
msgstr "اضغط على خريطة الدليل لاظهار منطقة"
# e:\program
-#: ../../.././map.php:518
+#: ../../.././map.php:652
msgid "Zoom in further to display more detailed map information."
msgstr "كبر اكثر من اجل اظهار تفاصيل اكثر للخريطة."
# e:\program
-#: ../../.././map.php:520
+#: ../../.././map.php:654
msgid "Zoom In"
msgstr "تكبير"
# e:\program
-#: ../../.././map.php:528
+#: ../../.././map.php:662
msgid "Zoom out to display a larger area of the map."
msgstr "صغر من اجل اظهار منطقة اكبر من الخريطة."
# e:\program
-#: ../../.././map.php:530
+#: ../../.././map.php:664
msgid "Zoom Out"
msgstr "تصغير"
# e:\program
-#: ../../.././map.php:538
+#: ../../.././map.php:672
msgid "Move the map view without zooming in or out."
msgstr "التحرك في الخريطة بدون تكبير او تصغير."
# e:\program
-#: ../../.././map.php:540
+#: ../../.././map.php:674
msgid "Pan"
msgstr "تحريك"
# e:\program
-#: ../../.././map.php:548
+#: ../../.././map.php:682
msgid "Display information about elements in the map."
msgstr "اظهار المعلومات المتعلقة بالعناصر الموجودة في الخريطة."
# e:\program
-#: ../../.././map.php:550
+#: ../../.././map.php:684
msgid "Identify"
msgstr "اداة التعريف"
# e:\program
-#: ../../.././map.php:559
-#: ../../.././query.php:207
-#: ../../.././include/dataobject/Public_subscriber.php:227
+#: ../../.././map.php:701
+#: ../../.././map.php:710
msgid "[Print]"
msgstr "[طباعة]"
@@ -1408,21 +1284,24 @@
msgstr "تقرير العدادات المعطلة"
#: ../../.././print_ac.php:40
-#: ../../.././print_workorder.php:40
+#: ../../.././print_workorder.php:47
+#: ../../.././print_workorder2.php:49
msgid "Task force workorder"
msgstr "امر عمل مجموعة عمل"
#: ../../.././print_ac.php:56
-#: ../../.././print_workorder.php:64
-#: ../../.././Copy of include/i18n.php:121
-#: ../../.././include/i18n.php:121
+#: ../../.././print_workorder.php:71
+#: ../../.././print_workorder.php:288
+#: ../../.././print_workorder2.php:73
+#: ../../.././print_workorder2.php:291
msgid "German Technical Cooperation-GTZ"
msgstr "الوكالة الالمانية للتعاون الفني- GTZ"
#: ../../.././print_ac.php:57
-#: ../../.././print_workorder.php:65
-#: ../../.././Copy of include/i18n.php:122
-#: ../../.././include/i18n.php:122
+#: ../../.././print_workorder.php:72
+#: ../../.././print_workorder.php:289
+#: ../../.././print_workorder2.php:74
+#: ../../.././print_workorder2.php:292
msgid "Institutional Support to Aleppo Water establishment"
msgstr "مشروع تحديث قطاع المياه السوري-حلب"
@@ -1431,9 +1310,10 @@
msgstr "توثيق العنوان الجغرافي للمشترك الجديد (AC)"
#: ../../.././print_ac.php:62
-#: ../../.././print_workorder.php:72
-#: ../../.././Copy of include/i18n.php:134
-#: ../../.././include/i18n.php:134
+#: ../../.././print_workorder.php:79
+#: ../../.././print_workorder.php:295
+#: ../../.././print_workorder2.php:81
+#: ../../.././print_workorder2.php:298
msgid "Date:"
msgstr "التاريخ:"
@@ -1484,266 +1364,232 @@
msgstr "اسم المشترك الجديد:"
# c:\program
-#: ../../.././print_ac.php:126
+#: ../../.././print_ac.php:146
msgid "File No.:"
msgstr "رقم الملف:"
-#: ../../.././print_workorder.php:69
-#: ../../.././Copy of include/i18n.php:114
-#: ../../.././include/i18n.php:114
+#: ../../.././print_workorder.php:76
+#: ../../.././print_workorder2.php:78
msgid "Task force - "
msgstr "مجموعة عمل - "
-#: ../../.././print_workorder.php:69
-msgid "label"
-msgstr ""
-
-#: ../../.././print_workorder.php:70
+#: ../../.././print_workorder.php:77
+#: ../../.././print_workorder2.php:79
msgid "of"
msgstr "من"
-#: ../../.././print_workorder.php:117
+#: ../../.././print_workorder.php:124
+#: ../../.././print_workorder2.php:126
msgid "Finish date:"
msgstr "تاريخ الانتهاء:"
-#: ../../.././print_workorder.php:118
+#: ../../.././print_workorder.php:125
+#: ../../.././print_workorder2.php:127
msgid "Responsible name:"
msgstr "اسم الموظف المسؤول:"
# D:\dccss\dccss/logbook_report.php:90
-#: ../../.././print_workorder.php:119
+#: ../../.././print_workorder.php:126
+#: ../../.././print_workorder2.php:128
msgid "Signiture:"
msgstr "التوقيع:"
-#: ../../.././print_workorder.php:224
+#: ../../.././print_workorder.php:197
+#: ../../.././print_workorder2.php:199
msgid "Check"
msgstr "فحص"
# c:\program
-#: ../../.././print_workorder.php:225
-#: ../../.././Copy of include/i18n.php:127
-#: ../../.././include/i18n.php:127
+#: ../../.././print_workorder.php:198
+#: ../../.././print_workorder2.php:200
msgid "Billing"
msgstr "الفواتير"
# c:\program
-#: ../../.././print_workorder.php:225
-#: ../../.././Copy of include/i18n.php:128
-#: ../../.././include/i18n.php:128
+#: ../../.././print_workorder.php:198
+#: ../../.././print_workorder2.php:200
msgid "Meter readings unit"
msgstr "شعبة التأشيرات"
# c:\program
-#: ../../.././print_workorder.php:226
-#: ../../.././Copy of include/i18n.php:129
-#: ../../.././include/i18n.php:129
+#: ../../.././print_workorder.php:199
+#: ../../.././print_workorder2.php:201
msgid "Meter Archiving"
msgstr "شعبة حركة العدادات"
# c:\program
-#: ../../.././print_workorder.php:226
-#: ../../.././Copy of include/i18n.php:130
-#: ../../.././include/i18n.php:130
+#: ../../.././print_workorder.php:199
+#: ../../.././print_workorder2.php:201
msgid "Subscription Archiving"
msgstr "شعبة الاشتراكات"
-#: ../../.././print_workorder.php:227
-#: ../../.././Copy of include/i18n.php:131
-#: ../../.././include/i18n.php:131
+#: ../../.././print_workorder.php:200
+#: ../../.././print_workorder2.php:202
msgid "Field check"
msgstr "الكشف الميداني"
-#: ../../.././print_workorder.php:227
-#: ../../.././Copy of include/i18n.php:132
-#: ../../.././include/i18n.php:132
+#: ../../.././print_workorder.php:200
+#: ../../.././print_workorder2.php:202
msgid "Billing data update"
msgstr "تحديث معلومات الفواتير"
-#: ../../.././print_workorder.php:228
-#: ../../.././Copy of include/i18n.php:133
-#: ../../.././include/i18n.php:133
+#: ../../.././print_workorder.php:201
+#: ../../.././print_workorder2.php:203
msgid "CSS data update"
msgstr "تحديث معلومات المسح الميداني"
# c:\program
-#: ../../.././print_workorder.php:230
-#: ../../.././Copy of
-#: include/dataobject/Public_bill.php:32
-#: include/dataobject/Public_subscriber.php:202
-#: ../../.././include/dataobject/Public_bill.php:32
-#: ../../.././include/dataobject/Public_subscriber.php:202
+#: ../../.././print_workorder.php:203
+#: ../../.././print_workorder2.php:205
msgid "Logbook"
msgstr "رقم المجلد"
# c:\program
-#: ../../.././print_workorder.php:235
-#: ../../.././Copy of
-#: include/dataobject/Public_bill.php:36
-#: include/dataobject/Public_subscriber.php:206
-#: ../../.././include/dataobject/Public_bill.php:36
-#: ../../.././include/dataobject/Public_subscriber.php:206
+#: ../../.././print_workorder.php:208
+#: ../../.././print_workorder2.php:210
msgid "Sequence"
msgstr "رقم التخصيص "
# c:\program
-#: ../../.././print_workorder.php:240
-#: ../../.././Copy of
-#: include/dataobject/Public_bill.php:37
-#: include/dataobject/Public_subscriber.php:207
-#: ../../.././include/dataobject/Public_bill.php:37
-#: ../../.././include/dataobject/Public_subscriber.php:207
+#: ../../.././print_workorder.php:213
+#: ../../.././print_workorder2.php:215
msgid "Subsequence"
msgstr "رقم التخصيص الفرعي"
# c:\program
-#: ../../.././print_workorder.php:245
-#: ../../.././Copy of
-#: include/dataobject/Public_bill.php:34
-#: include/dataobject/Public_subscriber.php:204
-#: ../../.././include/dataobject/Public_bill.php:34
-#: ../../.././include/dataobject/Public_subscriber.php:204
-#: ../../.././include/dcmms/include/i18n.php:201
+#: ../../.././print_workorder.php:218
+#: ../../.././print_workorder2.php:220
msgid "Name"
msgstr "اسم المشترك"
# c:\program
-#: ../../.././print_workorder.php:250
-#: ../../.././Copy of include/i18n.php:125
-#: ../../.././include/i18n.php:125
+#: ../../.././print_workorder.php:223
+#: ../../.././print_workorder2.php:225
msgid "Serial number"
msgstr "رقم العداد"
# c:\program
-#: ../../.././print_workorder.php:255
-#: ../../.././Copy of include/i18n.php:126
-#: ../../.././include/i18n.php:126
+#: ../../.././print_workorder.php:228
+#: ../../.././print_workorder2.php:230
msgid "Subscription number"
msgstr "رقم الاشتراك"
-# c:\program
-#: ../../.././query.php:45
-msgid "Bill"
-msgstr "الفواتير"
+# e:\program
+#: ../../.././print_workorder.php:271
+#: ../../.././print_workorder2.php:274
+#, fuzzy
+msgid "Route Map"
+msgstr "اعادة رسم الخريطة"
+#: ../../.././print_workorder.php:293
+#: ../../.././print_workorder2.php:296
+msgid "Route Printing"
+msgstr ""
+
# e:\program
-#: ../../.././query.php:45
+#: ../../.././query.php:44
msgid "Subscriber"
msgstr "المشتركين"
# c:\program
-#: ../../.././query.php:48
+#: ../../.././query.php:47
msgid "Query Using Subscriber Information"
msgstr "الاستعلام باستخدام معلومات المشتركين"
# e:\program
-#: ../../.././query.php:49
+#: ../../.././query.php:48
msgid "Table:"
msgstr "اسم الجدول:"
# c:\program
-#: ../../.././query.php:50
+#: ../../.././query.php:49
msgid "Enter Search Value:"
msgstr "ابحث عن"
# c:\program
-#: ../../.././query.php:52
+#: ../../.././query.php:51
msgid "Query DeliverPoint Number"
msgstr "االاستفسار باستخدام نقطة الوصل"
-#: ../../.././query.php:53
+#: ../../.././query.php:52
msgid "Baracode(PNR)"
msgstr "رقم الباركود"
# c:\program
-#: ../../.././query.php:54
+#: ../../.././query.php:53
msgid "Query Meter Number"
msgstr "الاستفسار باستخدام الرقم الحديدي للعداد"
# c:\program
-#: ../../.././query.php:55
+#: ../../.././query.php:54
msgid "Query Subscriber Number"
msgstr "الاستفسار باستخدام رقم الاشتراك"
# c:\program
-#: ../../.././query.php:56
+#: ../../.././query.php:55
msgid "Query Subscriber name"
msgstr "الاستفسار باستخدام اسم المشترك"
# c:\program
-#: ../../.././query.php:57
+#: ../../.././query.php:56
msgid "Query Meter cabinet"
msgstr "الاستفسار باستخدام رقم الكابينة"
# e:\program
-#: ../../.././query.php:58
+#: ../../.././query.php:57
msgid "Query Landmark"
msgstr "البحث باستخدام معلم"
-#: ../../.././query.php:62
-#: ../../.././include/dcmms/include/i18n.php:351
-#: ../../.././include/dcmms/include/i18n.php:352
+#: ../../.././query.php:61
msgid "Area:"
msgstr "المنطقة:"
-#: ../../.././query.php:63
+#: ../../.././query.php:62
msgid "Narrow down the area in which to search for points of interest."
msgstr ""
# e:\program
-#: ../../.././query.php:67
-#: ../../.././query.php:77
-#: ../../.././query.php:83
-#: ../../.././query.php:90
-#: ../../.././query.php:96
-#: ../../.././Copy of
-#: include/header.php:306
-#: ../../.././include/header.php:306
-#: ../../.././include/dcmms/include/dcmmsreport.php:119
+#: ../../.././query.php:66
+#: ../../.././query.php:76
+#: ../../.././query.php:82
+#: ../../.././query.php:89
+#: ../../.././query.php:95
msgid "[Select One]"
msgstr "[اختر واحدة]"
# e:\program
-#: ../../.././query.php:105
+#: ../../.././query.php:104
msgid "Search The Database"
msgstr "البحث في قاعدة البيانات"
# e:\program
-#: ../../.././query.php:192
+#: ../../.././query.php:201
+#: ../../.././query.php:243
msgid "Landmark Name"
msgstr "اسم المعلم"
# c:\program
-#: ../../.././query.php:193
+#: ../../.././query.php:202
+#: ../../.././query.php:244
msgid "Administrative Area"
msgstr "المنطقة"
# c:\program
-#: ../../.././query.php:194
-#: ../../.././include/dcmms/include/i18n.php:326
+#: ../../.././query.php:203
+#: ../../.././query.php:245
msgid "Village"
msgstr "القرية"
# e:\program
-#: ../../.././query.php:195
-#: ../../.././Copy of include/header.php:445
-#: include/i18n.php:24
-#: include/dataobject/Public_bill.php:38
-#: include/dataobject/Public_subscriber.php:208
-#: ../../.././include/header.php:445
-#: ../../.././include/i18n.php:24
-#: ../../.././include/dataobject/Public_bill.php:38
-#: ../../.././include/dataobject/Public_subscriber.php:208
-#: ../../.././include/dcmms/include/i18n.php:26
-#: ../../.././include/dcmms/include/dataobject/Translation.php:111
+#: ../../.././query.php:204
+#: ../../.././query.php:246
msgid "Action"
msgstr "العملية"
# D:\dccss\dccss/deliverypointpage.php:107
# D:\dccss\dccss/deliverypointpage.php:138
-#: ../../.././query.php:204
-#: ../../.././Copy of
-#: include/dataobject/Public_subscriber.php:224
-#: ../../.././include/dataobject/Public_subscriber.php:224
+#: ../../.././query.php:213
+#: ../../.././query.php:255
msgid "[View on Map]"
msgstr "[اظهار على الخريطة]"
@@ -1774,8 +1620,6 @@
# c:\program
#: ../../.././reports.php:41
-#: ../../.././Copy of include/i18n.php:88
-#: ../../.././include/i18n.php:88
msgid "Damaged Meter Status Report"
msgstr "تقرير العدادات المحطمة"
@@ -1786,8 +1630,6 @@
# c:\program
#: ../../.././reports.php:44
-#: ../../.././Copy of include/i18n.php:89
-#: ../../.././include/i18n.php:89
msgid "Not Working Meter Status Report"
msgstr "تقرير العدادات المعطلة"
@@ -1798,8 +1640,6 @@
# c:\program
#: ../../.././reports.php:47
-#: ../../.././Copy of include/i18n.php:90
-#: ../../.././include/i18n.php:90
msgid "Reversed Meter Status Report"
msgstr "تقرير العدادات المعكوسة"
@@ -1810,8 +1650,6 @@
# c:\program
#: ../../.././reports.php:50
-#: ../../.././Copy of include/i18n.php:91
-#: ../../.././include/i18n.php:91
msgid "Turnedover Meter Status Report"
msgstr "تقرير العدادات المقلوبة"
@@ -1860,9 +1698,6 @@
# c:\program
#: ../../.././reports.php:68
#: ../../.././reports.php:69
-#: ../../.././Copy of
-#: include/i18n.php:120
-#: ../../.././include/i18n.php:120
msgid "DCCSS Task force Report"
msgstr "تقرير DCCSS لمجموعات العمل "
@@ -2040,7 +1875,8 @@
# c:\program
#: ../../.././surveyor_report.php:50
-msgid "Surveyors performance report for the period from"
+#, fuzzy
+msgid "Surveyors performance report for the period from\t\t"
msgstr "تقرير اداء المساحين للفترة من"
# e:\program
@@ -2084,22 +1920,16 @@
msgstr "عدادات محطمة - TF8"
#: ../../.././taskforce_report.php:61
-#: ../../.././Copy of include/i18n.php:116
-#: ../../.././include/i18n.php:116
msgid "Select task force type:"
msgstr "اختر نوع مجموعة العمل:"
#: ../../.././taskforce_report.php:64
#: ../../.././taskforce_report.php:85
-#: ../../.././Copy of include/i18n.php:119
-#: ../../.././include/i18n.php:119
msgid "Create Task force list"
msgstr "انشاء قائمة مجموعة عمل"
#: ../../.././taskforce_report.php:65
#: ../../.././taskforce_report.php:101
-#: ../../.././Copy of include/i18n.php:118
-#: ../../.././include/i18n.php:118
msgid "Print Task force maps"
msgstr "طباعة خرائط مجموعات العمل"
@@ -2134,7 +1964,6 @@
# e:\program
#: ../../.././admin/bill_loader.php:98
#: ../../.././admin/shapefile_loader.php:285
-#: ../../.././include/dcmms/include/i18n.php:171
msgid "Load file"
msgstr "تحميل الملف"
@@ -2257,16 +2086,18 @@
msgid "Please Select the processing type from the list."
msgstr "الرجاء اختيار نوع عملية المعالجة من القائمة"
+# e:\program
+#: ../../.././admin/processing.php:33
+#, fuzzy
+msgid "Select One"
+msgstr "[اختر واحدة]"
+
# c:\program
#: ../../.././admin/processing.php:33
-#: ../../.././Copy of include/i18n.php:139
-#: ../../.././include/i18n.php:139
msgid "Generate route information"
msgstr "توليد معلومات المسار"
#: ../../.././admin/processing.php:34
-#: ../../.././Copy of include/i18n.php:140
-#: ../../.././include/i18n.php:140
msgid "Create line connection between meter cabinet and deliverypoints"
msgstr "انشاء الوصلات بين نقاط التوصيل و غرف العدادات الجماعية التي تحتوي عداداتها"
@@ -2288,15 +2119,15 @@
msgid "Please enter the value to be processed."
msgstr "ادخل قيمة المعالجة"
-#: ../../.././admin/processing.php:44
-msgid "Please enter the processing value or enter 0 to process all data."
-msgstr "الرجاء ادخال القيمة المرغوب بمعالجتها او ادخل صفر لمعالجة جميع البيانات"
+#: ../../.././admin/processing.php:68
+msgid "The logbook should be number, You passed text"
+msgstr ""
-#: ../../.././admin/processing.php:70
+#: ../../.././admin/processing.php:75
msgid "Data processing is done."
msgstr "تمت معالجة البيانات."
-#: ../../.././admin/processing.php:73
+#: ../../.././admin/processing.php:78
msgid "Failed to process the data."
msgstr "لم تتم عملية المعالجة بنجاح"
@@ -2480,78 +2311,64 @@
msgid "Update Translations"
msgstr "تحديث الترجمه"
-#: ../../.././conf/dccssconfig.php:115
+#: ../../.././conf/dccssconfig.php:111
msgid "11"
msgstr ""
-#: ../../.././conf/dccssconfig.php:115
+#: ../../.././conf/dccssconfig.php:111
msgid "12"
msgstr ""
-#: ../../.././conf/dccssconfig.php:116
+#: ../../.././conf/dccssconfig.php:112
msgid "1"
msgstr ""
-#: ../../.././conf/dccssconfig.php:116
+#: ../../.././conf/dccssconfig.php:112
msgid "2"
msgstr ""
-#: ../../.././conf/dccssconfig.php:121
-#: ../../.././Copy of include/i18n.php:111
+#: ../../.././conf/dccssconfig.php:117
#: ../../.././include/i18n.php:111
msgid "Illegal"
msgstr "وصله غير نظامية"
# c:\program
-#: ../../.././conf/dccssconfig.php:122
+#: ../../.././conf/dccssconfig.php:118
msgid "Miss placed - wrong logbook number"
msgstr "مشترك على المسار مع رقم مجلد خطأ"
-#: ../../.././conf/dccssconfig.php:123
+#: ../../.././conf/dccssconfig.php:119
msgid "Miss placed - wrong collection area"
msgstr "مشترك في منطقة جباية خطأ"
-#: ../../.././conf/dccssconfig.php:124
+#: ../../.././conf/dccssconfig.php:120
msgid "Routed and zero consumption"
msgstr "مشترك على المسار مع كمية استهلاك صفر"
-#: ../../.././conf/dccssconfig.php:125
+#: ../../.././conf/dccssconfig.php:121
msgid "Not Routed and zero consumption-Unkown"
msgstr "مشترك ليس على المسار مع كمية استهلاك صفر"
# c:\program
-#: ../../.././conf/dccssconfig.php:126
-#: ../../.././Copy of include/i18n.php:37
+#: ../../.././conf/dccssconfig.php:122
#: ../../.././include/i18n.php:37
msgid "Damaged"
msgstr "محطم"
# e:\program
-#: ../../.././Copy of include/dccsspage.php:199
-#: include/dcmpostgis.php:30
#: ../../.././include/dccsspage.php:199
#: ../../.././include/dcmpostgis.php:30
-#: ../../.././include/dcmms/include/dcmmspage.php:208
msgid "FATAL ERROR: Not logged on!"
msgstr "خطأ: لم يتم الدخول الى النظام"
# e:\program
-#: ../../.././Copy of include/dccsspage.php:202
-#: include/dcmpostgis.php:31
-#: include/dcmpostgis.php:52
#: ../../.././include/dccsspage.php:202
#: ../../.././include/dcmpostgis.php:31
#: ../../.././include/dcmpostgis.php:52
-#: ../../.././include/dcmms/include/dcmmspage.php:211
msgid "Logon"
msgstr "الدخول الى النظام"
# c:\program
-#: ../../.././Copy of include/dccsspage.php:281
-#: include/dccsspage.php:285
-#: include/header.php:164
-#: include/header.php:168
-#: include/i18n.php:72
#: ../../.././include/dccsspage.php:281
#: ../../.././include/dccsspage.php:285
#: ../../.././include/header.php:164
@@ -2561,258 +2378,197 @@
msgstr "برنامج المسح الشامل للمشتركين"
# c:\program
-#: ../../.././Copy of include/dccsspage.php:284
-#: include/header.php:167
#: ../../.././include/dccsspage.php:284
#: ../../.././include/header.php:167
msgid "Click this link to go to the DCCSS main page."
msgstr "انقر من اجل الذهاب الى الصفحة الرئيسية."
# c:\program
-#: ../../.././Copy of include/dccsspage.php:290
-#: include/header.php:173
#: ../../.././include/dccsspage.php:290
#: ../../.././include/header.php:173
-#: ../../.././include/dcmms/include/dcmmspage.php:298
msgid "Search"
msgstr "بحث"
# e:\program
-#: ../../.././Copy of include/dccsspage.php:294
-#: include/header.php:177
#: ../../.././include/dccsspage.php:294
#: ../../.././include/header.php:177
msgid "Go to Delivery Point data entry form by ID"
msgstr "البحث عن نقطة المدخل باستخدام رقم التعريف"
# c:\program
-#: ../../.././Copy of include/dccsspage.php:322
-#: include/header.php:205
#: ../../.././include/dccsspage.php:322
#: ../../.././include/header.php:205
-#: ../../.././include/dcmms/include/dcmmspage.php:339
-#: ../../.././include/dcmms/include/i18n.php:159
msgid "Language: "
msgstr "اللغة:"
# c:\program
-#: ../../.././Copy of include/dccsspage.php:325
-#: include/header.php:208
#: ../../.././include/dccsspage.php:325
#: ../../.././include/header.php:208
msgid "Select the language in which the DCCSS pages are displayed."
msgstr "اختر لغة واجهة التطبيق."
# c:\program
-#: ../../.././Copy of include/dccsspage.php:326
-#: include/header.php:209
#: ../../.././include/dccsspage.php:326
#: ../../.././include/header.php:209
-#: ../../.././include/dcmms/include/dcmmspage.php:346
msgid "Next, click the "Select" button."
msgstr ""
# e:\program
-#: ../../.././Copy of include/dccsspage.php:349
-#: include/header.php:232
#: ../../.././include/dccsspage.php:349
#: ../../.././include/header.php:232
-#: ../../.././include/dcmms/include/dcmmspage.php:366
msgid "Click this button after selecting a language."
msgstr "اضغط على هذا الزر بعد اختيار اللغة."
# c:\program
-#: ../../.././Copy of include/dccsspage.php:352
-#: include/header.php:235
#: ../../.././include/dccsspage.php:352
#: ../../.././include/header.php:235
-#: ../../.././include/dcmms/include/dcmmspage.php:367
msgid "Select"
msgstr "اختيار"
# e:\program
-#: ../../.././Copy of include/dccsspage.php:354
-#: include/dccsspage.php:360
-#: include/header.php:237
-#: include/header.php:243
#: ../../.././include/dccsspage.php:354
#: ../../.././include/dccsspage.php:360
#: ../../.././include/header.php:237
#: ../../.././include/header.php:243
-#: ../../.././include/dcmms/include/dcmmspage.php:370
-#: ../../.././include/dcmms/include/dcmmspage.php:376
-#: ../../.././include/dcmms/include/i18n.php:145
msgid "Help"
msgstr "المساعدة"
# e:\program
-#: ../../.././Copy of include/dccsspage.php:359
-#: include/header.php:242
#: ../../.././include/dccsspage.php:359
#: ../../.././include/header.php:242
msgid "Click this link to view related information in the DCCSS user manual."
msgstr "اضغط على الراطة من اجل اظهار معلومات المساعدة في دليل المستخدم."
# c:\program
-#: ../../.././Copy of include/dccsspage.php:362
-#: include/dccsspage.php:366
-#: include/header.php:245
-#: include/header.php:249
#: ../../.././include/dccsspage.php:362
#: ../../.././include/dccsspage.php:366
#: ../../.././include/header.php:245
#: ../../.././include/header.php:249
-#: ../../.././include/dcmms/include/dcmmspage.php:379
-#: ../../.././include/dcmms/include/dcmmspage.php:383
-#: ../../.././include/dcmms/include/i18n.php:176
msgid "Logoff"
msgstr "خروج"
# c:\program
-#: ../../.././Copy of include/dccsspage.php:365
-#: include/header.php:248
#: ../../.././include/dccsspage.php:365
#: ../../.././include/header.php:248
msgid "Click this link to exit the DCCSS application."
msgstr "اضغط على الرابطة من اجل الخروج من البرنامج."
# e:\program
-#: ../../.././Copy of include/dccsspage.php:398
#: ../../.././include/dccsspage.php:398
msgid "Copyright (c) 2005,2006 DORSCH Consult. "
msgstr "حقوق الطبع محفوظة DORSCH Consult. 2005,2006"
# e:\program
-#: ../../.././Copy of include/dccsspage.php:399
#: ../../.././include/dccsspage.php:399
msgid "Last modified "
msgstr "اخر تعديل"
# e:\program
-#: ../../.././Copy of include/dccsspage.php:478
#: ../../.././include/dccsspage.php:478
msgid "This page is for DCCSS administrators only."
msgstr "هذه الصفحة من اجل الاداري فقط."
# c:\program
-#: ../../.././Copy of include/dccsspage.php:522
#: ../../.././include/dccsspage.php:522
-#: ../../.././include/dcmms/include/i18n.php:225
msgid "Pending"
msgstr ""
# c:\program
-#: ../../.././Copy of include/dccsspage.php:524
#: ../../.././include/dccsspage.php:524
-#: ../../.././include/dcmms/include/i18n.php:65
msgid "Completed"
msgstr ""
# c:\program
-#: ../../.././Copy of include/dccsspage.php:526
#: ../../.././include/dccsspage.php:526
#, php-format
msgid "Workorder #%s"
msgstr ""
# e:\program
-#: ../../.././Copy of include/dcmmap.php:607
-#: ../../.././include/dcmmap.php:607
-#: ../../.././include/dcmms/include/dcmmap.php:577
+#: ../../.././include/dcmmap.php:623
msgid "Nothing was found at this location."
msgstr "لم يتم ايجاد شيء في هذا الموقع"
# e:\program
-#: ../../.././Copy of include/dcmmaputil.php:243
#: ../../.././include/dcmmaputil.php:243
-#: ../../.././include/dcmms/include/dcmmaputil.php:244
+#: ../../.././include/dcmmaputil.php:472
msgid "Accept Move"
msgstr "قبول التحريك"
# e:\program
-#: ../../.././Copy of include/dcmmaputil.php:252
#: ../../.././include/dcmmaputil.php:252
-#: ../../.././include/dcmms/include/dcmmaputil.php:253
+#: ../../.././include/dcmmaputil.php:481
msgid "Cancel Move"
msgstr "الغاء التحريك"
# e:\program
-#: ../../.././Copy of include/dcmmaputil.php:259
#: ../../.././include/dcmmaputil.php:259
-#: ../../.././include/dcmms/include/dcmmaputil.php:256
msgid "[Edit"
msgstr "[تعديل]"
# e:\program
-#: ../../.././Copy of include/dcmmaputil.php:268
#: ../../.././include/dcmmaputil.php:268
-#: ../../.././include/dcmms/include/dcmmaputil.php:264
+#: ../../.././include/dcmmaputil.php:497
msgid "Move"
msgstr "تحريك"
# c:\program
-#: ../../.././Copy of include/dcmmaputil.php:277
#: ../../.././include/dcmmaputil.php:277
-#: ../../.././include/dcmms/include/dataobject/Landmark.php:113
+#: ../../.././include/dcmmaputil.php:506
msgid "Delete"
msgstr "حذف"
# e:\program
-#: ../../.././Copy of include/dcmmaputil.php:281
#: ../../.././include/dcmmaputil.php:281
-#: ../../.././include/dcmms/include/dcmmaputil.php:268
+#: ../../.././include/dcmmaputil.php:510
msgid "[View]"
msgstr "[معاينة]"
# c:\program
-#: ../../.././Copy of include/dcmmspear.php:104
+#: ../../.././include/dcmmaputil.php:420
+#: ../../.././include/i18n.php:68
+#: ../../.././include/dataobject/Public_deliverypoint.php:148
+msgid "Meter Cabinet"
+msgstr "كابينة المؤسسة"
+
+# c:\program
+#: ../../.././include/dcmmaputil.php:457
+#: ../../.././include/dcmmaputil.php:458
+msgid "Meter cabinet"
+msgstr "كابينة المؤسسة"
+
+# c:\program
#: ../../.././include/dcmmspear.php:104
msgid "Next >>"
msgstr ""
# c:\program
-#: ../../.././Copy of include/dcmmspear.php:105
#: ../../.././include/dcmmspear.php:105
msgid "<< Back"
msgstr ""
# e:\program
-#: ../../.././Copy of include/dcmmspear.php:118
-#: ../../.././include/dcmmspear.php:118
-#: ../../.././include/dcmms/include/i18n.php:122
-#: ../../.././include/dcmms/include/i18n.php:202
-msgid "name"
-msgstr "اسم المشترك"
-
-# e:\program
-#: ../../.././Copy of include/dcmmspear.php:134
#: ../../.././include/dcmmspear.php:134
#, php-format
msgid "Displaying [%s - %s] of %s"
msgstr ""
# e:\program
-#: ../../.././Copy of include/header.php:269
#: ../../.././include/header.php:269
msgid "Copyright (c) 2005,2006 DORSCH Consult"
msgstr "حقوق الطبع محفوظة DORSCH Consult. 2005,2006"
# c:\program
-#: ../../.././Copy of include/header.php:293
#: ../../.././include/header.php:293
msgid "Please choose the"
msgstr "الرجاء الاختيار"
# e:\program
-#: ../../.././Copy of include/header.php:294
#: ../../.././include/header.php:294
msgid "from the list"
msgstr "من القائمة"
# c:\program
-#: ../../.././Copy of include/header.php:350
-#: include/header.php:363
-#: include/header.php:400
#: ../../.././include/header.php:350
#: ../../.././include/header.php:363
#: ../../.././include/header.php:400
@@ -2820,9 +2576,6 @@
msgstr "الرجاء ادخال"
# e:\program
-#: ../../.././Copy of include/header.php:351
-#: include/header.php:364
-#: include/header.php:401
#: ../../.././include/header.php:351
#: ../../.././include/header.php:364
#: ../../.././include/header.php:401
@@ -2830,880 +2583,717 @@
msgstr "الى مربع النص"
# e:\program
-#: ../../.././Copy of include/header.php:472
#: ../../.././include/header.php:472
msgid "Please click the link to go to the "
msgstr "الرجاء الضغط على الرابطة من اجل الذهاب الى"
# e:\program
-#: ../../.././Copy of include/header.php:474
#: ../../.././include/header.php:474
msgid "Please click the link to View related information "
msgstr "الرجاء الضغط على الرابطة من اجل اظهار المعلومات المتعلقة"
# c:\program
-#: ../../.././Copy of include/i18n.php:26
-#: include/dataobject/Public_deliverypoint.php:151
-#: include/dataobject/Public_deliverypoint.php:152
-#: include/dataobject/Public_deliverypoint.php:154
#: ../../.././include/i18n.php:26
#: ../../.././include/dataobject/Public_deliverypoint.php:151
#: ../../.././include/dataobject/Public_deliverypoint.php:152
#: ../../.././include/dataobject/Public_deliverypoint.php:154
-#: ../../.././include/dcmms/include/i18n.php:312
msgid "Unknown"
msgstr "غير معروف"
# c:\program
-#: ../../.././Copy of include/i18n.php:28
#: ../../.././include/i18n.php:28
msgid "Chinese"
msgstr "صيني"
# c:\program
-#: ../../.././Copy of include/i18n.php:29
#: ../../.././include/i18n.php:29
msgid "Defence Factories"
msgstr "معامل الدفاع"
# c:\program
-#: ../../.././Copy of include/i18n.php:30
#: ../../.././include/i18n.php:30
msgid "French"
msgstr "فرنسي"
# c:\program
-#: ../../.././Copy of include/i18n.php:31
#: ../../.././include/i18n.php:31
#, fuzzy
msgid "Major Leakage"
msgstr "يوجد تسرب:"
# c:\program
-#: ../../.././Copy of include/i18n.php:32
#: ../../.././include/i18n.php:32
#, fuzzy
msgid "Minor Leakage"
msgstr "يوجد تسرب:"
-#: ../../.././Copy of include/i18n.php:33
#: ../../.././include/i18n.php:33
msgid "No Leak"
msgstr ""
# c:\program
-#: ../../.././Copy of include/i18n.php:34
#: ../../.././include/i18n.php:34
msgid "Barrel"
msgstr "برميل"
# c:\program
-#: ../../.././Copy of include/i18n.php:35
#: ../../.././include/i18n.php:35
msgid "Cubic Meter"
msgstr "مترمكعب"
# c:\program
-#: ../../.././Copy of include/i18n.php:36
#: ../../.././include/i18n.php:36
msgid "Liter"
msgstr "ليتر"
# c:\program
-#: ../../.././Copy of include/i18n.php:38
#: ../../.././include/i18n.php:38
msgid "Disconnected"
msgstr "مفصول"
# c:\program
-#: ../../.././Copy of include/i18n.php:39
#: ../../.././include/i18n.php:39
msgid "Reversed"
msgstr "معكوس"
# c:\program
-#: ../../.././Copy of include/i18n.php:40
#: ../../.././include/i18n.php:40
msgid "Turned Over"
msgstr "مائل"
# c:\program
-#: ../../.././Copy of include/i18n.php:41
#: ../../.././include/i18n.php:41
msgid "Working"
msgstr "عامل"
# c:\program
-#: ../../.././Copy of include/i18n.php:44
#: ../../.././include/i18n.php:44
msgid "Governmental"
msgstr "دوائر رسمية"
# e:\program
-#: ../../.././Copy of include/i18n.php:46
#: ../../.././include/i18n.php:46
-#: ../../.././include/dcmms/include/i18n.php:148
msgid "Hotel"
msgstr "فندق"
# c:\program
-#: ../../.././Copy of include/i18n.php:47
#: ../../.././include/i18n.php:47
msgid "Public Park"
msgstr "حديقة عامة"
# c:\program
-#: ../../.././Copy of include/i18n.php:48
#: ../../.././include/i18n.php:48
msgid "Religious Site"
msgstr "دور عبادة"
# c:\program
-#: ../../.././Copy of include/i18n.php:49
#: ../../.././include/i18n.php:49
msgid "Restaurant"
msgstr "مطعم"
# c:\program
-#: ../../.././Copy of include/i18n.php:50
#: ../../.././include/i18n.php:50
msgid "Sport Center"
msgstr "مركز ريا...
[truncated message content] |