[xoops-svn] SF.net SVN: xoops-svn:[11479] XoopsModules/APCal/trunk

[<ant...@us...>]

Revision: 11479
          http://sourceforge.net/p/xoops/svn/11479
Author:   antiquel
Date:     2013-04-29 17:55:58 +0000 (Mon, 29 Apr 2013)
Log Message:
-----------
[ADD] APCal module's name appended to every language constant.
[FIX] Bug with timezones causes events dates to be wierd in many ways. (Test version)

Modified Paths:
--------------
    XoopsModules/APCal/trunk/LANG DIFF.txt
    XoopsModules/APCal/trunk/LANG TRANS.txt
    XoopsModules/APCal/trunk/modules/APCal/admin/admission.php
    XoopsModules/APCal/trunk/modules/APCal/admin/cat2groupperm.php
    XoopsModules/APCal/trunk/modules/APCal/admin/categories.php
    XoopsModules/APCal/trunk/modules/APCal/admin/displayMenu.php
    XoopsModules/APCal/trunk/modules/APCal/admin/events.php
    XoopsModules/APCal/trunk/modules/APCal/admin/groupperm.php
    XoopsModules/APCal/trunk/modules/APCal/admin/icalendar_import.php
    XoopsModules/APCal/trunk/modules/APCal/admin/index.php
    XoopsModules/APCal/trunk/modules/APCal/admin/maintenance.php
    XoopsModules/APCal/trunk/modules/APCal/admin/myblockform.php
    XoopsModules/APCal/trunk/modules/APCal/admin/myblocksadmin.php
    XoopsModules/APCal/trunk/modules/APCal/admin/myblocksadmin2.php
    XoopsModules/APCal/trunk/modules/APCal/admin/mygroupperm.php
    XoopsModules/APCal/trunk/modules/APCal/admin/mytplsadmin.php
    XoopsModules/APCal/trunk/modules/APCal/admin/mytplsform.php
    XoopsModules/APCal/trunk/modules/APCal/admin/pluginsmanager.php
    XoopsModules/APCal/trunk/modules/APCal/blocks/apcal_monthly_calendar.php
    XoopsModules/APCal/trunk/modules/APCal/class/APCal.php
    XoopsModules/APCal/trunk/modules/APCal/class/APCal_xoops.php
    XoopsModules/APCal/trunk/modules/APCal/include/blocksadmin.inc.php
    XoopsModules/APCal/trunk/modules/APCal/include/preferences.inc.php
    XoopsModules/APCal/trunk/modules/APCal/language/english/admin.php
    XoopsModules/APCal/trunk/modules/APCal/language/english/apcal_constants.php
    XoopsModules/APCal/trunk/modules/APCal/language/english/blocks.php
    XoopsModules/APCal/trunk/modules/APCal/language/english/main.php
    XoopsModules/APCal/trunk/modules/APCal/language/english/modinfo.php
    XoopsModules/APCal/trunk/modules/APCal/language/french/admin.php
    XoopsModules/APCal/trunk/modules/APCal/language/french/apcal_constants.php
    XoopsModules/APCal/trunk/modules/APCal/language/french/blocks.php
    XoopsModules/APCal/trunk/modules/APCal/language/french/main.php
    XoopsModules/APCal/trunk/modules/APCal/language/french/modinfo.php
    XoopsModules/APCal/trunk/modules/APCal/language/german/admin.php
    XoopsModules/APCal/trunk/modules/APCal/language/german/apcal_constants.php
    XoopsModules/APCal/trunk/modules/APCal/language/german/blocks.php
    XoopsModules/APCal/trunk/modules/APCal/language/german/main.php
    XoopsModules/APCal/trunk/modules/APCal/language/german/modinfo.php
    XoopsModules/APCal/trunk/modules/APCal/language/german/pical_constants.php
    XoopsModules/APCal/trunk/modules/APCal/language/italian/admin.php
    XoopsModules/APCal/trunk/modules/APCal/language/italian/apcal_constants.php
    XoopsModules/APCal/trunk/modules/APCal/language/italian/blocks.php
    XoopsModules/APCal/trunk/modules/APCal/language/italian/main.php
    XoopsModules/APCal/trunk/modules/APCal/language/italian/modinfo.php
    XoopsModules/APCal/trunk/modules/APCal/language/japanese/admin.php
    XoopsModules/APCal/trunk/modules/APCal/language/japanese/apcal_constants.php
    XoopsModules/APCal/trunk/modules/APCal/language/japanese/blocks.php
    XoopsModules/APCal/trunk/modules/APCal/language/japanese/main.php
    XoopsModules/APCal/trunk/modules/APCal/language/japanese/modinfo.php
    XoopsModules/APCal/trunk/modules/APCal/language/nederlands/admin.php
    XoopsModules/APCal/trunk/modules/APCal/language/nederlands/apcal_constants.php
    XoopsModules/APCal/trunk/modules/APCal/language/nederlands/blocks.php
    XoopsModules/APCal/trunk/modules/APCal/language/nederlands/main.php
    XoopsModules/APCal/trunk/modules/APCal/language/nederlands/modinfo.php
    XoopsModules/APCal/trunk/modules/APCal/language/polish/admin.php
    XoopsModules/APCal/trunk/modules/APCal/language/polish/apcal_constants.php
    XoopsModules/APCal/trunk/modules/APCal/language/polish/blocks.php
    XoopsModules/APCal/trunk/modules/APCal/language/polish/main.php
    XoopsModules/APCal/trunk/modules/APCal/language/polish/modinfo.php
    XoopsModules/APCal/trunk/modules/APCal/language/portuguese/admin.php
    XoopsModules/APCal/trunk/modules/APCal/language/portuguese/apcal_constants.php
    XoopsModules/APCal/trunk/modules/APCal/language/portuguese/blocks.php
    XoopsModules/APCal/trunk/modules/APCal/language/portuguese/main.php
    XoopsModules/APCal/trunk/modules/APCal/language/portuguese/modinfo.php
    XoopsModules/APCal/trunk/modules/APCal/language/portuguesebr/admin.php
    XoopsModules/APCal/trunk/modules/APCal/language/portuguesebr/apcal_constants.php
    XoopsModules/APCal/trunk/modules/APCal/language/portuguesebr/blocks.php
    XoopsModules/APCal/trunk/modules/APCal/language/portuguesebr/main.php
    XoopsModules/APCal/trunk/modules/APCal/language/portuguesebr/modinfo.php
    XoopsModules/APCal/trunk/modules/APCal/language/russian/admin.php
    XoopsModules/APCal/trunk/modules/APCal/language/russian/apcal_constants.php
    XoopsModules/APCal/trunk/modules/APCal/language/russian/blocks.php
    XoopsModules/APCal/trunk/modules/APCal/language/russian/main.php
    XoopsModules/APCal/trunk/modules/APCal/language/russian/modinfo.php
    XoopsModules/APCal/trunk/modules/APCal/language/spanish/admin.php
    XoopsModules/APCal/trunk/modules/APCal/language/spanish/apcal_constants.php
    XoopsModules/APCal/trunk/modules/APCal/language/spanish/blocks.php
    XoopsModules/APCal/trunk/modules/APCal/language/spanish/main.php
    XoopsModules/APCal/trunk/modules/APCal/language/spanish/modinfo.php
    XoopsModules/APCal/trunk/modules/APCal/language/spanishutf8/admin.php
    XoopsModules/APCal/trunk/modules/APCal/language/spanishutf8/apcal_constants.php
    XoopsModules/APCal/trunk/modules/APCal/language/spanishutf8/blocks.php
    XoopsModules/APCal/trunk/modules/APCal/language/spanishutf8/main.php
    XoopsModules/APCal/trunk/modules/APCal/language/spanishutf8/modinfo.php
    XoopsModules/APCal/trunk/modules/APCal/language/swedish/admin.php
    XoopsModules/APCal/trunk/modules/APCal/language/swedish/apcal_constants.php
    XoopsModules/APCal/trunk/modules/APCal/language/swedish/blocks.php
    XoopsModules/APCal/trunk/modules/APCal/language/swedish/main.php
    XoopsModules/APCal/trunk/modules/APCal/language/swedish/modinfo.php
    XoopsModules/APCal/trunk/modules/APCal/language/tchinese/admin.php
    XoopsModules/APCal/trunk/modules/APCal/language/tchinese/apcal_constants.php
    XoopsModules/APCal/trunk/modules/APCal/language/tchinese/blocks.php
    XoopsModules/APCal/trunk/modules/APCal/language/tchinese/main.php
    XoopsModules/APCal/trunk/modules/APCal/language/tchinese/modinfo.php
    XoopsModules/APCal/trunk/modules/APCal/language/utf8_tw/admin.php
    XoopsModules/APCal/trunk/modules/APCal/language/utf8_tw/apcal_constants.php
    XoopsModules/APCal/trunk/modules/APCal/language/utf8_tw/blocks.php
    XoopsModules/APCal/trunk/modules/APCal/language/utf8_tw/main.php
    XoopsModules/APCal/trunk/modules/APCal/language/utf8_tw/modinfo.php
    XoopsModules/APCal/trunk/modules/APCal/shareCalendar.php
    XoopsModules/APCal/trunk/modules/APCal/templates/admin/apcal_index.html
    XoopsModules/APCal/trunk/modules/APCal/templates/apcal_monthly.html
    XoopsModules/APCal/trunk/modules/APCal/templates/blocks/apcal_coming_schedule.html
    XoopsModules/APCal/trunk/modules/APCal/templates/blocks/apcal_new_event.html
    XoopsModules/APCal/trunk/modules/APCal/templates/blocks/apcal_todays_schedule.html

Modified: XoopsModules/APCal/trunk/LANG DIFF.txt
===================================================================
--- XoopsModules/APCal/trunk/LANG DIFF.txt	2013-04-29 06:59:52 UTC (rev 11478)
+++ XoopsModules/APCal/trunk/LANG DIFF.txt	2013-04-29 17:55:58 UTC (rev 11479)
@@ -160,10 +160,10 @@
     - added _APCAL_MESSAGE
     - added _APCAL_TELLAFRIENDTEXT
 - admin.php
-    - added _AM_PREFS
-    - added _AM_UPDATE
-    - added _AM_BLOCKS
-    - added _AM_GOTOMODULE
+    - added _AM_APCAL_PREFS
+    - added _AM_APCAL_UPDATE
+    - added _AM_APCAL_BLOCKS
+    - added _AM_APCAL_GOTOMODULE
     - added _AM_APCAL_CANBEMAIN
     - added _AM_APCAL_COLOR
 
@@ -183,7 +183,7 @@
     - added _APCAL_SHARECALENDARFORM
     - added _APCAL_SHOWALLCAT
     - added _APCAL_GENERATE
-    - added _AP_GENERATEHINT
+    - added _APCAL_GENERATEHINT
     - added _APCAL_CATEGORIES
     - added _APCAL_NBEVENTS
     - added _APCAL_WIDTH
