From a424113f9bb1c08e3fc10b6c5021a1cf856bb212 Mon Sep 17 00:00:00 2001
From: Max Kremmel <xing@synapse.plus.com>
Date: Mon, 1 Aug 2005 18:40:46 +0000
Subject: merge recent changes with HEAD - R1 and HEAD are identical now

---
 lang/de/language.php | 4 ++--
 lang/fr/language.php | 4 ++--
 lang/no/language.php | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'lang')

diff --git a/lang/de/language.php b/lang/de/language.php
index d8d3c2f..253c9b9 100644
--- a/lang/de/language.php
+++ b/lang/de/language.php
@@ -236,7 +236,7 @@ $lang=Array(
 'Admin instance' => 'Admin Instanzen',
 'Administer Group' => '',
 'Administer phpBB ' => '',
-'Administer phpBB {$smarty.session.sid}' => '',
+'Administer phpBB {$gBitSmarty.session.sid}' => '',
 'Administration' => 'Administration',
 'Administration Features' => 'Administrative Einstellungen',
 'Administration Menu' => 'Admin-Menü',
@@ -262,7 +262,7 @@ $lang=Array(
 'Admin newsletter subscriptions' => 'Admin Newsletter-Abonnenten',
 'admin notifications tpl' => '',
 'Admin. phpBB' => 'phpBB administrieren',
-'Admin. phpBB {$smarty.session.sid}' => 'phpBB administrieren {$smarty.session.sid}',
+'Admin. phpBB {$gBitSmarty.session.sid}' => 'phpBB administrieren {$gBitSmarty.session.sid}',
 'Admin Polls' => 'Admin Abstimmungen',
 'admin polls template' => '',
 'admin polls tpl' => '',
diff --git a/lang/fr/language.php b/lang/fr/language.php
index 6658245..7b9fb03 100644
--- a/lang/fr/language.php
+++ b/lang/fr/language.php
@@ -236,7 +236,7 @@ $lang=Array(
 'Admin instance' => 'Administrer une instance',
 'Administer Group' => '',
 'Administer phpBB ' => 'Administrer phpBB',
-'Administer phpBB {$smarty.session.sid}' => 'Administrer phpBB {$smarty.session.sid}',
+'Administer phpBB {$gBitSmarty.session.sid}' => 'Administrer phpBB {$gBitSmarty.session.sid}',
 'Administration' => 'Administration',
 'Administration Features' => 'Fonctionnalités administrateur',
 'Administration Menu' => 'Administration Menu',
@@ -262,7 +262,7 @@ $lang=Array(
 'Admin newsletter subscriptions' => 'Administrer les inscriptions à une newsletter',
 'admin notifications tpl' => 'Tpl de l\'administration des notifications',
 'Admin. phpBB' => '',
-'Admin. phpBB {$smarty.session.sid}' => '',
+'Admin. phpBB {$gBitSmarty.session.sid}' => '',
 'Admin Polls' => 'administrer les sondages',
 'admin polls template' => '',
 'admin polls tpl' => 'Tpl de l\'administration des sondages',
diff --git a/lang/no/language.php b/lang/no/language.php
index 6085438..f9f31cc 100644
--- a/lang/no/language.php
+++ b/lang/no/language.php
@@ -236,7 +236,7 @@ $lang=Array(
 'Admin instance' => 'Admin instance',
 'Administer Group' => 'Administrer Gruppe',
 'Administer phpBB ' => 'Administrer phpBB',
-'Administer phpBB {$smarty.session.sid}' => 'Administrer phpBB {$smarty.session.sid}',
+'Administer phpBB {$gBitSmarty.session.sid}' => 'Administrer phpBB {$gBitSmarty.session.sid}',
 'Administration' => 'Administrasjon',
 'Administration Features' => '',
 'Administration Menu' => 'Administrasjonsmeny',
@@ -262,7 +262,7 @@ $lang=Array(
 'Admin newsletter subscriptions' => 'Admin newsletter subscriptions',
 'admin notifications tpl' => '',
 'Admin. phpBB' => 'Administrer phpBB',
-'Admin. phpBB {$smarty.session.sid}' => 'Administrer phpBB {$smarty.session.sid}',
+'Admin. phpBB {$gBitSmarty.session.sid}' => 'Administrer phpBB {$gBitSmarty.session.sid}',
 'Admin Polls' => 'Admin Polls',
 'admin polls template' => '',
 'admin polls tpl' => '',
-- 
cgit v1.3