From 61fe60646d024a181a8f0d1ea13fc2c98e1f2b2a Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Mon, 19 Jan 2009 11:07:30 +0100
Subject: [PATCH] Translation -> Babel

---
 babel/commit.php                                   |   2 +-
 babel/config/hooks.php.dist                        |   8 +++---
 babel/edit.php                                     |   8 +++---
 babel/extract.php                                  |   8 +++---
 babel/lib/{Translation.php => Babel.php}           |  30 ++++++++++-----------
 babel/lib/api.php                                  |  30 ++++++++++-----------
 babel/lib/base.php                                 |  28 +++++++++----------
 babel/make.php                                     |   8 +++---
 babel/po/{translation.pot => babel.pot}            |   0
 babel/reset.php                                    |   8 +++---
 babel/stats.php                                    |  14 +++++-----
 babel/templates/common-header.inc                  |   2 +-
 babel/templates/index.php                          |   2 +-
 .../themes/graphics/{translation.png => babel.png} | Bin
 babel/themes/graphics/skeleton.png                 | Bin 743 -> 0 bytes
 babel/upload.php                                   |   2 +-
 babel/view.php                                     |  22 +++++++--------
 17 files changed, 86 insertions(+), 86 deletions(-)
 rename babel/lib/{Translation.php => Babel.php} (89%)
 rename babel/po/{translation.pot => babel.pot} (100%)
 rename babel/themes/graphics/{translation.png => babel.png} (100%)
 delete mode 100644 babel/themes/graphics/skeleton.png

diff --git a/babel/commit.php b/babel/commit.php
index f3d62ab43..809e639bc 100644
--- a/babel/commit.php
+++ b/babel/commit.php
@@ -45,7 +45,7 @@ if ($custom_commit) {
 	
 	if (@file_exists($po)) {
 	    Translate_Display::info(_("Commit") . " $po ($lang)");
-	    Translation::callHook('commit', array($po, $lang));
+	    Babel::callHook('commit', array($po, $lang));
 	}
 	
     }
diff --git a/babel/config/hooks.php.dist b/babel/config/hooks.php.dist
index ae9ac5c3c..57602d196 100644
--- a/babel/config/hooks.php.dist
+++ b/babel/config/hooks.php.dist
@@ -1,7 +1,7 @@
 <?php
 