@@ -227,18 +227,18 @@
     - added _MI_APCAL_DISPLAYCATTITLE
 - admin.php
     - added _AM_APCAL_TIMEZONE
-    - added _AM_MODULEADMIN_CONFIG
+    - added _AM_APCAL_MODULEADMIN_CONFIG
     - added _AM_APCAL_NBWAITINGEVENTS
     - added _AM_APCAL_NBEVENTS
     - added _AM_APCAL_NBCATS
-    - added _AM_MODULEADMIN_CONFIG_PHP
-    - added _AM_MODULEADMIN_CONFIG_XOOPS
-    - added _AM_TITLE
-    - added _AM_SIDE
-    - added _AM_WEIGHT
-    - added _AM_VISIBLEIN
-    - added _AM_BCACHETIME
-    - added _AM_ACTION
-    - added _AM_ACTIVERIGHTS
-    - added _AM_ACCESSRIGHTS
-    - added _AM_BADMIN
\ No newline at end of file
+    - added _AM_APCAL_MODULEADMIN_CONFIG_PHP
+    - added _AM_APCAL_MODULEADMIN_CONFIG_XOOPS
+    - added _AM_APCAL_TITLE
+    - added _AM_APCAL_SIDE
+    - added _AM_APCAL_WEIGHT
+    - added _AM_APCAL_VISIBLEIN
+    - added _AM_APCAL_BCACHETIME
+    - added _AM_APCAL_ACTION
+    - added _AM_APCAL_ACTIVERIGHTS
+    - added _AM_APCAL_ACCESSRIGHTS
+    - added _AM_APCAL_BADMIN
\ No newline at end of file

Modified: XoopsModules/APCal/trunk/LANG TRANS.txt
===================================================================
--- XoopsModules/APCal/trunk/LANG TRANS.txt	2013-04-29 06:59:52 UTC (rev 11478)
+++ XoopsModules/APCal/trunk/LANG TRANS.txt	2013-04-29 17:55:58 UTC (rev 11479)
@@ -101,7 +101,7 @@
 define('_APCAL_SHARECALENDARFORM', 'Fill up that form to show the calendar on your website.');
 define('_APCAL_SHOWALLCAT', 'All categories');
 define('_APCAL_GENERATE', 'Generate');
-define('_AP_GENERATEHINT', 'You might have to click generate two times on certain browsers.');
+define('_APCAL_GENERATEHINT', 'You might have to click generate two times on certain browsers.');
 define('_APCAL_CATEGORIES', 'categories');
 define('_APCAL_NBEVENTS', 'Number of events displayed');
 define('_APCAL_WIDTH', 'Block width');
@@ -150,16 +150,16 @@
 admin.php (line 8)
 // Index
 define('_AM_APCAL_TIMEZONE', 'Timezones');
-define('_AM_MODULEADMIN_CONFIG', 'Configurations');
+define('_AM_APCAL_MODULEADMIN_CONFIG', 'Configurations');
 define('_AM_APCAL_NBWAITINGEVENTS', 'There are %s events waiting for approval.');
 define('_AM_APCAL_NBEVENTS', 'There are %s upcomming events.');
 define('_AM_APCAL_NBCATS', 'There are %s categories.');
-define('_AM_MODULEADMIN_CONFIG_PHP', 'You must have at least php version %s (your current version is %s)');
-define('_AM_MODULEADMIN_CONFIG_XOOPS', 'You must have at least xoops version %s (your current version is %s)');
-define('_AM_PREFS', 'Preferences');
-define('_AM_UPDATE', 'Update');
-define('_AM_BLOCKS', 'Blocks');
-define('_AM_GOTOMODULE', 'Go to module');
+define('_AM_APCAL_MODULEADMIN_CONFIG_PHP', 'You must have at least php version %s (your current version is %s)');
+define('_AM_APCAL_MODULEADMIN_CONFIG_XOOPS', 'You must have at least xoops version %s (your current version is %s)');
+define('_AM_APCAL_PREFS', 'Preferences');
+define('_AM_APCAL_UPDATE', 'Update');
+define('_AM_APCAL_BLOCKS', 'Blocks');
+define('_AM_APCAL_GOTOMODULE', 'Go to module');
 
 admin.php (line 125)
 define('_AM_APCAL_CANBEMAIN', 'Can be a main category');
@@ -167,15 +167,15 @@
 
 admin.php (line 145)
 // Blocks & Groups Admin
-define('_AM_TITLE', 'Title');
-define('_AM_SIDE', 'Location');
-define('_AM_WEIGHT', 'Weight');
-define('_AM_VISIBLEIN', 'Visible in');
-define('_AM_BCACHETIME', 'Cache time');
-define('_AM_ACTION', 'Action');
-define('_AM_ACTIVERIGHTS', 'Module administration rights');
-define('_AM_ACCESSRIGHTS', 'Module access rights');
-define('_AM_BADMIN', 'Blocks administration');
+define('_AM_APCAL_TITLE', 'Title');
+define('_AM_APCAL_SIDE', 'Location');
+define('_AM_APCAL_WEIGHT', 'Weight');
+define('_AM_APCAL_VISIBLEIN', 'Visible in');
+define('_AM_APCAL_BCACHETIME', 'Cache time');
+define('_AM_APCAL_ACTION', 'Action');
+define('_AM_APCAL_ACTIVERIGHTS', 'Module administration rights');
+define('_AM_APCAL_ACCESSRIGHTS', 'Module access rights');
+define('_AM_APCAL_BADMIN', 'Blocks administration');
 
 
 apcal_constants.php (line 178)

Modified: XoopsModules/APCal/trunk/modules/APCal/admin/admission.php
===================================================================
--- XoopsModules/APCal/trunk/modules/APCal/admin/admission.php	2013-04-29 06:59:52 UTC (rev 11478)
+++ XoopsModules/APCal/trunk/modules/APCal/admin/admission.php	2013-04-29 17:55:58 UTC (rev 11479)
@@ -82,9 +82,9 @@
 $serverTZ = $cal->server_TZ ;
 $userTZ = $xoopsUser->timezone() ;
 $tzoptions = "
-	<option value='s'>"._AM_TZOPT_SERVER."</option>
-	<option value='g'>"._AM_TZOPT_GMT."</option>
-	<option value='y'>"._AM_TZOPT_USER."</option>\n" ;
+	<option value='s'>"._AM_APCAL_TZOPT_SERVER."</option>
+	<option value='g'>"._AM_APCAL_TZOPT_GMT."</option>
+	<option value='y'>"._AM_APCAL_TZOPT_USER."</option>\n" ;
 switch( $tz ) {
 	case 's' :
 		$tzoffset = 0 ;
@@ -118,7 +118,7 @@
 	}
 	$sql = "UPDATE $cal->table SET admission=1 WHERE $whr 0" ;
 	if( ! mysql_query( $sql , $conn ) ) echo mysql_error() ;
-	else $mes = urlencode( _AM_MES_ADMITTED ) ;
+	else $mes = urlencode( _AM_APCAL_MES_ADMITTED ) ;
 	foreach( $_POST[ 'ids' ] as $id ) {
 		$cal->notify_new_event( $id ) ;
 	}
@@ -142,7 +142,7 @@
 		$records = mysql_affected_rows( $conn ) ;
 		$sql = "DELETE FROM $cal->table WHERE $whr 0 " ;
 		if( ! mysql_query( $sql , $conn ) ) echo mysql_error() ;
-		else $mes = urlencode( "$records "._AM_MES_DELETED ) ;
+		else $mes = urlencode( "$records "._AM_APCAL_MES_DELETED ) ;
 	} else {
 		$mes = "" ;
 	}
@@ -186,7 +186,7 @@
 xoops_cp_header();
 require_once XOOPS_ROOT_PATH.'/modules/APCal/admin/displayMenu.php';
 
-echo "<h4>"._AM_ADMISSION."</h4>
+echo "<h4>"._AM_APCAL_ADMISSION."</h4>
 <p><font color='blue'>".(isset($_GET['mes'])?htmlspecialchars($_GET['mes'],ENT_QUOTES):"")."</font></p>
 <form action='' method='get' style='margin-bottom:0px;text-align:left'>
   <select name='tz' onChange='submit();'>$tzoptions</select>
@@ -203,7 +203,7 @@
       <form action='' method='get' style='margin-bottom:0px;text-align:right'>
         $cat_selbox4extract
         <input type='text' name='txt' value='".htmlspecialchars($txt,ENT_QUOTES)."' />
-        <input type='submit' value='"._AM_BUTTON_EXTRACT."' /> &nbsp; 
+        <input type='submit' value='"._AM_APCAL_BUTTON_EXTRACT."' /> &nbsp; 
         $nav_html &nbsp; 
         <input type='hidden' name='num' value='$num' />
         <input type='hidden' name='tz' value='$tz' />
@@ -214,11 +214,11 @@
 <form name='MainForm' action='?tz=$tz&amp;num=$num&amp;cid=$cid' method='post' style='margin-top:0px;'>
 <table width='100%' class='outer' cellpadding='4' cellspacing='1'>
   <tr valign='middle'>
-    <th>"._AM_ADMIT_TH0."</th>
-    <th>"._AM_ADMIT_TH1."<br />($tzdisp)</th>
-    <th>"._AM_ADMIT_TH2."<br />($tzdisp)</th>
-    <th>"._AM_ADMIT_TH3."</th>
-    <th>"._AM_ADMIT_TH4."</th>
+    <th>"._AM_APCAL_ADMIT_TH0."</th>
+    <th>"._AM_APCAL_ADMIT_TH1."<br />($tzdisp)</th>
+    <th>"._AM_APCAL_ADMIT_TH2."<br />($tzdisp)</th>
+    <th>"._AM_APCAL_ADMIT_TH3."</th>
+    <th>"._AM_APCAL_ADMIT_TH4."</th>
     <th></th>
     <th><input type='checkbox' name='dummy' onclick=\"with(document.MainForm){for(i=0;i<length;i++){if(elements[i].type=='checkbox'){elements[i].checked=this.checked;}}}\" /></th>
   </tr>
