Revision: 6529
          http://care2002.svn.sourceforge.net/care2002/?rev=6529&view=rev
Author:   mizuko
Date:     2010-06-30 16:22:28 +0000 (Wed, 30 Jun 2010)

Log Message:
-----------
see #54

Modified Paths:
--------------
    
care2x/branches/gettext/gui/smarty_template/templates/default/tech/repair_request.tpl
    care2x/branches/gettext/modules/tech/tech.php

Modified: 
care2x/branches/gettext/gui/smarty_template/templates/default/tech/repair_request.tpl
===================================================================
--- 
care2x/branches/gettext/gui/smarty_template/templates/default/tech/repair_request.tpl
       2010-06-30 16:18:30 UTC (rev 6528)
+++ 
care2x/branches/gettext/gui/smarty_template/templates/default/tech/repair_request.tpl
       2010-06-30 16:22:28 UTC (rev 6529)
@@ -1,9 +1,5 @@
 {{* Repair request input form. repair_request.tpl 2004-06-12 Elpidio Latorilla 
*}}
-<<<<<<< .mine
 {{* Used by /modules/tech/tech-repair-request.php *}}
-=======
-{{* Used by /modules/tech/tech-reparatur-anfordern.php *}}
->>>>>>> .r6505
 {{* Note: never rename the input, when redimensioning or repositioning it  *}}
 
 <ul>

Modified: care2x/branches/gettext/modules/tech/tech.php
===================================================================
--- care2x/branches/gettext/modules/tech/tech.php       2010-06-30 16:18:30 UTC 
(rev 6528)
+++ care2x/branches/gettext/modules/tech/tech.php       2010-06-30 16:22:28 UTC 
(rev 6529)
@@ -107,7 +107,7 @@
 # Prepare the submenu item descriptions
 
 $aSubMenuText=array($LDReRepairTxt,
-                                                                               
$LDRepabotActivateTxt,
+                                                                               
$LDRepairbotActivateTxt,
                                                                                
$LDRepairReportTxt,
                                                                                
$LDReportsArchiveTxt,
                                                                                
$LDQuestionsTxt,
@@ -117,7 +117,7 @@
 # Prepare the submenu item links indexed by their template tags
 
 $aSubMenuItem=array('LDPharmaOrder' => "<a 
href=\"tech-repair-request.php".URL_APPEND."\">$LDReRepair</a>",
-                                                                               
'LDHow2Order' => "<a 
href=\"tech-bot-pass.php".URL_APPEND."&mode=repabot\">$LDRepabotActivate</a>",
+                                                                               
'LDHow2Order' => "<a 
href=\"tech-bot-pass.php".URL_APPEND."&mode=repabot\">$LDRepairbotActivate</a>",
                                                                                
'LDOrderCat' => "<a 
href=\"tech-repair-advice.php".URL_APPEND."\">$LDRepairReport</a>",
                                                                                
'LDOrderArchive' => "<a 
href=\"tech-report-archive.php".URL_APPEND."\">$LDReportsArchive</a>",
                                                                                
'LDPharmaDb' => "<a href=\"tech-questions.php".URL_APPEND."\">$LDQuestions</a>",


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Care2002-developers mailing list
Care2002-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/care2002-developers

Reply via email to