-if (!function_exists('_translation_hook_commit')) {
-    function _translation_hook_commit($info)
+if (!function_exists('_babel_hook_commit')) {
+    function _babel_hook_commit($info)
     {
 	$po   = $info[0];
 	$lang = $info[1];
@@ -10,8 +10,8 @@ if (!function_exists('_translation_hook_commit')) {
     }
 }
 
-if (!function_exists('_translation_hook_reset')) {
-    function _translation_hook_reset($po)
+if (!function_exists('_babel_hook_reset')) {
+    function _babel_hook_reset($po)
     {
 
 	$cmd = "rm -rf $po";
diff --git a/babel/edit.php b/babel/edit.php
index 1b6985469..fa642bb9f 100644
--- a/babel/edit.php
+++ b/babel/edit.php
@@ -10,7 +10,7 @@
  */
 
 $meta_params = array(
-		     "Project-Id-Version" => @$_SESSION['translation']['language'],
+		     "Project-Id-Version" => @$_SESSION['babel']['language'],
 		     "Report-Msgid-Bugs-To" => "support@scopserv.com",
 		     "POT-Creation-Date" => "",
 		     "PO-Revision-Date" => "",
@@ -39,13 +39,13 @@ $vars = &Variables::getDefaultVariables();
 
 if ($app) {
     $napp = ($app == 'horde') ? '' : $app;
-    $pofile = HORDE_BASE . '/' . $napp . '/po/' . $_SESSION['translation']['language'] . '.po';
+    $pofile = HORDE_BASE . '/' . $napp . '/po/' . $_SESSION['babel']['language'] . '.po';
     $po = &new File_Gettext_PO();
     $po->load($pofile);
 }
 
 /* Set up the template fields. */
-$template->set('menu', Translation::getMenu('string'));
+$template->set('menu', Babel::getMenu('string'));
 $template->set('notify', Util::bufferOutput(array($notification, 'notify'), array('listeners' => 'status')));
 
 /* Create upload form */
@@ -76,7 +76,7 @@ if ($app && Util::getFormData('submitbutton') == _("Save")) {
 
 if (!$app) {
     $form->setButtons(_("Edit"));
-    $form->addVariable(_("Module"), 'module', 'enum', true, false, null, array(Translation::listApps(), true));
+    $form->addVariable(_("Module"), 'module', 'enum', true, false, null, array(Babel::listApps(), true));
     $form->addVariable('', '', 'spacer', true);
 } else {
 
diff --git a/babel/extract.php b/babel/extract.php
index 57ad0deb6..1ab3aba08 100644
--- a/babel/extract.php
+++ b/babel/extract.php
@@ -15,14 +15,14 @@ set_time_limit(0);
 require_once BABEL_BASE . '/lib/base.php';
 
 if ($app) {
-    Translation::RB_init();
+    Babel::RB_init();
 }
 
 /* Render the page. */
 require BABEL_TEMPLATES . '/common-header.inc';
 
 if ($app) {
-    Translation::RB_start(300);
+    Babel::RB_start(300);
 }
 
 echo $template->fetch(BABEL_TEMPLATES . '/layout.html');
@@ -34,7 +34,7 @@ $form = &new Horde_Form($vars, _("Extract Translation"), 'extract');
 
 if (!$app) {
     $form->setButtons(_("Extract"));
-    $form->addVariable(_("Module"), 'module', 'enum', true, false, null, array(Translation::listApps(true), true));
+    $form->addVariable(_("Module"), 'module', 'enum', true, false, null, array(Babel::listApps(true), true));
     $form->addVariable('', '', 'spacer', true);
     
     $renderer_params = array();
@@ -113,7 +113,7 @@ if (!$app) {
     Translate_Display::info();
     Translate_Display::header(_("Done!"));
     
-    Translation::RB_close();
+    Babel::RB_close();
 }
 
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff --git a/babel/lib/Translation.php b/babel/lib/Babel.php
similarity index 89%
rename from babel/lib/Translation.php
rename to babel/lib/Babel.php
index 06c173645..8037f0262 100644
--- a/babel/lib/Translation.php
+++ b/babel/lib/Babel.php
@@ -9,14 +9,14 @@
  * @package Babel
  */
 
-class Translation {
+class Babel {
 
     function callHook($fname, $info) {
 	/* Check if an hooks file exist */
 	if (file_exists(BABEL_BASE . '/config/hooks.php')) {
 	    include_once BABEL_BASE . '/config/hooks.php';
 	    
-	    $func = '_translation_hook_' . $fname;
+	    $func = '_babel_hook_' . $fname;
 	    
 	    if (function_exists($func)) {
 		$res = call_user_func($func, $info);
@@ -50,10 +50,10 @@ class Translation {
 	$html .= '<form action="' . Horde::selfUrl() . '" method="post" name="moduleSelector">';
 	$html .= '<select name="module" onchange="moduleSubmit()">';
 	
-	$apps = array('ALL' => _("All Applications")) +  Translation::listApps();
+	$apps = array('ALL' => _("All Applications")) +  Babel::listApps();
 	
 	foreach($apps as $app => $desc) {
-	    if (!Translation::hasPermission("module:$app")) {
+	    if (!Babel::hasPermission("module:$app")) {
 		continue;
 	    }
 	    
@@ -97,11 +97,11 @@ class Translation {
 	unset($tests['en_US']);
 	
 	foreach($tests as $dir => $desc) {
-	    if (!Translation::hasPermission("language:$dir")) {
+	    if (!Babel::hasPermission("language:$dir")) {
 		continue;
 	    }
 	    
-	    if (isset($_SESSION['translation']['language']) && $dir == $_SESSION['translation']['language']) {
+	    if (isset($_SESSION['babel']['language']) && $dir == $_SESSION['babel']['language']) {
 		$html .= '<option class="control" value="' . $dir . '" selected>' .  '+ ' . $desc;
 	    } else {
 		$html .= '<option value="' . $dir . '">' . '&#8211; ' . $desc;
@@ -148,7 +148,7 @@ class Translation {
 		continue;
 	    }
 	    
-	    if (Translation::hasPermission("module:$app")) {
+	    if (Babel::hasPermission("module:$app")) {
 		$res[$app] = sprintf("%s (%s)", $params['name'], $app);
 	    }
 	}
@@ -167,16 +167,16 @@ class Translation {
 	$userId = Auth::getAuth();
 	$admin = ($userId == 'admin') ? true : false;
 	
-	if ($admin || !$perms->exists('translation:' . $permission)) {
+	if ($admin || !$perms->exists('babel:' . $permission)) {
 	    return true;
 	}
 	
-	$allowed = $perms->getPermissions('translation:' . $permission);
+	$allowed = $perms->getPermissions('babel:' . $permission);
 	
 	switch ($filter) {
 	 case 'tabs':
 	    if ($perm) {
-		$allowed  = $perms->hasPermission('translation:' . $permission, Auth::getAuth(), $perm);
+		$allowed  = $perms->hasPermission('babel:' . $permission, Auth::getAuth(), $perm);
 	    }
 	    break;
 	}
@@ -197,31 +197,31 @@ class Translation {
 			      'text' => _("_General"),
 			      'icon' => 'list.png'));
 
-	if (Translation::hasPermission('view')) {
+	if (Babel::hasPermission('view')) {
 	    $menu->addArray(array('url' => Horde::applicationUrl('view.php'),
 				  'text' => _("_View"),
 				  'icon' => 'view.png'));
 	}
 	
-	if (Translation::hasPermission('stats')) {
+	if (Babel::hasPermission('stats')) {
 	    $menu->addArray(array('url' => Horde::applicationUrl('stats.php'),
 				  'text' => _("_Stats"),
 				  'icon' => 'extract.png'));
 	}
 	
-	if (Translation::hasPermission('extract')) {
+	if (Babel::hasPermission('extract')) {
 	    $menu->addArray(array('url' => Horde::applicationUrl('extract.php'),
 				  'text' => _("_Extract"),
 				  'icon' => 'extract.png'));
 	}
 	
-	if (Translation::hasPermission('make')) {
+	if (Babel::hasPermission('make')) {
 	    $menu->addArray(array('url' => Horde::applicationUrl('make.php'),
 				  'text' => _("_Make"),
 				  'icon' => 'make.png'));
 	}
 
-	if (Translation::hasPermission('upload')) {
+	if (Babel::hasPermission('upload')) {
 	    $menu->addArray(array('url' => Horde::applicationUrl('upload.php'),
 				  'text' => _("_Upload"),
 				  'icon' => 'upload.png'));
diff --git a/babel/lib/api.php b/babel/lib/api.php
index e0c49af91..58a2a52aa 100644
--- a/babel/lib/api.php
+++ b/babel/lib/api.php
@@ -17,7 +17,7 @@ $_services['perms'] = array(
     'type' => '{urn:horde}hash'
 );
 
-function _translation_perms()
+function _babel_perms()
 {
 
     global $nls, $registry;
@@ -27,19 +27,19 @@ function _translation_perms()
 	return $perms;
     }
 
-    $perms['tree']['translation']['language'] = array();
-    $perms['title']['translation:language'] = _("Languages");
-    $perms['type']['translation:language']  = 'none';
+    $perms['tree']['babel']['language'] = array();
+    $perms['title']['babel:language'] = _("Languages");
+    $perms['type']['babel:language']  = 'none';
     
     foreach($nls['languages'] as $langcode => $langdesc) {
-	$perms['tree']['translation']['language'][$langcode] = false;
-	$perms['title']['translation:language:' . $langcode] = sprintf("%s (%s)", $langdesc, $langcode);
-	$perms['type']['translation:language:' . $langcode] = 'boolean';
+	$perms['tree']['babel']['language'][$langcode] = false;
+	$perms['title']['babel:language:' . $langcode] = sprintf("%s (%s)", $langdesc, $langcode);
+	$perms['type']['babel:language:' . $langcode] = 'boolean';
     }
 
-    $perms['tree']['translation']['module'] = array();
-    $perms['title']['translation:module'] = _("Modules");
-    $perms['type']['translation:module']  = 'none';
+    $perms['tree']['babel']['module'] = array();
+    $perms['title']['babel:module'] = _("Modules");
+    $perms['type']['babel:module']  = 'none';
     
     foreach ($registry->applications as $app => $params) {
 	if ($params['status'] == 'heading' || $params['status'] == 'block') {
@@ -54,9 +54,9 @@ function _translation_perms()
 	    continue;
 	}
 	
-	$perms['tree']['translation']['module'][$app] = false;
-	$perms['title']['translation:module:' . $app] = sprintf("%s (%s)", $params['name'], $app);
-	$perms['type']['translation:module:' . $app] = 'boolean';
+	$perms['tree']['babel']['module'][$app] = false;
+	$perms['title']['babel:module:' . $app] = sprintf("%s (%s)", $params['name'], $app);
+	$perms['type']['babel:module:' . $app] = 'boolean';
     }
 
     $tabdesc['download']   = _("Download");
@@ -70,8 +70,8 @@ function _translation_perms()
     $tabdesc['reset']      = _("Reset");
     
     foreach ($tabdesc as $cat => $desc) {
-	$perms['tree']['translation'][$cat] = array();
-	$perms['title']['translation:' . $cat] = $desc;
+	$perms['tree']['babel'][$cat] = array();
+	$perms['title']['babel:' . $cat] = $desc;
     }
     
     return $perms;
diff --git a/babel/lib/base.php b/babel/lib/base.php
index 93283a14c..dd822189c 100644
--- a/babel/lib/base.php
+++ b/babel/lib/base.php
@@ -29,7 +29,7 @@ $notification->attach('status');
 /* Registry. */
 $registry = &Registry::singleton();
 
-if (is_a(($pushed = $registry->pushApp('translation', !defined('AUTH_HANDLER'))), 'PEAR_Error')) {
+if (is_a(($pushed = $registry->pushApp('babel', !defined('AUTH_HANDLER'))), 'PEAR_Error')) {
     if ($pushed->getCode() == 'permission_denied') {
         Horde::authenticationFailureRedirect(); 
     }
@@ -42,8 +42,8 @@ $conf = &$GLOBALS['conf'];
 /* Horde base libraries */
 require_once 'Horde/Secret.php';
 
-/* Translation base library */
-require_once BABEL_BASE . '/lib/Translation.php';
+/* Babel base library */
+require_once BABEL_BASE . '/lib/Babel.php';
 require_once BABEL_BASE . '/lib/Translate.php';
 require_once BABEL_BASE . '/lib/Translate_Help.php';
 require_once BABEL_BASE . '/lib/Display.php';
@@ -76,9 +76,9 @@ $app = Util::getFormData('module');
   
 /* Language selection */
 if (($lang = Util::getFormData('display_language')) !== null) {
-    $_SESSION['translation']['language'] = $lang;
-} elseif (isset($_SESSION['translation']['language'])) {
-    $lang = $_SESSION['translation']['language'];
+    $_SESSION['babel']['language'] = $lang;
+} elseif (isset($_SESSION['babel']['language'])) {
+    $lang = $_SESSION['babel']['language'];
 } else {
     
     $tests =  $nls['languages'];
@@ -87,33 +87,33 @@ if (($lang = Util::getFormData('display_language')) !== null) {
     unset($tests['en_US']);
     
     foreach($tests as $dir => $desc) {
-	if (!Translation::hasPermission("language:$dir")) {
+	if (!Babel::hasPermission("language:$dir")) {
 	    continue;
 	} else {
 	    $lang = $dir;
 	    break;
 	}
     }
-    $_SESSION['translation']['language'] = $lang;
+    $_SESSION['babel']['language'] = $lang;
 }
 						  
 /* Set up the template fields. */
-$template->set('menu', Translation::getMenu('string'));
+$template->set('menu', Babel::getMenu('string'));
 $template->set('notify', Util::bufferOutput(array($notification, 'notify'), array('listeners' => 'status')));
-$template->set('lang', Translation::displayLanguage());
-$fmenu = Translation::LanguageSelection();
+$template->set('lang', Babel::displayLanguage());
+$fmenu = Babel::LanguageSelection();
 
 // Only display the Module Selection widget if an application has been set
 if ($app) {
-    $fmenu .= Translation::ModuleSelection();
+    $fmenu .= Babel::ModuleSelection();
 }
 $template->set('fmenu', $fmenu);
 
-if ($lang && !Translation::hasPermission("language:$lang")) {
+if ($lang && !Babel::hasPermission("language:$lang")) {
     Horde::fatal(sprintf(_("Access forbidden to '%s'."), $lang), __FILE__, __LINE__, true);
 }
 
-if ($app && !Translation::hasPermission("module:$app")) {
+if ($app && !Babel::hasPermission("module:$app")) {
     Horde::fatal(sprintf(_("Access forbidden to '%s'."), $app), __FILE__, __LINE__, true);
 }
 
diff --git a/babel/make.php b/babel/make.php
index 91b7f1eae..d31221a5d 100644
--- a/babel/make.php
+++ b/babel/make.php
@@ -16,13 +16,13 @@ require_once BABEL_BASE . '/lib/base.php';
 
 if ($app) {
     /* Render the page. */
-    Translation::RB_init();
+    Babel::RB_init();
 }
 
 require BABEL_TEMPLATES . '/common-header.inc';
 
 if ($app) {
-    Translation::RB_start(30);
+    Babel::RB_start(30);
 }
 
 echo $template->fetch(BABEL_TEMPLATES . '/layout.html');
@@ -34,7 +34,7 @@ $form = &new Horde_Form($vars, _("Make Translation"), 'make');
 
 if (!$app) {
     $form->setButtons(_("Make"));
-    $form->addVariable(_("Module"), 'module', 'enum', true, false, null, array(Translation::listApps(true), true));
+    $form->addVariable(_("Module"), 'module', 'enum', true, false, null, array(Babel::listApps(true), true));
     $form->addVariable('', '', 'spacer', true);
     
     $renderer_params = array();
@@ -70,7 +70,7 @@ if (!$app) {
     Translate_Display::info();
     Translate::make();
     
-    Translation::RB_close();
+    Babel::RB_close();
 }
 
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff --git a/babel/po/translation.pot b/babel/po/babel.pot
similarity index 100%
rename from babel/po/translation.pot
rename to babel/po/babel.pot
diff --git a/babel/reset.php b/babel/reset.php
index e419b3d90..e532360a2 100644
--- a/babel/reset.php
+++ b/babel/reset.php
@@ -12,12 +12,12 @@
 @define('BABEL_BASE', dirname(__FILE__)) ;
 require_once BABEL_BASE . '/lib/base.php';
 
-Translation::RB_init();
+Babel::RB_init();
 
 /* Render the page. */
 require BABEL_TEMPLATES . '/common-header.inc';
 
-Translation::RB_start(15);
+Babel::RB_start(15);
 
 echo $template->fetch(BABEL_TEMPLATES . '/layout.html');
 
@@ -41,13 +41,13 @@ foreach($dirs as $d => $dir) {
     $po  = $dir . '/po/' . $lang . '.po';
     
     Translate_Display::info(_("Reset PO file on ") . $po);
-    Translation::callHook('reset', $po);
+    Babel::callHook('reset', $po);
 
 }
 
 Translate_Display::info();
 Translate::cleanup(true);
 
-Translation::RB_close();
+Babel::RB_close();
 
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff --git a/babel/stats.php b/babel/stats.php
index 3a6ea801e..2841e6a71 100644
--- a/babel/stats.php
+++ b/babel/stats.php
@@ -14,12 +14,12 @@ require_once BABEL_BASE . '/lib/base.php';
 
 if ($app) {
     /* Render the page. */
-    Translation::RB_init();
+    Babel::RB_init();
 }
 require BABEL_TEMPLATES . '/common-header.inc';
 
 if ($app) {
-    Translation::RB_start(30);
+    Babel::RB_start(30);
 }
 echo $template->fetch(BABEL_TEMPLATES . '/layout.html');
 
@@ -30,7 +30,7 @@ $form = &new Horde_Form($vars, _("View Statistics"), 'stats');
 
 if (!$app) {
     $form->setButtons(_("View"));
-    $form->addVariable(_("Module"), 'module', 'enum', true, false, null, array(Translation::listApps(true), true));
+    $form->addVariable(_("Module"), 'module', 'enum', true, false, null, array(Babel::listApps(true), true));
     $form->addVariable('', '', 'spacer', true);
     
     $renderer_params = array();
@@ -64,7 +64,7 @@ if (!$app) {
 	    continue;
 	}
 
-	if (!Translation::hasPermission("module:$_app")) {
+	if (!Babel::hasPermission("module:$_app")) {
 	    continue;
 	}
 	
@@ -89,11 +89,11 @@ if (!$app) {
 	$last_key = null;
 	foreach ($report as $key => $value) {
 	    
-	    if (!Translation::hasPermission("language:$key")) {
+	    if (!Babel::hasPermission("language:$key")) {
 		continue;
 	    }
 
-	    if ($key == $_SESSION['translation']['language']) {
+	    if ($key == $_SESSION['babel']['language']) {
 		echo "\n<tr class=\"smallheader control\">";
 	    } else {
 		echo "\n<tr class=\"item" . ($i++ % 2) . "\">";
@@ -114,7 +114,7 @@ if (!$app) {
 	Translate_Display::info();
     }
     
-    Translation::RB_close();
+    Babel::RB_close();
 }
 
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff --git a/babel/templates/common-header.inc b/babel/templates/common-header.inc
index a99bc08ca..5c7c1ba4c 100644
--- a/babel/templates/common-header.inc
+++ b/babel/templates/common-header.inc
@@ -19,7 +19,7 @@ Horde::includeScriptFiles();
 
 ?>
 <title><?php echo $page_title ?></title>
-<?php echo Horde::stylesheetLink('translation') ?>
+<?php echo Horde::stylesheetLink('babel') ?>
 </head>
 
 <body<?php if (Util::nonInputVar('bodyClass')) echo ' class="' . $bodyClass . '"' ?>>
diff --git a/babel/templates/index.php b/babel/templates/index.php
index 18fc496af..e5b5f6f4a 100644
--- a/babel/templates/index.php
+++ b/babel/templates/index.php
@@ -67,7 +67,7 @@ $cmds['reset'] = array(
 $i = 0;
 
 foreach($cmds as $cmdid => $cmd) {
-    if (Translation::hasPermission($cmdid)) {
+    if (Babel::hasPermission($cmdid)) {
 	echo '<tr height="50" class="item' . ($i++ % 2) . '">';
 	echo '<td align="center"><div style="width: 140px;" onclick="window.location=\'' . $cmd['url'] . '\';" class="button"><a class="smallheader" href="' . $cmd['url'] . '">' . $cmd['desc'] . '</a></div></td>';
 	echo '<td>' . $cmd['text'] . '</td>';
diff --git a/babel/themes/graphics/translation.png b/babel/themes/graphics/babel.png
similarity index 100%
rename from babel/themes/graphics/translation.png
rename to babel/themes/graphics/babel.png
diff --git a/babel/themes/graphics/skeleton.png b/babel/themes/graphics/skeleton.png
deleted file mode 100644
index af7b9ffddf9c42b69ef60e5d827b9a0022ffa09c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 743
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl47#jk7LR^`cn8X+uWMpKtI2g3G
z)D88uOpSG{tu6g*lpXAB0v$B+Lv?+9T!6*}2l-@1I%FogCniLfXZYsk<rEj^mY0<<
z6f6&6*w<KJ*3?)#v$t}`l<+0f^N!69xirV;(A><ki{tMt^|`Yy=kapChik%~Zc2W)
zxAw!nvhJ?7Ia3;DPM@-Ldeh?h)7Gw-yKVF8ojbSR+Sze`|CED!w>{q1bL_~z7e^<5
zIokT`^4#Z_w*0!a?9=@{zn^XV`*q*R6UWb;y>#>1nJZVXJ-%}2%cH}eUtR@zZODO#
znt}a5N4u5;`33){0$|wmZleXzK*l6*cNdqRTV@;taySb-B8!2v2N=7Z%(eqE)_b}*
zhDcnF?a$?IG7xEP*SQ{|6#aXF^TACKN7KBLRA(ps{=a`^&B8;UpT^0(v%JH6#wTGG
z$A8At5_9f;*zn~*(2M{@je~1V;}S$SX(TPbHd{xf=ljctJ9b}?Q#i%y{b=draGy^M
zj7z5U2wk6XRyjP%Ie|gs`j(RGv9;&L5>7;jKHa$Lb^7D}g$CBAm%Wbj%G%AYpi$$K
yvaz(|Su<<Zx96g*y>Ac3i=Rt>sxYT<{k?5`hMZS!J=qU*I)kUHpUXO@geCx`wk6#F

diff --git a/babel/upload.php b/babel/upload.php
index e3bc26c4c..a9b297121 100644
--- a/babel/upload.php
+++ b/babel/upload.php
@@ -17,7 +17,7 @@ $vars = &Variables::getDefaultVariables();
 /* Create upload form */
 $form = &new Horde_Form($vars, _("Upload new Translation"), 'upload');
 $form->setButtons(_("Upload"));
-$form->addVariable(_("Module"), 'module', 'enum', true, false, null, array(Translation::listApps(true), true));
+$form->addVariable(_("Module"), 'module', 'enum', true, false, null, array(Babel::listApps(true), true));
 $form->addVariable(_("Translations File (.PO)"), 'po_file', 'file', true, false);
 $form->addVariable('', '', 'spacer', true);
 
diff --git a/babel/view.php b/babel/view.php
index 4336b46f4..6f27bf520 100644
--- a/babel/view.php
+++ b/babel/view.php
@@ -14,7 +14,7 @@ require_once dirname(__FILE__) . '/lib/base.php';
 require_once 'Horde/Lock.php';
 
 $meta_params = array(
-		     "Project-Id-Version" => @$_SESSION['translation']['language'],
+		     "Project-Id-Version" => @$_SESSION['babel']['language'],
 		     "Report-Msgid-Bugs-To" => "support@scopserv.com",
 		     "POT-Creation-Date" => "",
 		     "PO-Revision-Date" => "",
@@ -34,7 +34,7 @@ $search   = Util::getFormData('search');
 
 if ($app) {
     /* Render the page. */
-    Translation::RB_init();
+    Babel::RB_init();
 }
 
 /* Render the page. */
@@ -42,9 +42,9 @@ require BABEL_TEMPLATES . '/common-header.inc';
 
 if ($app) {
     if ($editmode) {
-	Translation::RB_start(10);
+	Babel::RB_start(10);
     } else {
-	Translation::RB_start(60);
+	Babel::RB_start(60);
     }
 }
 
@@ -142,7 +142,7 @@ if ($f_save && $cstring) {
 // 
 
 /* Set up the template fields. */
-$template->set('menu', Translation::getMenu('string'));
+$template->set('menu', Babel::getMenu('string'));
 $template->set('notify', Util::bufferOutput(array($notification, 'notify'), array('listeners' => 'status')));
 
 /* Create upload form */
@@ -150,7 +150,7 @@ $form = &new Horde_Form($vars, _("View Translation"), $show);
 
 if (!$app) {
     $form->setButtons(_("View"));
-    $form->addVariable(_("Module"), 'module', 'enum', true, false, null, array(Translation::listApps(), true));
+    $form->addVariable(_("Module"), 'module', 'enum', true, false, null, array(Babel::listApps(), true));
     $form->addVariable('', '', 'spacer', true);
     
     $renderer_params = array();
@@ -160,7 +160,7 @@ if (!$app) {
     $form->renderActive($renderer, $vars, Horde::selfURL(), 'post');
 } else {
     
-    if (Translation::hasPermission('view', 'tabs', PERMS_EDIT)) {
+    if (Babel::hasPermission('view', 'tabs', PERMS_EDIT)) {
 	$hmenu_desc = _("Edit Header");
 	$url = Horde::applicationUrl('edit.php');
 	$url = Util::addParameter($url, array('module' => $app,
@@ -373,7 +373,7 @@ if (!$app) {
 		$sfile = $m[1];
 		$sline = $m[2];
 
-		if (Translation::hasPermission('viewsource', 'tabs', PERMS_EDIT)) {
+		if (Babel::hasPermission('viewsource', 'tabs', PERMS_EDIT)) {
 		    $surl = Horde::applicationUrl('viewsource.php');
 		    $surl = Util::addParameter($surl, array('module' => $app,
 							    'file'   => $sfile,
@@ -429,13 +429,13 @@ if (!$app) {
 	  if ($locked) {
 	      echo Horde::img('locked.png') . '&nbsp;' . sprintf(_("Locked by %s"), $locked);
 	  } else {
-	      if (Translation::hasPermission('view', 'tabs', PERMS_EDIT)) {
+	      if (Babel::hasPermission('view', 'tabs', PERMS_EDIT)) {
 		  if (!$editmode || $cstring != $encstr) {
 		      $surl = Horde::applicationUrl('view.php');
 		      $surl = Util::addParameter($surl, array('module' => $app, 'cstring' => $encstr, 'editmode' => 1, 'page' => $page, 'filter' => $filter, 'search' => $search));
 		      $surl .= "#" . md5($encstr);
 		      
-		      echo Horde::link($surl, _("Edit Translation")) . Horde::img('translation.png') . '&nbsp;' ._("Edit Translation") . "</a>";
+		      echo Horde::link($surl, _("Edit Translation")) . Horde::img('babel.png') . '&nbsp;' ._("Edit Translation") . "</a>";
 		  } elseif ($editmode && $cstring == $encstr) {
 		      echo '<input type="submit" class="button" name="submit" value="' . _("Save") . '">';
 		      echo '&nbsp;';
@@ -496,7 +496,7 @@ $viewurl = Util::addParameter($viewurl, array('editmode' => $editmode,
 <!-- END PAGER -->
 <?php
 if ($app) {
-    Translation::RB_close();
+    Babel::RB_close();
 }
 
 require $registry->get('templates', 'horde') . '/common-footer.inc';
-- 
2.11.0