@@ -230,11 +230,11 @@
 while( $event = mysql_fetch_object( $rs ) ) {
 	$oddeven = ( $oddeven == 'odd' ? 'even' : 'odd' ) ;
 	if( $event->allday ) {
-		$start_desc = date( _AM_DTFMT_LIST_ALLDAY , $event->start ) . '<br />(' . _APCAL_MB_ALLDAY_EVENT . ')' ;
-		$end_desc = date( _AM_DTFMT_LIST_ALLDAY , $event->end - 300 ) . '<br />(' . _APCAL_MB_ALLDAY_EVENT . ')' ;
+		$start_desc = date( _AM_APCAL_DTFMT_LIST_ALLDAY , $event->start ) . '<br />(' . _APCAL_MB_APCALALLDAY_EVENT . ')' ;
+		$end_desc = date( _AM_APCAL_DTFMT_LIST_ALLDAY , $event->end - 300 ) . '<br />(' . _APCAL_MB_APCALALLDAY_EVENT . ')' ;
 	} else {
-		$start_desc = date( _AM_DTFMT_LIST_NORMAL , $event->start + $tzoffset ) ;
-		$end_desc = date( _AM_DTFMT_LIST_NORMAL , $event->end + $tzoffset ) ;
+		$start_desc = date( _AM_APCAL_DTFMT_LIST_NORMAL , $event->start + $tzoffset ) ;
+		$end_desc = date( _AM_APCAL_DTFMT_LIST_NORMAL , $event->end + $tzoffset ) ;
 	}
 	$summary4disp = $myts->htmlSpecialChars( $event->summary ) ;
 	echo "
@@ -251,10 +251,10 @@
 
 echo "
   <tr>
-    <td colspan='8' align='right' class='head'>"._AM_LABEL_ADMIT."<input type='submit' name='admit' value='"._AM_BUTTON_ADMIT."' /> &nbsp; "._AM_LABEL_IO_DELETE."<input type='submit' name='delete' value='"._DELETE."' onclick='return confirm(\""._AM_CONFIRM_DELETE."\")' /></td>
+    <td colspan='8' align='right' class='head'>"._AM_APCAL_LABEL_ADMIT."<input type='submit' name='admit' value='"._AM_APCAL_BUTTON_ADMIT."' /> &nbsp; "._AM_APCAL_LABEL_IO_DELETE."<input type='submit' name='delete' value='"._DELETE."' onclick='return confirm(\""._AM_APCAL_CONFIRM_DELETE."\")' /></td>
   </tr>
   <tr>
-    <td colspan='8' align='right' valign='bottom' height='50'>".APCAL_COPYRIGHT."</td>
+    <td colspan='8' align='right' valign='bottom' height='50'>"._AM_APCAL_COPYRIGHT."</td>
   </tr>
 </table>
 ".$xoopsGTicket->getTicketHtml( __LINE__ )."

Modified: XoopsModules/APCal/trunk/modules/APCal/admin/cat2groupperm.php
===================================================================
--- XoopsModules/APCal/trunk/modules/APCal/admin/cat2groupperm.php	2013-04-29 06:59:52 UTC (rev 11478)
+++ XoopsModules/APCal/trunk/modules/APCal/admin/cat2groupperm.php	2013-04-29 17:55:58 UTC (rev 11479)
@@ -59,7 +59,7 @@
 	}
 
 	include( "mygroupperm.php" ) ;
-	redirect_header( XOOPS_URL."/modules/$mydirname/admin/cat2groupperm.php" , 1 , _MD_AM_DBUPDATED );
+	redirect_header( XOOPS_URL."/modules/$mydirname/admin/cat2groupperm.php" , 1 , _MD_APCALAM_APCALDBUPDATED );
 	exit ;
 }
 
@@ -67,7 +67,7 @@
 // creating Objects of XOOPS
 $myts =& MyTextSanitizer::getInstance();
 $cattree = new XoopsTree( $cat_table , "cid" , "pid" ) ;
-$form = new MyXoopsGroupPermForm( _AM_MENU_CAT2GROUP , $xoopsModule->mid() , 'apcal_cat' , _AM_CAT2GROUPDESC ) ;
+$form = new MyXoopsGroupPermForm( _AM_APCAL_MENU_CAT2GROUP , $xoopsModule->mid() , 'apcal_cat' , _AM_APCAL_CAT2GROUPDESC ) ;
 
 $cat_tree_array = $cattree->getChildTreeArray( 0 , 'weight ASC,cat_title' ) ;
 

Modified: XoopsModules/APCal/trunk/modules/APCal/admin/categories.php
===================================================================
--- XoopsModules/APCal/trunk/modules/APCal/admin/categories.php	2013-04-29 06:59:52 UTC (rev 11478)
+++ XoopsModules/APCal/trunk/modules/APCal/admin/categories.php	2013-04-29 17:55:58 UTC (rev 11479)
@@ -44,10 +44,10 @@
 	$form->addElement( new XoopsFormHidden( 'cid' , intval( $cat->cid ) ) ) ;
 
 	// Subject
-	$form->addElement( new XoopsFormText( _AM_CAT_TH_TITLE , 'cat_title' , 60 , 128 , htmlspecialchars( $cat->cat_title , ENT_QUOTES ) ) , true ) ;
+	$form->addElement( new XoopsFormText( _AM_APCAL_CAT_TH_TITLE , 'cat_title' , 60 , 128 , htmlspecialchars( $cat->cat_title , ENT_QUOTES ) ) , true ) ;
 
 	// Description
-    $tarea_tray =  new XoopsFormElementTray( _AM_CAT_TH_DESC , '<br />' ) ;
+    $tarea_tray =  new XoopsFormElementTray( _AM_APCAL_CAT_TH_DESC , '<br />' ) ;
     if ( class_exists( 'XoopsFormEditor' ) ) {
         $configs=array(
             'name'   => 'cat_desc',
@@ -69,15 +69,15 @@
 	$cattree->makeMySelBox( "cat_title" , "weight" , $cat->pid , 1 , 'pid' ) ;
 	$cat_selbox = ob_get_contents() ;
 	ob_end_clean() ;
-	$form->addElement( new XoopsFormLabel( _AM_CAT_TH_PARENT , $cat_selbox ) ) ;
+	$form->addElement( new XoopsFormLabel( _AM_APCAL_CAT_TH_PARENT , $cat_selbox ) ) ;
 
 	// Weight
-	$form->addElement( new XoopsFormText( _AM_CAT_TH_WEIGHT , 'weight', 6 , 6 , intval( $cat->weight ) ) , true ) ;
+	$form->addElement( new XoopsFormText( _AM_APCAL_CAT_TH_WEIGHT , 'weight', 6 , 6 , intval( $cat->weight ) ) , true ) ;
 
 	// Options
-	$checkbox_tray =  new XoopsFormElementTray( _AM_CAT_TH_OPTIONS , '<br />' ) ;
+	$checkbox_tray =  new XoopsFormElementTray( _AM_APCAL_CAT_TH_OPTIONS , '<br />' ) ;
 	$ismenuitem_checkbox =  new XoopsFormCheckBox( '' , 'ismenuitem' , intval( $cat->ismenuitem ) ) ;
-	$ismenuitem_checkbox->addOption( 1 , _AM_CAT_TH_SUBMENU ) ;
+	$ismenuitem_checkbox->addOption( 1 , _AM_APCAL_CAT_TH_SUBMENU ) ;
 	$checkbox_tray->addElement( $ismenuitem_checkbox ) ;
     $canbemain_checkbox = new XoopsFormCheckBox('', 'canbemain', intval($cat->canbemain));
 	$canbemain_checkbox->addOption(1, _AM_APCAL_CANBEMAIN);
@@ -89,7 +89,7 @@
     $form->addElement(new XoopsFormColorPicker(_AM_APCAL_COLOR, color, $color), false);
 
 	// Last Modified
-	$form->addElement( new XoopsFormLabel( _AM_CAT_TH_LASTMODIFY , formatTimestamp( $cat->udtstamp ) ) ) ;
+	$form->addElement( new XoopsFormLabel( _AM_APCAL_CAT_TH_LASTMODIFY , formatTimestamp( $cat->udtstamp ) ) ) ;
 
 	// Buttons
 	$button_tray = new XoopsFormElementTray( '' , '&nbsp;' ) ;
@@ -220,7 +220,7 @@
     $sql .= ",color='".$_POST['color'].'\'';
 	if( ! mysql_query( $sql , $conn ) ) die( mysql_error() ) ;
 	rebuild_cat_tree( $cal->cat_table ) ;
-	$mes = urlencode( _AM_MB_CAT_INSERTED ) ;
+	$mes = urlencode( _AM_APCAL_MB_CAT_INSERTED ) ;
 	$cal->redirect( "done=inserted&mes=$mes" ) ;
 	exit ;
 
@@ -241,7 +241,7 @@
     $sql .= "WHERE cid='$cid'" ;
 	if( ! mysql_query( $sql , $conn ) ) die( mysql_error() ) ;
 	rebuild_cat_tree( $cal->cat_table ) ;
-	$mes = urlencode( _AM_MB_CAT_UPDATED ) ;
+	$mes = urlencode( _AM_APCAL_MB_CAT_UPDATED ) ;
 	$cal->redirect( "done=updated&mes=$mes" ) ;
 	exit ;
 
@@ -283,7 +283,7 @@
 	// cat�ơ��֥뤫��κ��
 	if( ! mysql_query( "DELETE FROM $cal->cat_table WHERE $whr" , $conn ) ) die( mysql_error() ) ;
 	rebuild_cat_tree( $cal->cat_table ) ;
-	$mes = urlencode( sprintf( _AM_FMT_CAT_DELETED , mysql_affected_rows() ) ) ;
+	$mes = urlencode( sprintf( _AM_APCAL_FMT_CAT_DELETED , mysql_affected_rows() ) ) ;
 	$cal->redirect( "done=deleted&mes=$mes" ) ;
 	exit ;
 
@@ -304,7 +304,7 @@
 		$affected += mysql_affected_rows() ;
 	}
 	if( $affected > 0 ) rebuild_cat_tree( $cal->cat_table ) ;
-	$mes = urlencode( sprintf( _AM_FMT_CAT_BATCHUPDATED , $affected ) ) ;
+	$mes = urlencode( sprintf( _AM_APCAL_FMT_CAT_BATCHUPDATED , $affected ) ) ;
 	$cal->redirect( "done=batch_updated&mes=$mes" ) ;
 	exit ;
 
@@ -323,7 +323,7 @@
 	$sql = "SELECT *,UNIX_TIMESTAMP(dtstamp) AS udtstamp FROM $cal->cat_table WHERE cid='$cid'" ;
 	$crs = mysql_query( $sql , $conn ) ;
 	$cat = mysql_fetch_object( $crs ) ;
-	display_edit_form( $cat , _AM_MENU_CAT_EDIT , 'update' ) ;
+	display_edit_form( $cat , _AM_APCAL_MENU_CAT_EDIT , 'update' ) ;
 
 } else if( $disp == "new" ) {
 
@@ -332,15 +332,15 @@
 	$cat = new Dummy() ;
 	$cat->pid = $cid ;
 	$cat->udtstamp = time() ;
-	display_edit_form( $cat , _AM_MENU_CAT_NEW , 'insert' ) ;
+	display_edit_form( $cat , _AM_APCAL_MENU_CAT_NEW , 'insert' ) ;
 
 } else {
 
-	echo "<h4>"._AM_MENU_CATEGORIES."</h4>\n" ;
+	echo "<h4>"._AM_APCAL_MENU_CATEGORIES."</h4>\n" ;
 
 	if( ! empty( $_GET['mes'] ) ) echo "<p><font color='blue'>".htmlspecialchars($_GET['mes'],ENT_QUOTES)."</font></p>" ;
 
-	echo "<p><a href='?disp=new&cid=0'>"._AM_MB_MAKETOPCAT."<img src='../images/cat_add.gif' width='18' height='15' alt='' /></a></p>\n" ;
+	echo "<p><a href='?disp=new&cid=0'>"._AM_APCAL_MB_MAKETOPCAT."<img src='../images/cat_add.gif' width='18' height='15' alt='' /></a></p>\n" ;
 
 	// ���ƥ��꡼�ǡ�������
 	$cat_tree_array = $cattree->getChildTreeArray( 0 , 'weight ASC,cat_title' ) ;
@@ -352,10 +352,10 @@
 	<input type='hidden' name='delcat' value='' />
 	<table width='75%' class='outer' cellpadding='4' cellspacing='1'>
 	  <tr valign='middle'>
-	    <th>"._AM_CAT_TH_TITLE."</th>
-	    <th>"._AM_CAT_TH_OPERATION."</th>
-	    <th>"._AM_CAT_TH_ENABLED."</th>
-	    <th>"._AM_CAT_TH_WEIGHT."</th>
+	    <th>"._AM_APCAL_CAT_TH_TITLE."</th>
+	    <th>"._AM_APCAL_CAT_TH_OPERATION."</th>
+	    <th>"._AM_APCAL_CAT_TH_ENABLED."</th>
+	    <th>"._AM_APCAL_CAT_TH_WEIGHT."</th>
 	  </tr>
 	" ;
 
@@ -369,16 +369,16 @@
 		$enable_checked = $enabled ? "checked='checked'" : "" ;
 		$cid = intval( $cid ) ;
 		$cat_title = $myts->htmlSpecialChars( $cat_title ) ;
-		$del_confirm = 'confirm("' . sprintf( _AM_FMT_CATDELCONFIRM , $cat_title ) . '")' ;
+		$del_confirm = 'confirm("' . sprintf( _AM_APCAL_FMT_CATDELCONFIRM , $cat_title ) . '")' ;
 		echo "
 	  <tr>
 	    <td class='$oddeven' width='100%'><a href='?disp=edit&amp;cid=$cid'>$prefix&nbsp;$cat_title</a></td>
 	    <td class='$oddeven' align='center' nowrap='nowrap'>
 	      <a href='$mod_url/index.php?action=Edit&amp;cid=$cid' target='_blank'><img src='$cal->images_url/addevent.gif' border='0' width='14' height='12' /></a>
 	      &nbsp;
-	      <a href='?disp=edit&amp;cid=$cid'><img src='../images/cat_edit.gif' width='18' height='15' alt='"._AM_MENU_CAT_EDIT."' title='"._AM_MENU_CAT_EDIT."' /></a>
+	      <a href='?disp=edit&amp;cid=$cid'><img src='../images/cat_edit.gif' width='18' height='15' alt='"._AM_APCAL_MENU_CAT_EDIT."' title='"._AM_APCAL_MENU_CAT_EDIT."' /></a>
 	      &nbsp;
-	      <a href='?disp=new&amp;cid=$cid'><img src='../images/cat_add.gif' width='18' height='15' alt='"._AM_MENU_CAT_NEW."' title='"._AM_MENU_CAT_NEW."' /></a>
+	      <a href='?disp=new&amp;cid=$cid'><img src='../images/cat_add.gif' width='18' height='15' alt='"._AM_APCAL_MENU_CAT_NEW."' title='"._AM_APCAL_MENU_CAT_NEW."' /></a>
 	      &nbsp;
 	      <input type='button' value='"._DELETE."'  onclick='if($del_confirm){document.MainForm.delcat.value=\"$cid\"; submit();}' />
 	    </td>
@@ -390,10 +390,10 @@
 	// �ơ��֥�եå���
 	echo "
 	  <tr>
-	    <td colspan='4' align='right' class='head'><input type='submit' name='batch_update' value='"._AM_BTN_UPDATE."' /></td>
+	    <td colspan='4' align='right' class='head'><input type='submit' name='batch_update' value='"._AM_APCAL_BTN_UPDATE."' /></td>
 	  </tr>
 	  <tr>
-	    <td colspan='8' align='right' valign='bottom' height='50'>".APCAL_COPYRIGHT."</td>
+	    <td colspan='8' align='right' valign='bottom' height='50'>"._AM_APCAL_COPYRIGHT."</td>
 	  </tr>
 	</table>
 	</form>

Modified: XoopsModules/APCal/trunk/modules/APCal/admin/displayMenu.php
===================================================================
--- XoopsModules/APCal/trunk/modules/APCal/admin/displayMenu.php	2013-04-29 06:59:52 UTC (rev 11478)
+++ XoopsModules/APCal/trunk/modules/APCal/admin/displayMenu.php	2013-04-29 17:55:58 UTC (rev 11479)
@@ -7,10 +7,10 @@
     // Get menu tab handler
     $menu_handler =& xoops_getmodulehandler('adminMenu', 'APCal');
     // Define top navigation
-    $menu_handler->addMenuTop(XOOPS_URL."/modules/system/admin.php?fct=preferences&amp;op=showmod&amp;mod=".$xoopsModule->getVar('mid', 'e'), _AM_PREFS);
-    $menu_handler->addMenuTop(XOOPS_URL."/modules/system/admin.php?fct=modulesadmin&amp;op=update&amp;module=".$xoopsModule->getVar('dirname', 'e'), _AM_UPDATE);
-    $menu_handler->addMenuTop(XOOPS_URL."/modules/system/admin.php?fct=blocksadmin&amp;op=list&amp;filter=1&amp;selgen=".$xoopsModule->getVar('mid', 'e')."&amp;selmod=-2&amp;selgrp=-1&amp;selvis=-1", _AM_BLOCKS);
-    $menu_handler->addMenuTop(XOOPS_URL."/modules/".$xoopsModule->getVar('dirname', 'e')."/", _AM_GOTOMODULE);
+    $menu_handler->addMenuTop(XOOPS_URL."/modules/system/admin.php?fct=preferences&amp;op=showmod&amp;mod=".$xoopsModule->getVar('mid', 'e'), _AM_APCAL_PREFS);
+    $menu_handler->addMenuTop(XOOPS_URL."/modules/system/admin.php?fct=modulesadmin&amp;op=update&amp;module=".$xoopsModule->getVar('dirname', 'e'), _AM_APCAL_UPDATE);
+    $menu_handler->addMenuTop(XOOPS_URL."/modules/system/admin.php?fct=blocksadmin&amp;op=list&amp;filter=1&amp;selgen=".$xoopsModule->getVar('mid', 'e')."&amp;selmod=-2&amp;selgrp=-1&amp;selvis=-1", _AM_APCAL_BLOCKS);
+    $menu_handler->addMenuTop(XOOPS_URL."/modules/".$xoopsModule->getVar('dirname', 'e')."/", _AM_APCAL_GOTOMODULE);
     // Define main tab navigation
     $i=0;
     foreach ($xoopsModule->adminmenu as $menu) 
@@ -22,7 +22,7 @@
     if ($xoopsModule->getInfo('help')) 
     {
         if ( stripos( $_SERVER['REQUEST_URI'], 'admin/' . $xoopsModule->getInfo('help') ) !== false ) $current = $i;
-        $menu_handler->addMenuTabs( '../system/help.php?mid=' . $xoopsModule->getVar('mid', 's') . '&amp;page=' . $xoopsModule->getInfo('help'), _AM_SYSTEM_HELP);
+        $menu_handler->addMenuTabs( '../system/help.php?mid=' . $xoopsModule->getVar('mid', 's') . '&amp;page=' . $xoopsModule->getInfo('help'), _AM_APCAL_SYSTEM_HELP);
     }
 
     // Display navigation tabs

Modified: XoopsModules/APCal/trunk/modules/APCal/admin/events.php
===================================================================
--- XoopsModules/APCal/trunk/modules/APCal/admin/events.php	2013-04-29 06:59:52 UTC (rev 11478)
+++ XoopsModules/APCal/trunk/modules/APCal/admin/events.php	2013-04-29 17:55:58 UTC (rev 11479)
@@ -73,9 +73,9 @@
 
 // ��̤��ˤ��ʤ���ߡʥǥե���Ȥ�̤���
 $pf_options = "
-	<option value='future'>"._AM_OPT_FUTURE."</option>
-	<option value='past'>"._AM_OPT_PAST."</option>
-	<option value='pandf'>"._AM_OPT_PASTANDFUTURE."</option>\n" ;
+	<option value='future'>"._AM_APCAL_OPT_FUTURE."</option>
+	<option value='past'>"._AM_APCAL_OPT_PAST."</option>
+	<option value='pandf'>"._AM_APCAL_OPT_PASTANDFUTURE."</option>\n" ;
 $pf = empty( $_GET['pf'] ) ? 'future' : preg_replace( '/[^a-zA-Z0-9_-]/' , '' , $_GET['pf'] ) ;
 switch( $pf ) {
 	case 'past' :
@@ -106,9 +106,9 @@
 $serverTZ = $cal->server_TZ ;
 $userTZ = $xoopsUser->timezone() ;
 $tzoptions = "
-	<option value='s'>"._AM_TZOPT_SERVER."</option>
-	<option value='g'>"._AM_TZOPT_GMT."</option>
-	<option value='y'>"._AM_TZOPT_USER."</option>\n" ;
+	<option value='s'>"._AM_APCAL_TZOPT_SERVER."</option>
+	<option value='g'>"._AM_APCAL_TZOPT_GMT."</option>
+	<option value='y'>"._AM_APCAL_TZOPT_USER."</option>\n" ;
 switch( $tz ) {
 	case 's' :
 		$tzoffset = 0 ;
@@ -149,7 +149,7 @@
 		$records = mysql_affected_rows( $conn ) ;
 		$sql = "DELETE FROM $cal->table WHERE $whr 0 " ;
 		if( ! mysql_query( $sql , $conn ) ) echo mysql_error() ;
-		else $mes = urlencode( "$records "._AM_MES_DELETED ) ;
+		else $mes = urlencode( "$records "._AM_APCAL_MES_DELETED ) ;
 	} else {
 		$mes = "" ;
 	}
@@ -173,7 +173,7 @@
 	$sql = "UPDATE $cal->table SET categories=CONCAT(categories,'$cid4sql') WHERE ($whr 0) AND categories NOT LIKE '%$cid4sql%'" ;
 	if( ! mysql_query( $sql , $conn ) ) echo mysql_error() ;
 	$records = mysql_affected_rows( $conn ) ;
-	$mes = urlencode( "$records "._AM_MES_EVENTLINKTOCAT ) ;
+	$mes = urlencode( "$records "._AM_APCAL_MES_EVENTLINKTOCAT ) ;
 	$cal->redirect( "cid=$cid&num=$num&tz=$tz&done=copied&mes=$mes" ) ;
 	exit ;
 
@@ -196,8 +196,8 @@
 	$sql = "UPDATE $cal->table SET categories=REPLACE(categories,'$old_cid4sql','$cid4sql') WHERE ($whr 0)" ;
 	if( ! mysql_query( $sql , $conn ) ) echo mysql_error() ;
 	$records = mysql_affected_rows( $conn ) ;
-	if( $cid > 0 ) $mes = urlencode( "$records "._AM_MES_EVENTLINKTOCAT ) ;
-	else $mes = urlencode( "$records "._AM_MES_EVENTUNLINKED ) ;
+	if( $cid > 0 ) $mes = urlencode( "$records "._AM_APCAL_MES_EVENTLINKTOCAT ) ;
+	else $mes = urlencode( "$records "._AM_APCAL_MES_EVENTUNLINKED ) ;
 	$cal->redirect( "cid=$old_cid&num=$num&tz=$tz&done=moved&mes=$mes" ) ;
 	exit ;
 
@@ -262,7 +262,7 @@
 require_once XOOPS_ROOT_PATH.'/modules/APCal/admin/displayMenu.php';
 
 echo "
-<h4>"._AM_MENU_EVENTS."</h4>
+<h4>"._AM_APCAL_MENU_EVENTS."</h4>
 <p><font color='blue'>".(isset($_GET['mes'])?htmlspecialchars($_GET['mes'],ENT_QUOTES):"")."</font></p>\n"
 . ( isset( $confirm_html ) ? $confirm_html : "" ) ."
 <form action='' method='get' style='margin-bottom:0px;text-align:left'>
@@ -283,7 +283,7 @@
         </select>
         $cat_selbox4extract
         <input type='text' name='txt' value='".htmlspecialchars($txt,ENT_QUOTES)."' />
-        <input type='submit' value='"._AM_BUTTON_EXTRACT."' /> &nbsp; 
+        <input type='submit' value='"._AM_APCAL_BUTTON_EXTRACT."' /> &nbsp; 
         $nav_html &nbsp; 
         <input type='hidden' name='num' value='$num' />
         <input type='hidden' name='tz' value='$tz' />
@@ -295,12 +295,12 @@
 ".$xoopsGTicket->getTicketHtml( __LINE__ )."
 <table width='100%' class='outer' cellpadding='4' cellspacing='1'>
   <tr valign='middle'>
-    <th>"._AM_IO_TH0."</th>
-    <th>"._AM_IO_TH1."<br />($tzdisp)</th>
-    <th>"._AM_IO_TH2."<br />($tzdisp)</th>
-    <th>"._AM_IO_TH3."</th>
-    <th>"._AM_IO_TH4."</th>
-    <th>"._AM_IO_TH5."</th>
+    <th>"._AM_APCAL_IO_TH0."</th>
+    <th>"._AM_APCAL_IO_TH1."<br />($tzdisp)</th>
+    <th>"._AM_APCAL_IO_TH2."<br />($tzdisp)</th>
+    <th>"._AM_APCAL_IO_TH3."</th>
+    <th>"._AM_APCAL_IO_TH4."</th>
+    <th>"._AM_APCAL_IO_TH5."</th>
     <th></th>
     <th><input type='checkbox' name='dummy' onclick=\"with(document.MainForm){for(i=0;i<length;i++){if(elements[i].type=='checkbox'){elements[i].checked=this.checked;}}}\" /></th>
   </tr>
@@ -312,11 +312,11 @@
 while( $event = mysql_fetch_object( $rs ) ) {
 	$oddeven = ( $oddeven == 'odd' ? 'even' : 'odd' ) ;
 	if( $event->allday ) {
-		$start_desc = date( _AM_DTFMT_LIST_ALLDAY , $event->start ) . '<br />(' . _APCAL_MB_ALLDAY_EVENT . ')' ;
-		$end_desc = date( _AM_DTFMT_LIST_ALLDAY , $event->end - 300 ) . '<br />(' . _APCAL_MB_ALLDAY_EVENT . ')' ;
+		$start_desc = date( _AM_APCAL_DTFMT_LIST_ALLDAY , $event->start ) . '<br />(' . _APCAL_MB_APCALALLDAY_EVENT . ')' ;
+		$end_desc = date( _AM_APCAL_DTFMT_LIST_ALLDAY , $event->end - 300 ) . '<br />(' . _APCAL_MB_APCALALLDAY_EVENT . ')' ;
 	} else {
-		$start_desc = date( _AM_DTFMT_LIST_NORMAL , $event->start + $tzoffset ) ;
-		$end_desc = date( _AM_DTFMT_LIST_NORMAL , $event->end + $tzoffset ) ;
+		$start_desc = date( _AM_APCAL_DTFMT_LIST_NORMAL , $event->start + $tzoffset ) ;
+		$end_desc = date( _AM_APCAL_DTFMT_LIST_NORMAL , $event->end + $tzoffset ) ;
 	}
 	$summary4disp = $myts->htmlSpecialChars( $event->summary ) ;
 	echo "
@@ -335,14 +335,14 @@
 echo "
   <tr>
     <td colspan='8' align='right' class='head'>
-      "._AM_LABEL_IO_CHECKEDITEMS." &nbsp; "._AM_LABEL_IO_OUTPUT."<input type='submit' name='output_ics_confirm' value='"._APCAL_BTN_EXPORT."' /> &nbsp; "._AM_LABEL_IO_DELETE."<input type='submit' name='delete' value='"._DELETE."' onclick='return confirm(\""._AM_CONFIRM_DELETE."\")' /><br />
+      "._AM_APCAL_LABEL_IO_CHECKEDITEMS." &nbsp; "._AM_APCAL_LABEL_IO_OUTPUT."<input type='submit' name='output_ics_confirm' value='"._APCAL_BTN_EXPORT."' /> &nbsp; "._AM_APCAL_LABEL_IO_DELETE."<input type='submit' name='delete' value='"._DELETE."' onclick='return confirm(\""._AM_APCAL_CONFIRM_DELETE."\")' /><br />
       <br />
-      $cat_selbox <input type='submit' name='movelink' value='"._AM_BUTTON_MOVE."' onclick='return confirm(\""._AM_CONFIRM_MOVE."\")' ".($cid<=0?"disabled='disabled'":"")." /> <input type='submit' name='addlink' value='"._AM_BUTTON_COPY."' onclick='return confirm(\""._AM_CONFIRM_COPY."\")' />
+      $cat_selbox <input type='submit' name='movelink' value='"._AM_APCAL_BUTTON_MOVE."' onclick='return confirm(\""._AM_APCAL_CONFIRM_MOVE."\")' ".($cid<=0?"disabled='disabled'":"")." /> <input type='submit' name='addlink' value='"._AM_APCAL_BUTTON_COPY."' onclick='return confirm(\""._AM_APCAL_CONFIRM_COPY."\")' />
       <input type='hidden' name='old_cid' value='$cid' />
     </td>
   </tr>
   <tr>
-    <td colspan='8' align='right' valign='bottom' height='50'>".APCAL_COPYRIGHT."</td>
+    <td colspan='8' align='right' valign='bottom' height='50'>"._AM_APCAL_COPYRIGHT."</td>
   </tr>
 </table>
 </form>

Modified: XoopsModules/APCal/trunk/modules/APCal/admin/groupperm.php
===================================================================
--- XoopsModules/APCal/trunk/modules/APCal/admin/groupperm.php	2013-04-29 06:59:52 UTC (rev 11478)
+++ XoopsModules/APCal/trunk/modules/APCal/admin/groupperm.php	2013-04-29 17:55:58 UTC (rev 11479)
@@ -55,22 +55,22 @@
 	}
 
 	include( "mygroupperm.php" ) ;
-	redirect_header( XOOPS_URL."/modules/$mydirname/admin/groupperm.php" , 1 , _MD_AM_DBUPDATED );
+	redirect_header( XOOPS_URL."/modules/$mydirname/admin/groupperm.php" , 1 , _MD_APCALAM_APCALDBUPDATED );
 	exit ;
 }
 
 
 $item_list = array(
-	'1' => _AM_GPERM_G_INSERTABLE ,
-	'2' => _AM_GPERM_G_SUPERINSERT ,
-	'4' => _AM_GPERM_G_EDITABLE ,
-	'8' => _AM_GPERM_G_SUPEREDIT ,
-//	'16' => _AM_GPERM_G_DELETABLE ,
-	'32' => _AM_GPERM_G_SUPERDELETE
-//	'64' => _AM_GPERM_G_TOUCHOTHERS
+	'1' => _AM_APCAL_GPERM_G_INSERTABLE ,
+	'2' => _AM_APCAL_GPERM_G_SUPERINSERT ,
+	'4' => _AM_APCAL_GPERM_G_EDITABLE ,
+	'8' => _AM_APCAL_GPERM_G_SUPEREDIT ,
+//	'16' => _AM_APCAL_GPERM_G_DELETABLE ,
+	'32' => _AM_APCAL_GPERM_G_SUPERDELETE
+//	'64' => _AM_APCAL_GPERM_G_TOUCHOTHERS
 	) ;
 
-$form = new MyXoopsGroupPermForm( _AM_GROUPPERM , $xoopsModule->mid() , 'apcal_global' , _AM_GROUPPERMDESC ) ;
+$form = new MyXoopsGroupPermForm( _AM_APCAL_GROUPPERM , $xoopsModule->mid() , 'apcal_global' , _AM_APCAL_GROUPPERMDESC ) ;
 foreach( $item_list as $item_id => $item_name) {
 	$form->addItem( $item_id , $item_name ) ;
 }

Modified: XoopsModules/APCal/trunk/modules/APCal/admin/icalendar_import.php
===================================================================
--- XoopsModules/APCal/trunk/modules/APCal/admin/icalendar_import.php	2013-04-29 06:59:52 UTC (rev 11478)
+++ XoopsModules/APCal/trunk/modules/APCal/admin/icalendar_import.php	2013-04-29 17:55:58 UTC (rev 11479)
@@ -71,9 +71,9 @@
 $serverTZ = $cal->server_TZ ;
 $userTZ = $xoopsUser->timezone() ;
 $tzoptions = "
-	<option value='s'>"._AM_TZOPT_SERVER."</option>
-	<option value='g'>"._AM_TZOPT_GMT."</option>
-	<option value='y'>"._AM_TZOPT_USER."</option>\n" ;
+	<option value='s'>"._AM_APCAL_TZOPT_SERVER."</option>
+	<option value='g'>"._AM_APCAL_TZOPT_GMT."</option>
+	<option value='y'>"._AM_APCAL_TZOPT_USER."</option>\n" ;
 switch( $tz ) {
 	case 's' :
 		$tzoffset = 0 ;
@@ -108,7 +108,7 @@
 		$cal->redirect( "done=error&mes=$mes" ) ;
 		exit ;
 	} else {
-		$mes = urlencode( sprintf( "$records "._AM_FMT_IMPORTED , $calname ) ) ;
+		$mes = urlencode( sprintf( "$records "._AM_APCAL_FMT_IMPORTED , $calname ) ) ;
 		$cal->redirect( "done=imported&mes=$mes" ) ;
 		exit ;
 	}
@@ -127,7 +127,7 @@
 		$cal->redirect( "done=error&mes=$mes" ) ;
 		exit ;
 	} else {
-		$mes = urlencode( sprintf( "$records "._AM_FMT_IMPORTED , $calname ) ) ;
+		$mes = urlencode( sprintf( "$records "._AM_APCAL_FMT_IMPORTED , $calname ) ) ;
 		$cal->redirect( "done=imported&mes=$mes" ) ;
 		exit ;
 	}
@@ -151,7 +151,7 @@
 		$records = mysql_affected_rows( $conn ) ;
 		$sql = "DELETE FROM $cal->table WHERE $whr 0 " ;
 		if( ! mysql_query( $sql , $conn ) ) echo mysql_error() ;
-		else $mes = urlencode( "$records "._AM_MES_DELETED ) ;
+		else $mes = urlencode( "$records "._AM_APCAL_MES_DELETED ) ;
 	} else {
 		$mes = "" ;
 	}
@@ -186,16 +186,16 @@
 $xoopsGTicket->clear() ;
 
 echo "
-<h4>"._AM_ICALENDAR_IMPORT."</h4>
+<h4>"._AM_APCAL_ICALENDAR_IMPORT."</h4>
 <p><font color='blue'>".(isset($_GET['mes'])?htmlspecialchars($_GET['mes'],ENT_QUOTES):"")."</font></p>
 <form action='?tz=$tz&amp;num=$num' method='post'>
-  "._AM_LABEL_IMPORTFROMWEB."<br />
+  "._AM_APCAL_LABEL_IMPORTFROMWEB."<br />
   <input type='text' name='import_uri' size='80'>
   <input type='submit' name='http_import' value='"._APCAL_BTN_IMPORT."'>
   ".$xoopsGTicket->getTicketHtml( __LINE__ )."
 </form>
 <form action='?tz=$tz&amp;num=$num' method='post' enctype='multipart/form-data'>
-  "._AM_LABEL_UPLOADFROMFILE."<br />
+  "._AM_APCAL_LABEL_UPLOADFROMFILE."<br />
   <input type='hidden' name='MAX_FILE_SIZE' value='65536'>
   <input type='file' name='user_ics' size='72'>
   <input type='submit' name='local_import' value='"._APCAL_BTN_UPLOAD."'>
@@ -223,12 +223,12 @@
 ".$xoopsGTicket->getTicketHtml( __LINE__ )."
 <table width='100%' class='outer' cellpadding='4' cellspacing='1'>
   <tr valign='middle'>
-    <th>"._AM_IO_TH0."</th>
-    <th>"._AM_IO_TH1."<br />($tzdisp)</th>
-    <th>"._AM_IO_TH2."<br />($tzdisp)</th>
-    <th>"._AM_IO_TH3."</th>
-    <th>"._AM_IO_TH4."</th>
-    <th>"._AM_IO_TH5."</th>
+    <th>"._AM_APCAL_IO_TH0."</th>
+    <th>"._AM_APCAL_IO_TH1."<br />($tzdisp)</th>
+    <th>"._AM_APCAL_IO_TH2."<br />($tzdisp)</th>
+    <th>"._AM_APCAL_IO_TH3."</th>
+    <th>"._AM_APCAL_IO_TH4."</th>
+    <th>"._AM_APCAL_IO_TH5."</th>
     <th></th>
     <th><input type='checkbox' name='dummy' onclick=\"with(document.MainForm){for(i=0;i<length;i++){if(elements[i].type=='checkbox'){elements[i].checked=this.checked;}}}\" /></th>
   </tr>
@@ -243,11 +243,11 @@
 	if( $count ++ < $new_imported ) $newer_style = "style='background-color:#FFFFCC;'" ;
 	else $newer_style = '' ;
 	if( $event->allday ) {
-		$start_desc = date( _AM_DTFMT_LIST_ALLDAY , $event->start ) . '<br />(' . _APCAL_MB_ALLDAY_EVENT . ')' ;
-		$end_desc = date( _AM_DTFMT_LIST_ALLDAY , $event->end - 300 ) . '<br />(' . _APCAL_MB_ALLDAY_EVENT . ')' ;
+		$start_desc = date( _AM_APCAL_DTFMT_LIST_ALLDAY , $event->start ) . '<br />(' . _APCAL_MB_APCALALLDAY_EVENT . ')' ;
+		$end_desc = date( _AM_APCAL_DTFMT_LIST_ALLDAY , $event->end - 300 ) . '<br />(' . _APCAL_MB_APCALALLDAY_EVENT . ')' ;
 	} else {
-		$start_desc = date( _AM_DTFMT_LIST_NORMAL , $event->start + $tzoffset ) ;
-		$end_desc = date( _AM_DTFMT_LIST_NORMAL , $event->end + $tzoffset ) ;
+		$start_desc = date( _AM_APCAL_DTFMT_LIST_NORMAL , $event->start + $tzoffset ) ;
+		$end_desc = date( _AM_APCAL_DTFMT_LIST_NORMAL , $event->end + $tzoffset ) ;
 	}
 	$summary4disp = $myts->htmlSpecialChars( $event->summary ) ;
 	echo "
@@ -265,10 +265,10 @@
 
 echo "
   <tr>
-    <td colspan='8' align='right' class='head'>"._AM_LABEL_IO_CHECKEDITEMS." &nbsp; "._AM_LABEL_IO_DELETE."<input type='submit' name='delete' value='"._DELETE."' onclick='return confirm(\""._AM_CONFIRM_DELETE."\")' /></td>
+    <td colspan='8' align='right' class='head'>"._AM_APCAL_LABEL_IO_CHECKEDITEMS." &nbsp; "._AM_APCAL_LABEL_IO_DELETE."<input type='submit' name='delete' value='"._DELETE."' onclick='return confirm(\""._AM_APCAL_CONFIRM_DELETE."\")' /></td>
   </tr>
   <tr>
-    <td colspan='8' align='right' valign='bottom' height='50'>".APCAL_COPYRIGHT."</td>
+    <td colspan='8' align='right' valign='bottom' height='50'>"._AM_APCAL_COPYRIGHT."</td>
   </tr>
 </table>
 </form>

Modified: XoopsModules/APCal/trunk/modules/APCal/admin/index.php
===================================================================
--- XoopsModules/APCal/trunk/modules/APCal/admin/index.php	2013-04-29 06:59:52 UTC (rev 11478)
+++ XoopsModules/APCal/trunk/modules/APCal/admin/index.php	2013-04-29 17:55:58 UTC (rev 11479)
@@ -59,7 +59,7 @@
 $infoBoxes[_MI_APCAL_ADMENU1][] = sprintf(_AM_APCAL_NBWAITINGEVENTS, '<span style="color:'.($nbWaitingEvents>0 ? '#aa0000' : '#00aa00').'; font-weight : bold;">'.$nbWaitingEvents.'</span>');
 $infoBoxes[_MI_APCAL_ADMENU1][] = sprintf(_AM_APCAL_NBEVENTS, '<span style="font-weight : bold;">'.$nbEvents.'</span>');
 $infoBoxes[_MI_APCAL_ADMENU_CAT][] = sprintf(_AM_APCAL_NBCATS, '<span style="font-weight : bold;">'.$nbCats.'</span>');
-$infoBoxes[_AM_APCAL_TIMEZONE][] = sprintf(_AM_FMT_SERVER_TZ_ALL, date('Z', 1104537600)/3600, date('Z', 1120176000)/3600, date('T'), $xoopsConfig['server_TZ'], $cal->server_TZ);
+$infoBoxes[_AM_APCAL_TIMEZONE][] = sprintf(_AM_APCAL_FMT_SERVER_TZ_ALL, date('Z', 1104537600)/3600, date('Z', 1120176000)/3600, date('T'), $xoopsConfig['server_TZ'], $cal->server_TZ);
 
 $xoopsModule->loadAdminMenu();
 

Modified: XoopsModules/APCal/trunk/modules/APCal/admin/maintenance.php
===================================================================
--- XoopsModules/APCal/trunk/modules/APCal/admin/maintenance.php	2013-04-29 06:59:52 UTC (rev 11478)
+++ XoopsModules/APCal/trunk/modules/APCal/admin/maintenance.php	2013-04-29 17:55:58 UTC (rev 11479)
@@ -99,7 +99,7 @@
 		ADD cid smallint(5) unsigned zerofill NOT NULL default '0' AFTER end,
 		ADD end_date date AFTER end,
 		ADD start_date date AFTER end" ;
-	if( ! $xoopsDB->query( $sql ) ) error_halt( _AM_MB_FAILUPDATETABLE ) ;
+	if( ! $xoopsDB->query( $sql ) ) error_halt( _AM_APCAL_MB_FAILUPDATETABLE ) ;
 
 	// TimeZones of all records
 	$sql = "UPDATE $table_event SET 
@@ -107,11 +107,11 @@
 		server_tz = $serverTZ,
 		poster_tz = tzid,
 		event_tz = tzid" ;
-	if( ! $xoopsDB->query( $sql ) ) error_halt( _AM_MB_FAILUPDATETABLE ) ;
+	if( ! $xoopsDB->query( $sql ) ) error_halt( _AM_APCAL_MB_FAILUPDATETABLE ) ;
 
 	// older tzid field update
 	$sql = "UPDATE $table_event SET dtstamp=dtstamp,tzid='',event_tz=9.0,poster_tz=9.0 WHERE tzid='Japan'" ;
-	if( ! $xoopsDB->query( $sql ) ) error_halt( _AM_MB_FAILUPDATETABLE ) ;
+	if( ! $xoopsDB->query( $sql ) ) error_halt( _AM_APCAL_MB_FAILUPDATETABLE ) ;
 
 	// Counting comments
 	$sql = 'SELECT com_itemid,count(*) FROM ' . $xoopsDB->prefix('xoopscomments') . " WHERE com_modid=$mid GROUP BY com_itemid" ;
@@ -122,7 +122,7 @@
 
 	xoops_cp_header();
 	echo $xoopsLogger->dumpQueries();
-	redirect_header( $php_self , 5 , _AM_MB_SUCCESSUPDATETABLE ) ;
+	redirect_header( $php_self , 5 , _AM_APCAL_MB_SUCCESSUPDATETABLE ) ;
 
 } else if( ! empty( $_POST['create_cat'] ) ) {
 
@@ -154,7 +154,7 @@
 
 	xoops_cp_header();
 	echo $xoopsLogger->dumpQueries();
-	redirect_header( $php_self , 5 , _AM_MB_SUCCESSUPDATETABLE ) ;
+	redirect_header( $php_self , 5 , _AM_APCAL_MB_SUCCESSUPDATETABLE ) ;
 
 } else if( ! empty( $_POST['repair_stz'] ) ) {
 
@@ -178,7 +178,7 @@
 
 	xoops_cp_header();
 	echo $xoopsLogger->dumpQueries();
-	redirect_header( $php_self , 5 , _AM_MB_SUCCESSTZUPDATE ) ;
+	redirect_header( $php_self , 5 , _AM_APCAL_MB_SUCCESSTZUPDATE ) ;
 }
 
 
@@ -198,13 +198,13 @@
 if( ! $is_040 ) {
 
 	OpenTable() ;
-	echo _AM_ALRT_TOOOLDTABLE ;
+	echo _AM_APCAL_ALRT_TOOOLDTABLE ;
 	CloseTable() ;
 
 } else if( ! $is_060 ) {
 
 	OpenTable() ;
-	echo _AM_ALRT_OLDTABLE ;
+	echo _AM_APCAL_ALRT_OLDTABLE ;
 	echo "
 		<br />(0.4x, 0.5x -> 0.6)
 		<form action='' method='post'>
@@ -216,7 +216,7 @@
 } else if( ! $has_cat ) {
 
 	OpenTable() ;
-	echo _AM_ALRT_CATTABLENOTEXIST ;
+	echo _AM_APCAL_ALRT_CATTABLENOTEXIST ;
 	echo "
 		<br />
 		<form action='' method='post'>
@@ -231,18 +231,18 @@
 	$rs_stz = $xoopsDB->query( "SELECT COUNT(*),server_tz FROM $table_event GROUP BY server_tz" ) ;
 	OpenTable() ;
 	echo "
-		".sprintf(_AM_FMT_SERVER_TZ_ALL,date('Z',1104537600)/3600,date('Z',1120176000)/3600,date('T'),$xoopsConfig['server_TZ'],$cal->server_TZ)."
+		".sprintf(_AM_APCAL_FMT_SERVER_TZ_ALL,date('Z',1104537600)/3600,date('Z',1120176000)/3600,date('T'),$xoopsConfig['server_TZ'],$cal->server_TZ)."
 		<form action='' method='post'>
 		<table border='1'>
 			<tr>
 				<th>
-					"._AM_TH_SERVER_TZ_COUNT."
+					"._AM_APCAL_TH_SERVER_TZ_COUNT."
 				</th>
 				<th>
-					"._AM_TH_SERVER_TZ_VALUE."
+					"._AM_APCAL_TH_SERVER_TZ_VALUE."
 				</th>
 				<th>
-					"._AM_TH_SERVER_TZ_VALUE_TO."
+					"._AM_APCAL_TH_SERVER_TZ_VALUE_TO."
 				</th>
 			</tr>\n" ;
 
@@ -262,7 +262,7 @@
 				</td>
 			</tr>\n" ;
 
-/*		printf( _AM_FMT_WRONGSTZ , $wrong_stzs ) ;
+/*		printf( _AM_APCAL_FMT_WRONGSTZ , $wrong_stzs ) ;
 		echo "
 			<br />
 				<input type='submit' name='repair_stz' value='"._GO."' />
@@ -275,12 +275,12 @@
 
 	if( $server_tz_wrong ) {
 		echo "
-		<input type='submit' value='"._SUBMIT."' name='repair_stz' onclick='return confirm(\""._AM_JSALRT_SERVER_TZ."\");' />
+		<input type='submit' value='"._SUBMIT."' name='repair_stz' onclick='return confirm(\""._AM_APCAL_JSALRT_SERVER_TZ."\");' />
 		".$xoopsGTicket->getTicketHtml( __LINE__ )."
 		</form>\n" ;
-		echo _AM_NOTICE_SERVER_TZ ;
+		echo _AM_APCAL_NOTICE_SERVER_TZ ;
 	} else {
-		echo _AM_NOTICE_NOERRORS ;
+		echo _AM_APCAL_NOTICE_NOERRORS ;
 	}
 	CloseTable() ;
 }

Modified: XoopsModules/APCal/trunk/modules/APCal/admin/myblockform.php
===================================================================
--- XoopsModules/APCal/trunk/modules/APCal/admin/myblockform.php	2013-04-29 06:59:52 UTC (rev 11478)
+++ XoopsModules/APCal/trunk/modules/APCal/admin/myblockform.php	2013-04-29 17:55:58 UTC (rev 11479)
@@ -40,29 +40,29 @@
 //$form = new XoopsThemeForm($block['form_title'], 'blockform', XOOPS_URL."/modules/blocksadmin/admin/admin.php" ) ;
 $form = new XoopsThemeForm($block['form_title'], 'blockform', "admin.php" ) ;
 if (isset($block['name'])) {
-	$form->addElement(new XoopsFormLabel(_AM_NAME, $block['name']));
+	$form->addElement(new XoopsFormLabel(_AM_APCAL_NAME, $block['name']));
 }
-$side_select = new XoopsFormSelect(_AM_BLKTYPE, "bside", $block['side']);
-$side_select->addOptionArray(array(0 => _AM_SBLEFT, 1 => _AM_SBRIGHT, 3 => _AM_CBLEFT, 4 => _AM_CBRIGHT, 5 => _AM_CBCENTER, ));
+$side_select = new XoopsFormSelect(_AM_APCAL_BLKTYPE, "bside", $block['side']);
+$side_select->addOptionArray(array(0 => _AM_APCAL_SBLEFT, 1 => _AM_APCAL_SBRIGHT, 3 => _AM_APCAL_CBLEFT, 4 => _AM_APCAL_CBRIGHT, 5 => _AM_APCAL_CBCENTER, ));
 $form->addElement($side_select);
-$form->addElement(new XoopsFormText(_AM_WEIGHT, "bweight", 2, 5, $block['weight']));
-$form->addElement(new XoopsFormRadioYN(_AM_VISIBLE, 'bvisible', $block['visible']));
-$mod_select = new XoopsFormSelect(_AM_VISIBLEIN, "bmodule", $block['modules'], 5, true);
+$form->addElement(new XoopsFormText(_AM_APCAL_WEIGHT, "bweight", 2, 5, $block['weight']));
+$form->addElement(new XoopsFormRadioYN(_AM_APCAL_VISIBLE, 'bvisible', $block['visible']));
+$mod_select = new XoopsFormSelect(_AM_APCAL_VISIBLEIN, "bmodule", $block['modules'], 5, true);
 $module_handler =& xoops_gethandler('module');
 $criteria = new CriteriaCompo(new Criteria('hasmain', 1));
 $criteria->add(new Criteria('isactive', 1));
 $module_list =& $module_handler->getList($criteria);
-$module_list[-1] = _AM_TOPPAGE;
-$module_list[0] = _AM_ALLPAGES;
+$module_list[-1] = _AM_APCAL_TOPPAGE;
+$module_list[0] = _AM_APCAL_ALLPAGES;
 ksort($module_list);
 $mod_select->addOptionArray($module_list);
 $form->addElement($mod_select);
-$form->addElement(new XoopsFormText(_AM_TITLE, 'btitle', 50, 255, $block['title']), false);
+$form->addElement(new XoopsFormText(_AM_APCAL_TITLE, 'btitle', 50, 255, $block['title']), false);
 
 if ( $block['is_custom'] ) {
 
 	// Custom Block's textarea
-	$notice_for_tags = '<span style="font-size:x-small;font-weight:bold;">'._AM_USEFULTAGS.'</span><br /><span style="font-size:x-small;font-weight:normal;">'.sprintf(_AM_BLOCKTAG1, '{X_SITEURL}', XOOPS_URL.'/').'</span>' ;
+	$notice_for_tags = '<span style="font-size:x-small;font-weight:bold;">'._AM_APCAL_USEFULTAGS.'</span><br /><span style="font-size:x-small;font-weight:normal;">'.sprintf(_AM_APCAL_BLOCKTAG1, '{X_SITEURL}', XOOPS_URL.'/').'</span>' ;
 	$current_op = @$_GET['op'] == 'clone' ? 'clone' : 'edit' ;
 	$uri_to_myself = XOOPS_URL . "/modules/blocksadmin/admin/admin.php?fct=blocksadmin&amp;op=$current_op&amp;bid={$block['bid']}" ;
 	// $can_use_spaw = check_browser_can_use_spaw() ;
@@ -73,12 +73,12 @@
 		ob_start() ;
 		$sw = new SPAW_Wysiwyg( 'bcontent' , $block['content'] ) ;
 		$sw->show() ;
-		$textarea = new XoopsFormLabel( _AM_CONTENT , ob_get_contents() ) ;
+		$textarea = new XoopsFormLabel( _AM_APCAL_CONTENT , ob_get_contents() ) ;
 		$textarea->setDescription( $notice_for_tags . "<br /><br /><a href='$uri_to_myself&amp;usespaw=0'>NORMAL</a>" ) ;
 		ob_end_clean() ;
 	} else {
 		$myts =& MyTextSanitizer::getInstance();
-		$textarea = new XoopsFormDhtmlTextArea(_AM_CONTENT, 'bcontent', $myts->htmlSpecialChars( $block['content'] ) , 15, 70);
+		$textarea = new XoopsFormDhtmlTextArea(_AM_APCAL_CONTENT, 'bcontent', $myts->htmlSpecialChars( $block['content'] ) , 15, 70);
 		if( $can_use_spaw ) {
 			$textarea->setDescription( $notice_for_tags . "<br /><br /><a href='$uri_to_myself&amp;usespaw=1'>SPAW</a>" ) ;
 		} else {
@@ -87,27 +87,27 @@
 	}
 	$form->addElement($textarea, true);
 
-	$ctype_select = new XoopsFormSelect(_AM_CTYPE, 'bctype', $block['ctype']);
-	$ctype_select->addOptionArray(array('H' => _AM_HTML, 'P' => _AM_PHP, 'S' => _AM_AFWSMILE, 'T' => _AM_AFNOSMILE));
+	$ctype_select = new XoopsFormSelect(_AM_APCAL_CTYPE, 'bctype', $block['ctype']);
+	$ctype_select->addOptionArray(array('H' => _AM_APCAL_HTML, 'P' => _AM_APCAL_PHP, 'S' => _AM_APCAL_AFWSMILE, 'T' => _AM_APCAL_AFNOSMILE));
 	$form->addElement($ctype_select);
 } else {
 	if ($block['template'] != '' && ! defined('XOOPS_ORETEKI') ) {
 		$tplfile_handler =& xoops_gethandler('tplfile');
 		$btemplate =& $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $block['bid']);
 		if (count($btemplate) > 0) {
-			$form->addElement(new XoopsFormLabel(_AM_CONTENT, '<a href="mytplsform.php?tpl_file='.$btemplate[0]->getVar('tpl_file').'&amp;tpl_tplset='.htmlspecialchars($GLOBALS['xoopsConfig']['template_set'],ENT_QUOTES).'">'._AM_EDITTPL.'</a>'));
+			$form->addElement(new XoopsFormLabel(_AM_APCAL_CONTENT, '<a href="mytplsform.php?tpl_file='.$btemplate[0]->getVar('tpl_file').'&amp;tpl_tplset='.htmlspecialchars($GLOBALS['xoopsConfig']['template_set'],ENT_QUOTES).'">'._AM_APCAL_EDITTPL.'</a>'));
 		} else {
 			$btemplate2 =& $tplfile_handler->find('default', 'block', $block['bid']);
 			if (count($btemplate2) > 0) {
-				$form->addElement(new XoopsFormLabel(_AM_CONTENT, '<a href="mytplsform.php?tpl_file='.$btemplate2[0]->getVar('tpl_file').'&amp;tpl_tplset=default">'._AM_EDITTPL.'</a>'));
+				$form->addElement(new XoopsFormLabel(_AM_APCAL_CONTENT, '<a href="mytplsform.php?tpl_file='.$btemplate2[0]->getVar('tpl_file').'&amp;tpl_tplset=default">'._AM_APCAL_EDITTPL.'</a>'));
 			}
 		}
 	}
 	if ($block['edit_form'] != false) {
-		$form->addElement(new XoopsFormLabel(_AM_OPTIONS, $block['edit_form']));
+		$form->addElement(new XoopsFormLabel(_AM_APCAL_OPTIONS, $block['edit_form']));
 	}
 }
-$cache_select = new XoopsFormSelect(_AM_BCACHETIME, 'bcachetime', $block['cachetime']);
+$cache_select = new XoopsFormSelect(_AM_APCAL_BCACHETIME, 'bcachetime', $block['cachetime']);
 $cache_select->addOptionArray(array('0' => _NOCACHE, '30' => sprintf(_SECONDS, 30), '60' => _MINUTE, '300' => sprintf(_MINUTES, 5), '1800' => sprintf(_MINUTES, 30), '3600' => _HOUR, '18000' => sprintf(_HOURS, 5), '86400' => _DAY, '259200' => sprintf(_DAYS, 3), '604800' => _WEEK, '2592000' => _MONTH));
 $form->addElement($cache_select);
 if (isset($block['bid'])) {

Modified: XoopsModules/APCal/trunk/modules/APCal/admin/myblocksadmin.php
===================================================================
--- XoopsModules/APCal/trunk/modules/APCal/admin/myblocksadmin.php	2013-04-29 06:59:52 UTC (rev 11478)
+++ XoopsModules/APCal/trunk/modules/APCal/admin/myblocksadmin.php	2013-04-29 17:55:58 UTC (rev 11479)
@@ -59,7 +59,7 @@
 
 $group_defs = file( "$xoops_system_path/language/$language/admin/groups.php" ) ;
 foreach( $group_defs as $def ) {
-	if( strstr( $def , '_AM_ACCESSRIGHTS' ) || strstr( $def , '_AM_ACTIVERIGHTS' ) ) eval( $def ) ;
+	if( strstr( $def , '_AM_APCAL_ACCESSRIGHTS' ) || strstr( $def , '_AM_APCAL_ACTIVERIGHTS' ) ) eval( $def ) ;
 }
 
 
@@ -115,12 +115,12 @@
 	<form action='admin.php' name='blockadmin' method='post'>
 		<table width='95%' class='outer' cellpadding='4' cellspacing='1'>
 		<tr valign='middle'>
-			<th>"._AM_TITLE."</th>
-			<th align='center' nowrap='nowrap'>"._AM_SIDE."</th>
-			<th align='center'>"._AM_WEIGHT."</th>
-			<th align='center'>"._AM_VISIBLEIN."</th>
-			<th align='center'>"._AM_BCACHETIME."</th>
-			<th align='right'>"._AM_ACTION."</th>
+			<th>"._AM_APCAL_TITLE."</th>
+			<th align='center' nowrap='nowrap'>"._AM_APCAL_SIDE."</th>
+			<th align='center'>"._AM_APCAL_WEIGHT."</th>
+			<th align='center'>"._AM_APCAL_VISIBLEIN."</th>
+			<th align='center'>"._AM_APCAL_BCACHETIME."</th>
+			<th align='right'>"._AM_APCAL_ACTION."</th>
 		</tr>\n" ;
 
 	// blocks displaying loop
@@ -185,8 +185,8 @@
 		$criteria = new CriteriaCompo(new Criteria('hasmain', 1));
 		$criteria->add(new Criteria('isactive', 1));
 		$module_list =& $module_handler->getList($criteria);
-		$module_list[-1] = _AM_TOPPAGE;
-		$module_list[0] = _AM_ALLPAGES;
+		$module_list[-1] = _AM_APCAL_TOPPAGE;
+		$module_list[0] = _AM_APCAL_ALLPAGES;
 		ksort($module_list);
 		$module_options = '' ;
 		foreach( $module_list as $mid => $mname ) {
@@ -316,10 +316,10 @@
 		$item_list[ $block_arr[$i]->getVar("bid") ] = $block_arr[$i]->getVar("title") ;
 	}
 
-	$form = new MyXoopsGroupPermForm( _MD_AM_ADGS , 1 , 'block_read' , '' ) ;
+	$form = new MyXoopsGroupPermForm( _AM_APCAL_ADGS , 1 , 'block_read' , '' ) ;
 	if( $target_mid > 1 ) {
-		$form->addAppendix( 'module_admin' , $target_mid , $target_mname . ' ' . _AM_ACTIVERIGHTS ) ;
-		$form->addAppendix( 'module_read' , $target_mid , $target_mname .' ' . _AM_ACCESSRIGHTS ) ;
+		$form->addAppendix( 'module_admin' , $target_mid , $target_mname . ' ' . _AM_APCAL_ACTIVERIGHTS ) ;
+		$form->addAppendix( 'module_read' , $target_mid , $target_mname .' ' . _AM_APCAL_ACCESSRIGHTS ) ;
 	}
 	foreach( $item_list as $item_id => $item_name) {
 			$form->addItem( $item_id , $item_name ) ;
@@ -335,7 +335,7 @@
 	}
 
 	include( "mygroupperm.php" ) ;
-	redirect_header( XOOPS_URL."/modules/".$xoopsModule->dirname()."/admin/myblocksadmin.php$query4redirect" , 1 , _MD_AM_DBUPDATED );
+	redirect_header( XOOPS_URL."/modules/".$xoopsModule->dirname()."/admin/myblocksadmin.php$query4redirect" , 1 , _MD_APCALAM_APCALDBUPDATED );
 }
 
 xoops_cp_header() ;
@@ -343,7 +343,7 @@
 echo "<h3 style='text-align:left;'>$target_mname</h3>\n" ;
 
 if( ! empty( $block_arr ) ) {
-	echo "<h4 style='text-align:left;'>"._AM_BADMIN."</h4>\n" ;
+	echo "<h4 style='text-align:left;'>"._AM_APCAL_BADMIN."</h4>\n" ;
 	list_blocks() ;
 }
 

Modified: XoopsModules/APCal/trunk/modules/APCal/admin/myblocksadmin2.php
===================================================================
--- XoopsModules/APCal/trunk/modules/APCal/admin/myblocksadmin2.php	2013-04-29 06:59:52 UTC (rev 11478)
+++ XoopsModules/APCal/trunk/modules/APCal/admin/myblocksadmin2.php	2013-04-29 17:55:58 UTC (rev 11479)
@@ -28,7 +28,7 @@
 
 $group_defs = file( "$xoops_system_path/language/$language/admin/groups.php" ) ;
 foreach( $group_defs as $def ) {
-	if( strstr( $def , '_AM_ACCESSRIGHTS' ) || strstr( $def , '_AM_ACTIVERIGHTS' ) ) eval( $def ) ;
+	if( strstr( $def , '_AM_APCAL_ACCESSRIGHTS' ) || strstr( $def , '_AM_APCAL_ACTIVERIGHTS' ) ) eval( $def ) ;
 }
 
 
@@ -92,12 +92,12 @@
 	<form action='admin.php' name='blockadmin' method='post'>
 		<table width='95%' class='outer' cellpadding='4' cellspacing='1'>
 		<tr valign='middle'>
-			<th>"._AM_TITLE."</th>
-			<th align='center' nowrap='nowrap'>"._AM_SIDE."</th>
-			<th align='center'>"._AM_WEIGHT."</th>
-			<th align='center'>"._AM_VISIBLEIN."</th>
-			<th align='center'>"._AM_BCACHETIME."</th>
-			<th align='right'>"._AM_ACTION."</th>
+			<th>"._AM_APCAL_TITLE."</th>
+			<th align='center' nowrap='nowrap'>"._AM_APCAL_SIDE."</th>
+			<th align='center'>"._AM_APCAL_WEIGHT."</th>
+			<th align='center'>"._AM_APCAL_VISIBLEIN."</th>
+			<th align='center'>"._AM_APCAL_BCACHETIME."</th>
+			<th align='right'>"._AM_APCAL_ACTION."</th>
 		</tr>\n" ;
 
 	// get block instances
@@ -108,16 +108,16 @@
 	$instances =& $instance_handler->getObjects($criteria, true, true);
 
 	//Get modules and pages for visible in
-	$module_list[_AM_SYSTEMLEVEL]["0-2"] = _AM_ADMINBLOCK;
-	$module_list[_AM_SYSTEMLEVEL]["0-1"] = _AM_TOPPAGE;
-	$module_list[_AM_SYSTEMLEVEL]["0-0"] = _AM_ALLPAGES;
+	$module_list[_AM_APCAL_SYSTEMLEVEL]["0-2"] = _AM_APCAL_ADMINBLOCK;
+	$module_list[_AM_APCAL_SYSTEMLEVEL]["0-1"] = _AM_APCAL_TOPPAGE;
+	$module_list[_AM_APCAL_SYSTEMLEVEL]["0-0"] = _AM_APCAL_ALLPAGES;
 	$criteria = new CriteriaCompo(new Criteria('hasmain', 1));
 	$criteria->add(new Criteria('isactive', 1));
 	$module_handler =& xoops_gethandler('module');
 	$module_main =& $module_handler->getObjects($criteria, true, true);
 	if (count($module_main) > 0) {
 		foreach (array_keys($module_main) as $mid) {
-			$module_list[$module_main[$mid]->getVar('name')][$mid."-0"] = _AM_ALLMODULEPAGES;
+			$module_list[$module_main[$mid]-...
 
[truncated message content]