synch recent changes from R1 to HEAD

4 files changed, 136 insertions, 136 deletions

diff --git a/lang/de/language.php b/lang/de/language.php
index 253c9b9..748a9c5 100644
--- a/lang/de/language.php
+++ b/lang/de/language.php
@@ -307,7 +307,7 @@ $lang=Array(
 'Advanced' => 'erweitert',
 'Advanced Options' => 'erweiterte Optionen',
 'Advanced Search' => '',
-'A filter to limit which <strong>TikiPro</strong> Object will be displayed on the page. The key-words are:' => 'Filter, um einzugrenzen welches <strong>TikiPro</strong> Objekt auf der Seite angezeigt wird. Die Schlüsselwörter sind:',
+'A filter to limit which <strong>Bitweaver</strong> Object will be displayed on the page. The key-words are:' => 'Filter, um einzugrenzen welches <strong>Bitweaver</strong> Objekt auf der Seite angezeigt wird. Die Schlüsselwörter sind:',
 'After changing this setting you might have to log in again.' => 'Nach dem Ändern dieser Einstellung müssen Sie sich eventuell neu einloggen.',
 'After page' => 'Nach Seite',
 'Again' => 'Wiederholung',
@@ -742,7 +742,7 @@ from Admin->General
 ' | ::boolean:: |  if True (any value = True) the content will not be parsed. There default is __No__.
 ' => '',
 'both' => 'beides',
-'Both of these examples display "The Flash Mind Reader" by Andy Naughton. The first example is on your site and is not very large. The second example is located on the TikiPro.org site and takes the width of the center column with an appropriat height.' => 'Diese beiden Beispiele zeigen "The Flash Mind Reader" von Andy Naughton. Das erste Beispiel ist auf Ihrer Seite und nicht sehr groß. Das zweite Beispiel befindet sich auf tikipro.org und ist so breit wie die mittlere Spalte mit einer passenden Höhe.',
+'Both of these examples display "The Flash Mind Reader" by Andy Naughton. The first example is on your site and is not very large. The second example is located on the Bitweaver.org site and takes the width of the center column with an appropriat height.' => 'Diese beiden Beispiele zeigen "The Flash Mind Reader" von Andy Naughton. Das erste Beispiel ist auf Ihrer Seite und nicht sehr groß. Das zweite Beispiel befindet sich auf bitweaver.org und ist so breit wie die mittlere Spalte mit einer passenden Höhe.',
 'Bottom bar' => 'Unterer Balken',
 'box' => 'Box',
 'Box content' => 'Box-Inhalt',
@@ -1147,12 +1147,12 @@ from Admin->General
 'Compile' => '',
 'Complete' => 'vollständig',
 'Complete allows <em>anything at all</em>.  I (<a
-    href="http://tikipro.org/wiki/index.php?page=UserPagerlpowell">rlpowell</a>)
+    href="http://bitweaver.org/wiki/index.php?page=UserPagerlpowell">rlpowell</a>)
     cannot guarantee that it is bug-free or secure.' => '',
 'Complete allows <em>anything at all</em>.  I (<a

-    href="http://tikipro.org/wiki/index.php?page=UserPagerlpowell">rlpowell</a>)

+    href="http://bitweaver.org/wiki/index.php?page=UserPagerlpowell">rlpowell</a>)

     cannot guarantee that it is bug-free or secure.' => 'Komplett erlaubt <em>alle</em> Zeichen.  Ich (<a

-    href="http://tikipro.org/wiki/index.php?page=UserPagerlpowell">rlpowell</a>)

+    href="http://bitweaver.org/wiki/index.php?page=UserPagerlpowell">rlpowell</a>)

     kann leider die Fehlerfreiheit/Sicherheit dessen garantieren.',
 'Complete allows <em>anything at all</em>.  I (<a
     href="http://tikiwiki.org/tiki-index.php?page=UserPagerlpowell">rlpowell</a>)
@@ -1353,7 +1353,7 @@ name as the user)' => '',
 'Create PDF for EclipseCVS' => '',
 'Creates a box with the data' => 'Erzeugt eine Box mit den Daten',
 'Creates a definition list' => 'Legt eine Definitionsliste an',
-'Creates a listing of TikiPro objects that have not been categorized.' => 'Erstellt eine Liste der TikiPro Objekte, die noch nicht kategorisiert wurden.',
+'Creates a listing of Bitweaver objects that have not been categorized.' => 'Erstellt eine Liste der Bitweaver Objekte, die noch nicht kategorisiert wurden.',
 'Creates a ranking system based on the number of times a page is accessed.' => 'Erstellt ein Ranking-System, das darauf basiert, wie oft auf eine Seite ugegriffen wurde.',
 'creates a table' => 'erzeugt eine Tabelle',
 'creates a title bar' => 'erzeugt einen Titelbalken',
@@ -1783,10 +1783,10 @@ Set optional paramater -+ln+- to 1 if you need line numbering feature.' => '',
 'Edit this user module:' => 'Dieses Benutzer-Modul bearbeiten:',
 'Edit TikiExportUpdate' => '',
 'Edit TikiNotifications' => 'TikiNotifications editieren',
-'Edit TikiPro' => 'TikiPro editieren',
-'Edit TikiProRequirements' => '',
-'Edit TikiPro_sites' => '',
-'Edit TikiWiki_and_TikiPro' => '',
+'Edit Bitweaver' => 'Bitweaver editieren',
+'Edit BitweaverRequirements' => '',
+'Edit Bitweaver_sites' => '',
+'Edit TikiWiki_and_Bitweaver' => '',
 'Edit tpl' => '',
 'Edit tracker fields' => 'Tracker-Felder bearbeiten',
 'Edit Translation:' => '',
@@ -2027,7 +2027,7 @@ activity' => '',
 'Font' => 'Schrift',
 'Footnotes' => 'Fu&szlig;noten',
 'for' => 'f&uuml;r',
-'For additional information about this plugin - see TikiPro.Org or click <a class=\'wiki\' target=_blank href=\'{$p.tpopg}\'><strong>Here</strong></a> to visit.' => 'Für weiterführende Informationen über dieses Plugin siehe TikiPro.Org oder klicken Sie <a class=\'wiki\' target=_blank href=\'{$p.tpopg}\'><strong>hier</strong></a>.',
+'For additional information about this plugin - see Bitweaver.Org or click <a class=\'wiki\' target=_blank href=\'{$p.tpopg}\'><strong>Here</strong></a> to visit.' => 'Für weiterführende Informationen über dieses Plugin siehe Bitweaver.Org oder klicken Sie <a class=\'wiki\' target=_blank href=\'{$p.tpopg}\'><strong>hier</strong></a>.',
 'for bullet lists' => 'f&uuml;r einfache Listen',
 'Force to use chars and nums in passwords' => 'Erzwinge Benutzung von Buchstaben und Zahlen in Pa&szlig;w&ouml;rtern',
 'for definiton lists' => 'f&uuml;r Definitionslisten',
@@ -2035,12 +2035,12 @@ activity' => '',
 'ForMenu' => '',
 'For more information, please see <a href="{$helpurl}WikiSyntax">WikiSyntax</a>' => '',
 'For more information, please see <a
-href="http://www.tikipro.org/wiki/index.php?page=WikiSyntax">WikiSyntax</a>
+href="http://www.bitweaver.org/wiki/index.php?page=WikiSyntax">WikiSyntax</a>
 on <a href="http://www.tikiwiki.org">TikiWiki.org</a>.' => '',
 'For more information, please see <a

-href="http://www.tikipro.org/wiki/index.php?page=WikiSyntax">WikiSyntax</a>

+href="http://www.bitweaver.org/wiki/index.php?page=WikiSyntax">WikiSyntax</a>

 on <a href="http://www.tikiwiki.org">TikiWiki.org</a>.' => 'Weitere Informationen sind unter <a

-href="http://www.tikipro.org/wiki/index.php?page=WikiSyntax">WikiSyntax</a>

+href="http://www.bitweaver.org/wiki/index.php?page=WikiSyntax">WikiSyntax</a>

 auf <a href="http://www.tikiwiki.org">TikiWiki.org</a> zu finden.',
 'For more information, please see <a
 href="http://www.tikiwiki.org/tiki-index.php?page=WikiSyntax">WikiSyntax</a>
@@ -2081,8 +2081,8 @@ on TikiWiki.org.' => '',
 'Forward messages to this forum to this e-mail address, in a format that can be used for sending back to the inbound forum e-mail address' => '',
 'Forward messages to this forum to this e-mail address, in a format that can be
 used for sending back to the inbound forum e-mail address' => '',
-'For Web-Safe Color Names see <a class=\'wiki\' target=_blank href=\'http://www.tikipro.org/wiki/Browser+ColorNames\'>TikiPro</a> or for HTML Color numbers see <a class=\'wiki\' target=_blank href=\'http://www.pagetutor.com/pagetutor/makapage/picker/\'>The Color Picker II</a>' => '',
-'For Web-Safe Color Names see <a class=\'wiki\' target=_blank href=\'http://www.tikipro.org/wiki/index.php?page=Browser+ColorNames\'>TikiPro</a> or for HTML Color numbers see <a class=\'wiki\' target=_blank href=\'http://www.pagetutor.com/pagetutor/makapage/picker/\'>The Color Picker II</a>' => 'Für eine Liste websicherer Farben siehe <a class=\'wiki\' target=_blank href=\'http://www.tikipro.org/wiki/index.php?page=Browser+ColorNames\'>TikiPro</a> oder <a class=\'wiki\' target=_blank href=\'http://www.pagetutor.com/pagetutor/makapage/picker/\'>The Color Picker II</a>',
+'For Web-Safe Color Names see <a class=\'wiki\' target=_blank href=\'http://www.bitweaver.org/wiki/Browser+ColorNames\'>Bitweaver</a> or for HTML Color numbers see <a class=\'wiki\' target=_blank href=\'http://www.pagetutor.com/pagetutor/makapage/picker/\'>The Color Picker II</a>' => '',
+'For Web-Safe Color Names see <a class=\'wiki\' target=_blank href=\'http://www.bitweaver.org/wiki/index.php?page=Browser+ColorNames\'>Bitweaver</a> or for HTML Color numbers see <a class=\'wiki\' target=_blank href=\'http://www.pagetutor.com/pagetutor/makapage/picker/\'>The Color Picker II</a>' => 'Für eine Liste websicherer Farben siehe <a class=\'wiki\' target=_blank href=\'http://www.bitweaver.org/wiki/index.php?page=Browser+ColorNames\'>Bitweaver</a> oder <a class=\'wiki\' target=_blank href=\'http://www.pagetutor.com/pagetutor/makapage/picker/\'>The Color Picker II</a>',
 'for wiki references' => 'f&uuml;r Wiki-Referenzen',
 'Found' => 'Fand',
 'Found \'<span class="highlight">cvs</span>\' in 0 pages' => '',
@@ -2971,7 +2971,7 @@ address.' => '',
 'Most read topics' => 'Meistgelesene Themen',
 'Most Recent Editor' => '',
 'Most relevant pages' => 'Relevanteste Seiten',
-'Most TikiPro Objects can be selected, including' => 'Die meisten TikiPro Objekte können gewählt werden, einschließlich',
+'Most Bitweaver Objects can be selected, including' => 'Die meisten Bitweaver Objekte können gewählt werden, einschließlich',
 'Most visited blogs' => 'Meistbesuchte Blogs',
 'Most visited forums' => 'Meistbesuchte Foren',
 'Most visited sub-categories' => 'Meistbesuchte Unterkategorien',
@@ -3029,8 +3029,8 @@ address.' => '',
 'My Tiki' => 'Mein Tiki',
 'MyTiki (click!)' => 'Mein Tiki (Klick!)',
 'MyTikiDoc' => 'MyTikiDoc',
-'My TikiPro' => 'mein TikiPro',
-'My TikiPro Docs' => '',
+'My Bitweaver' => 'mein Bitweaver',
+'My Bitweaver Docs' => '',
 'my tiki tpl' => '',
 'My User Groups' => 'meine Benutzergruppen',
 'My watches' => 'meine Beobachtungspunkte',
@@ -3758,7 +3758,7 @@ For kernel/trash it would look in AlienSmileys, then "' => '',
 'powered by' => 'Powered by',
 'Powered by Adodb' => '',
 'Powered by Smarty' => '',
-'Powered by TikiPro' => '',
+'Powered by Bitweaver' => '',
 'ppd' => 'PPT',
 'pre' => 'letzte',
 'Preferences' => 'Einstellungen',
@@ -4364,7 +4364,7 @@ All your tables will be replaced with the information in the backup.' => '',
 'Site Statistics' => 'Site-Statistik',
 'Site Stats' => 'Site-Statistik',
 'Sites to validate' => 'Zu &uuml;berpr&uuml;fende Sites',
-'Sites using TikiPro' => 'Sites, die TikiPro benutzen',
+'Sites using Bitweaver' => 'Sites, die Bitweaver benutzen',
 'Site Theme' => '',
 'Site title' => 'Browsertitel',
 '{$siteTitle|default:"Home"}' => '',
@@ -4735,7 +4735,7 @@ to preview the appeareance of the page, no versions are stored for this page.' =
 ' => '',
 'The text in RED is' => '',
 'The text is' => '',
-'The Themes package is an integral part of TikiPro which allows you to control the look and feel of you site.' => 'Das Themes Paket ist integraler Bestandteil von TikiPro. Es erlaubt Ihnen, Look & Feel Ihrer Site zu kontrollieren.',
+'The Themes package is an integral part of Bitweaver which allows you to control the look and feel of you site.' => 'Das Themes Paket ist integraler Bestandteil von Bitweaver. Es erlaubt Ihnen, Look & Feel Ihrer Site zu kontrollieren.',
 'The thumbnail name must be' => 'Der Thumbnail-Name muss sein',
 'the title of the map
 ' => '',
@@ -4783,7 +4783,7 @@ dictionary, so it will not be translated, but the enclosing tr tags will dissape
 'this page' => 'diese Seite',
 'This page is being edited by' => 'Diese Seite wird gerade bearbeitet von',
 'This plugin allows a Flash SWF file to be displayed.' => 'Dieses Plugin ermöglicht das einbingen einer SWF Datei (Macromedia Flash).',
-'This plugin automatically creates a link to the appropriate ))SourceForge(( object for ))TikiPro((.' => 'Dieses Plugin erstellt automatisch einen Link zum ))SourceForge(( Eintrag ))TikiPro((.',
+'This plugin automatically creates a link to the appropriate ))SourceForge(( object for ))Bitweaver((.' => 'Dieses Plugin erstellt automatisch einen Link zum ))SourceForge(( Eintrag ))Bitweaver((.',
 'This plugin creates definition lists.' => 'Dieses Plugin erzeugt eine Definitionsliste.',
 'This plugin displays a graphical GAUGE.' => 'Dieses Plugin erzeugt Balkendiagramme an.',
 'This plugin insert a list of items for the current category or a given category.' => 'Dieses Plugin erzeugt eine Liste mit Einträgen für die aktuelle oder eine festzulegende Kategorie.',
@@ -4820,10 +4820,10 @@ phones, PDA\'s, i-mode devices and much more.' => '',
 'This will automatically recognise what the browsers default language is set to and display that language.<br />Please make sure you import appropriate languages first and disable / remove languages you don\'t want to support since loading a language for the first time will access your database quite a bit and might cause you system to slow down temporarily.' => '',
 'This will convert any posted URL into an easily readable and clickable link' => '',
 'This will display - P1 was set to = 7 & P2 was set to = 8' => '',
-'This will display translation strings for all TikiPro versions.' => 'Dies zeigt Zeichenketten zur Übersetzung für alle TikiPro Versionen an. ',
-'This will display translation strings for all TikiPro versions. This means it will also show strings that are not used at all and might be useless to you.' => 'Dies zeigt Zeichenketten zur Übersetzung für alle TikiPro Versionen an. Das heißt, es werden auch Zeichenketten angezeigt, die gar nicht benutzt werden, und die möglicherweise für Sie uninteressant sind.',
+'This will display translation strings for all Bitweaver versions.' => 'Dies zeigt Zeichenketten zur Übersetzung für alle Bitweaver Versionen an. ',
+'This will display translation strings for all Bitweaver versions. This means it will also show strings that are not used at all and might be useless to you.' => 'Dies zeigt Zeichenketten zur Übersetzung für alle Bitweaver Versionen an. Das heißt, es werden auch Zeichenketten angezeigt, die gar nicht benutzt werden, und die möglicherweise für Sie uninteressant sind.',
 'This will export all strings, even ones that are not in use. if you have not modified these strings, there isn\'t really much point in including them.' => 'Alle Zeichenketten werden exportiert, auch die, die nicht in Benutzung sind. Falls Sie aber diese Zeichenketten nicht geändert haben, ist der Export wahrscheinlich nicht sinnvoll.',
-'This will export translation strings for the all TikiPro versions.' => 'Dies exportiert Zeichenketten zur Übersetzung für alle TikiPro Versionen an. ',
+'This will export translation strings for the all Bitweaver versions.' => 'Dies exportiert Zeichenketten zur Übersetzung für alle Bitweaver Versionen an. ',
 'This will prevent the generation of a new version. You can use this, if your changes are minor.' => 'Verhindert die Generation einer neuen Version, zum Beispiel wenn Ihre Änderungen nur geringfügig waren.',
 'This will record any untranslated language strings.' => 'Aufzeichnen aller unübersetzten Zeichenketten.',
 'This will restore the entire wiki to when you created this tag. All the entries since then will be lost.' => 'Zurücksetzen des gesamten Wikis zum Zeitpunkt der Erstellung dieses TAGs. Alle neueren Änderungen gehen verloren.',
@@ -4859,11 +4859,11 @@ phones, PDA\'s, i-mode devices and much more.' => '',
 'Tikipackage:blogs/center list blog posts.tpl' => '',
 'Tikipackage:fisheye/center list images.tpl' => '',
 'Tikipackage:users/center user wiki page.tpl' => '',
-'TikiPro' => '',
+'Bitweaver' => '',
 'TiKiPro</a> Web Site. ' => '',
-'TikiPro Docs' => '',
+'Bitweaver Docs' => '',
 'Tikipro gives you even more choices by allowing you to simply combine tags to form different formatting combinations. For example, \'\'__<i><b>this text is both italicized &amp; bold</b></i>__\'\'. __===<b><u>This text is both bold &amp; underlined</u></b>===__. \'\'__<i><u>This text is both italicized &amp; underlined</u></i>__\'\'.' => '',
-'TikiPro is hosted by SourceForge' => 'TikiPro wird von SourceForge gehostet.',
+'Bitweaver is hosted by SourceForge' => 'Bitweaver wird von SourceForge gehostet.',
 'Tiki Projects' => '',
 'Tiki RSS Feed Error Message' => '',
 'Tiki RSS feed for articles' => '',
@@ -4918,8 +4918,8 @@ phones, PDA\'s, i-mode devices and much more.' => '',
 'to {$groupInfo.group_name}' => '',
 'to groups' => 'zu Gruppen',
 'To <i>italicize</i> a word or phrase using Wiki syntax, simply surround it with two single quotes (apostrophes), like' => 'Um einen Bereich <i>kursiv</i> zu setzen, umschließen Sie das Wort oder die Wortgruppe mit jeweils zwei Hochkommas, so',
-'To include any content from tikipro insert the apprpropriate numeric content id. This can include blog posts, images, wiki texts...<br />
-					Avaliable content can be viewed <a href="/liberty/list_content.php">here</a>' => 'Um Inhalt von TikiPro zu verwenden, fügen Sie die passende nummerische Content ID ein. Dazu gehören Blog Postings, Bilder, Wiki Texte und andere <a href="/liberty/list_content.php">mögliche Inhalte</a>',
+'To include any content from bitweaver insert the apprpropriate numeric content id. This can include blog posts, images, wiki texts...<br />
+					Avaliable content can be viewed <a href="/liberty/list_content.php">here</a>' => 'Um Inhalt von Bitweaver zu verwenden, fügen Sie die passende nummerische Content ID ein. Dazu gehören Blog Postings, Bilder, Wiki Texte und andere <a href="/liberty/list_content.php">mögliche Inhalte</a>',
 'To include any wiki page you can use it\'s page_id number.' => 'Um eine Wiki Seite einzuschließen, können Sie die ID Nummer der Seite verwenden.',
 'To include any wiki page you can use it\'s page name (this has to be a unique name. if it\'s not unique, use the page_id instead) (this method is deprecated).' => 'Um eine Seite einzuschließen, können Sie den Namen der Seite verwenden. Dieser Name muss eindeutig sein. Ist er das nicht, nehmen Sie statt dessen die page_id.',
 'to insert a random tagline' => 'um eine zuf&auml;llige Tagline einzuf&uuml;gen',
@@ -5013,7 +5013,7 @@ phones, PDA\'s, i-mode devices and much more.' => '',
 'trackers' => 'Tracker',
 'Tracker was modified at ' => 'Tracker wurde ver&auml;nder auf ',
 'Track Translation Usage' => 'Überwache Benutzung der Übersetzung',
-'Track which strings are used in this version of TikiPro so only the currently used strings appear while editing translations. You MUST <a href="/languages/edit_languages.php">clear your language and templates cache</a> after enabling this option.' => 'Überwache, welche Zeichenketten in dieser Version von TikiPro benutzt werden, damit nur die tatsächlich vorhandenen zur Übersetzung erscheinen. Sie MÜSSEN <a href="/languages/edit_languages.php">den Sprachen und Templates Zwischenspeicher leeren</a> nach der Aktivierung dieser Option.',
+'Track which strings are used in this version of Bitweaver so only the currently used strings appear while editing translations. You MUST <a href="/languages/edit_languages.php">clear your language and templates cache</a> after enabling this option.' => 'Überwache, welche Zeichenketten in dieser Version von Bitweaver benutzt werden, damit nur die tatsächlich vorhandenen zur Übersetzung erscheinen. Sie MÜSSEN <a href="/languages/edit_languages.php">den Sprachen und Templates Zwischenspeicher leeren</a> nach der Aktivierung dieser Option.',
 'Traditional Chinese' => '',
 'Transcript' => 'Logbuch',
 'transcripts' => 'Logb&uuml;cher',
@@ -5094,7 +5094,7 @@ phones, PDA\'s, i-mode devices and much more.' => '',
 'Upload a game' => 'Ein Spiel hochladen',
 'Upload a new game' => 'Ein neues Spiel hochladen',
 'Upload an image that will be shown on your personal page. This could possibly be a corporate image.' => '',
-'Upload a personal photo to be displayed on your TikiPro homepage.' => '',
+'Upload a personal photo to be displayed on your Bitweaver homepage.' => '',
 'Upload a small image or icon to be displayed next to your name on your forum and blog postings.' => '',
 'Upload Avatar' => '',
 'Upload backup' => 'Backup hochladen',
@@ -5592,7 +5592,7 @@ phones, PDA\'s, i-mode devices and much more.' => '',
 'Wiki Watch' => 'Wiki Beobachtung',
 'WikiWords' => '',
 'Will be replaced by the actual value of the dynamic content block with id=n' => 'Wird mit dem tats&auml;chlichen Wert des dynamischen Inhaltsblocks mit id=n ersetzt',
-'Will create a Tab interface on a page. The name on each tab is the name given to the imported page.The value sent with the TabX parameter is a TikiPro Numeric Content Id. This allows blog posts, images, wiki pages...and more to be added<br /><strong>Note:</strong> The order used when the tabs are specified does not matter. The Tabname does - Tab1 is always first and Tab99 will always be last. Avaliable content can be viewed ' => 'Erzeugt eine Aktenreiter- bzw. Tabulatornavigation (Tabs). Der Name auf jedem Tab ist der Name jeder importierten Seite. Der Wert, der mit dem TabX Parameter übermittelt wird, ist eine TikiPro Nummeric Content ID. Diese erlaubt es, Blog Beiträge, Bilder, Tiki-Seiten usw. einzubinden. <strong>Anmerkung:</strong> Sortiert wird ausschließlich nach den Tab-Namen. Möglicher Inhalt kann eingesehen werden',
+'Will create a Tab interface on a page. The name on each tab is the name given to the imported page.The value sent with the TabX parameter is a Bitweaver Numeric Content Id. This allows blog posts, images, wiki pages...and more to be added<br /><strong>Note:</strong> The order used when the tabs are specified does not matter. The Tabname does - Tab1 is always first and Tab99 will always be last. Avaliable content can be viewed ' => 'Erzeugt eine Aktenreiter- bzw. Tabulatornavigation (Tabs). Der Name auf jedem Tab ist der Name jeder importierten Seite. Der Wert, der mit dem TabX Parameter übermittelt wird, ist eine Bitweaver Nummeric Content ID. Diese erlaubt es, Blog Beiträge, Bilder, Tiki-Seiten usw. einzubinden. <strong>Anmerkung:</strong> Sortiert wird ausschließlich nach den Tab-Namen. Möglicher Inhalt kann eingesehen werden',
 'Will create a table of contents of the WikiPage based on the headings below.' => 'Erzeugt ein Inhaltsverzeichnis der Wiki-Seite, basierend auf den Überschriften.',
 'Will display the text centered' => 'Wird mit zentriertem Text angezeigt',
 'Will display using the indicated HTML color' => 'Wird mit der angegeben HTML-Farbe angezeigt',
@@ -5801,7 +5801,7 @@ a moderator approves it.' => 'Ihre Nachricht w&uuml;rde in die Warteschlange f&u
 'You sent a request with the subject:' => '',
 'You should first ask that a calendar is created, so you can create events attached to it.' => 'Es mu&szlig; erst ein Kalender angelegt werden, in den dann Ereignisse eingetragen werden k&ouml;nnen.',
 'You will need to <a href="edit_languages.php?clear_cache=1">clear the System Cache</a> to see the changes.' => 'Um die Veränderungen sichtbar zu machen, muss <a href="edit_languages.php?clear_cache=1">der System Zwischenspeicher geleert werden</a>.',
-'You will need to <a href="`$gTikiLoc.LANGUAGES_PKG_URL`edit_language.php">clear the System Cache</a> to see the changes.' => '',
+'You will need to <a href="`$gTikiLoc.LANGUAGES_PKG_URL`edit_languages.php">clear the System Cache</a> to see the changes.' => '',
 'You will receive an email with information to login for the first time into this site' => 'Sie erhalten in Kuerze eine EMail, die Informationen enthalten, wie Sie sich zum ersten mal anmelden.',
 'You will receive an email with your password soon' => 'Eine EMail mit dem neuen Pa&szlig;wort ist unterwegs.',
 'You will remove' => 'You will remove',
@@ -5822,4 +5822,4 @@ a moderator approves it.' => 'Ihre Nachricht w&uuml;rde in die Warteschlange f&u
 '最後の変更' => '',
 '' => '',
 );
-?>
\ No newline at end of file
+?>
diff --git a/lang/fr/language.php b/lang/fr/language.php
index 7b9fb03..cc94530 100644
--- a/lang/fr/language.php
+++ b/lang/fr/language.php
@@ -307,7 +307,7 @@ $lang=Array(
 'Advanced' => 'Avancé',
 'Advanced Options' => 'Options avancées',
 'Advanced Search' => 'Recherche avancée',
-'A filter to limit which <strong>TikiPro</strong> Object will be displayed on the page. The key-words are:' => 'Un filtre pour limiter quel <strong>TikiPro</strong> Objet sera affiché sur la paage. Mes Mots-clés sont:',
+'A filter to limit which <strong>Bitweaver</strong> Object will be displayed on the page. The key-words are:' => 'Un filtre pour limiter quel <strong>Bitweaver</strong> Objet sera affiché sur la paage. Mes Mots-clés sont:',
 'After changing this setting you might have to log in again.' => 'Après cette modification, il peut être nécessaire de se reconnecter',
 'After page' => 'Après la page',
 'Again' => 'Encore',
@@ -730,7 +730,7 @@ from Admin->General
 ' | ::boolean:: |  if True (any value = True) the content will not be parsed. There default is __No__.
 ' => '',
 'both' => 'les deux',
-'Both of these examples display "The Flash Mind Reader" by Andy Naughton. The first example is on your site and is not very large. The second example is located on the TikiPro.org site and takes the width of the center column with an appropriat height.' => 'Ces deux exemples affichent "The Flash Mind Reader" par Andy Naughton. Le premier exemple est sur votre site et n\'est pas très grand. Le second est situé sur le site TikiPro.org et occupe la largeur de la colonne centrale avec une hauteur appropriée.',
+'Both of these examples display "The Flash Mind Reader" by Andy Naughton. The first example is on your site and is not very large. The second example is located on the Bitweaver.org site and takes the width of the center column with an appropriat height.' => 'Ces deux exemples affichent "The Flash Mind Reader" par Andy Naughton. Le premier exemple est sur votre site et n\'est pas très grand. Le second est situé sur le site Bitweaver.org et occupe la largeur de la colonne centrale avec une hauteur appropriée.',
 'Bottom bar' => 'Barre du bas',
 'box' => 'pavé',
 'Box content' => 'Contenu du pavé',
@@ -1137,12 +1137,12 @@ from Admin->General
 'Compile' => 'Compiler',
 'Complete' => 'Fini',
 'Complete allows <em>anything at all</em>.  I (<a
-    href="http://tikipro.org/wiki/index.php?page=UserPagerlpowell">rlpowell</a>)
+    href="http://bitweaver.org/wiki/index.php?page=UserPagerlpowell">rlpowell</a>)
     cannot guarantee that it is bug-free or secure.' => 'Complet permet presque tout.  I (<a
-    href="http://tikipro.org/wiki/index.php?page=UserPagerlpowell">rlpowell</a>)
+    href="http://bitweaver.org/wiki/index.php?page=UserPagerlpowell">rlpowell</a>)
     cannot guarantee that it is bug-free or secure.',
 'Complete allows <em>anything at all</em>.  I (<a

-    href="http://tikipro.org/wiki/index.php?page=UserPagerlpowell">rlpowell</a>)

+    href="http://bitweaver.org/wiki/index.php?page=UserPagerlpowell">rlpowell</a>)

     cannot guarantee that it is bug-free or secure.' => '',
 'Complete allows <em>anything at all</em>.  I (<a
     href="http://tikiwiki.org/tiki-index.php?page=UserPagerlpowell">rlpowell</a>)
@@ -1343,7 +1343,7 @@ name as the user)' => '',
 'Create PDF for EclipseCVS' => 'Créer PDF pour EclipseCVS',
 'Creates a box with the data' => 'pour mettre le texte dans un pavé',
 'Creates a definition list' => 'Crée une liste de définition',
-'Creates a listing of TikiPro objects that have not been categorized.' => 'Crée une liste des objets TikiPro qui n\'ont pas encore été classé dans une catégorie',
+'Creates a listing of Bitweaver objects that have not been categorized.' => 'Crée une liste des objets Bitweaver qui n\'ont pas encore été classé dans une catégorie',
 'Creates a ranking system based on the number of times a page is accessed.' => 'Crée un système de classement basé sur le nombre de fois où une page a été visitée',
 'creates a table' => 'pour créer un tableau',
 'creates a title bar' => 'pour une barre de titre',
@@ -1772,10 +1772,10 @@ Set optional paramater -+ln+- to 1 if you need line numbering feature.' => '',
 'Edit this user module:' => 'Modifier ce module utilisateur :',
 'Edit TikiExportUpdate' => '',
 'Edit TikiNotifications' => '',
-'Edit TikiPro' => '',
-'Edit TikiProRequirements' => '',
-'Edit TikiPro_sites' => '',
-'Edit TikiWiki_and_TikiPro' => '',
+'Edit Bitweaver' => '',
+'Edit BitweaverRequirements' => '',
+'Edit Bitweaver_sites' => '',
+'Edit TikiWiki_and_Bitweaver' => '',
 'Edit tpl' => 'Modifier le tpl',
 'Edit tracker fields' => 'Modifier les champs du traqueur',
 'Edit Translation:' => '',
@@ -2016,7 +2016,7 @@ activity' => '',
 'Font' => 'Police',
 'Footnotes' => 'Notes de bas de page',
 'for' => 'pour',
-'For additional information about this plugin - see TikiPro.Org or click <a class=\'wiki\' target=_blank href=\'{$p.tpopg}\'><strong>Here</strong></a> to visit.' => '',
+'For additional information about this plugin - see Bitweaver.Org or click <a class=\'wiki\' target=_blank href=\'{$p.tpopg}\'><strong>Here</strong></a> to visit.' => '',
 'for bullet lists' => 'pour une liste à puces',
 'Force to use chars and nums in passwords' => 'Obliger de n\'utiliser que des caractères et numériques dans un mot de passe',
 'for definiton lists' => 'pour une définition',
@@ -2024,11 +2024,11 @@ activity' => '',
 'ForMenu' => 'Cliquer pour voir le sous-menu',
 'For more information, please see <a href="{$helpurl}WikiSyntax">WikiSyntax</a>' => '',
 'For more information, please see <a
-href="http://www.tikipro.org/wiki/index.php?page=WikiSyntax">WikiSyntax</a>
+href="http://www.bitweaver.org/wiki/index.php?page=WikiSyntax">WikiSyntax</a>
 on <a href="http://www.tikiwiki.org">TikiWiki.org</a>.' => 'Pour plus d\'informations, voir <a
-href="http://www.tikipro.org/wiki/index.php?page=WikiSyntax">WikiSyntax</a> sur <a href="http://www.tikiwiki.org">TikiWiki.org</a>.',
+href="http://www.bitweaver.org/wiki/index.php?page=WikiSyntax">WikiSyntax</a> sur <a href="http://www.tikiwiki.org">TikiWiki.org</a>.',
 'For more information, please see <a

-href="http://www.tikipro.org/wiki/index.php?page=WikiSyntax">WikiSyntax</a>

+href="http://www.bitweaver.org/wiki/index.php?page=WikiSyntax">WikiSyntax</a>

 on <a href="http://www.tikiwiki.org">TikiWiki.org</a>.' => '',
 'For more information, please see <a
 href="http://www.tikiwiki.org/tiki-index.php?page=WikiSyntax">WikiSyntax</a>
@@ -2068,8 +2068,8 @@ on TikiWiki.org.' => '',
 'Forward messages to this forum to this e-mail address, in a format that can be used for sending back to the inbound forum e-mail address' => 'Faire suivre les messages de ce forum à cette adresse électronique, dans un format pouvant être renvoyé au forum',
 'Forward messages to this forum to this e-mail address, in a format that can be
 used for sending back to the inbound forum e-mail address' => '',
-'For Web-Safe Color Names see <a class=\'wiki\' target=_blank href=\'http://www.tikipro.org/wiki/Browser+ColorNames\'>TikiPro</a> or for HTML Color numbers see <a class=\'wiki\' target=_blank href=\'http://www.pagetutor.com/pagetutor/makapage/picker/\'>The Color Picker II</a>' => '',
-'For Web-Safe Color Names see <a class=\'wiki\' target=_blank href=\'http://www.tikipro.org/wiki/index.php?page=Browser+ColorNames\'>TikiPro</a> or for HTML Color numbers see <a class=\'wiki\' target=_blank href=\'http://www.pagetutor.com/pagetutor/makapage/picker/\'>The Color Picker II</a>' => '',
+'For Web-Safe Color Names see <a class=\'wiki\' target=_blank href=\'http://www.bitweaver.org/wiki/Browser+ColorNames\'>Bitweaver</a> or for HTML Color numbers see <a class=\'wiki\' target=_blank href=\'http://www.pagetutor.com/pagetutor/makapage/picker/\'>The Color Picker II</a>' => '',
+'For Web-Safe Color Names see <a class=\'wiki\' target=_blank href=\'http://www.bitweaver.org/wiki/index.php?page=Browser+ColorNames\'>Bitweaver</a> or for HTML Color numbers see <a class=\'wiki\' target=_blank href=\'http://www.pagetutor.com/pagetutor/makapage/picker/\'>The Color Picker II</a>' => '',
 'for wiki references' => 'pour une référence Wiki',
 'Found' => 'Trouvé',
 'Found \'<span class="highlight">cvs</span>\' in 0 pages' => '',
@@ -2960,7 +2960,7 @@ address.' => '',
 'Most read topics' => 'Sujets les plus lus',
 'Most Recent Editor' => '',
 'Most relevant pages' => 'Pages les plus pertinentes',
-'Most TikiPro Objects can be selected, including' => '',
+'Most Bitweaver Objects can be selected, including' => '',
 'Most visited blogs' => 'Blogues les plus visités',
 'Most visited forums' => 'Forums les plus visités',
 'Most visited sub-categories' => 'Sous-catégories les plus visitées',
@@ -3018,8 +3018,8 @@ address.' => '',
 'My Tiki' => 'Mon Tiki',
 'MyTiki (click!)' => 'MonTiki (clic!)',
 'MyTikiDoc' => 'MaDocTiki',
-'My TikiPro' => '',
-'My TikiPro Docs' => '',
+'My Bitweaver' => '',
+'My Bitweaver Docs' => '',
 'my tiki tpl' => 'mon tpl Tiki',
 'My User Groups' => '',
 'My watches' => 'Mes notifications',
@@ -3746,7 +3746,7 @@ For kernel/trash it would look in AlienSmileys, then "' => '',
 'powered by' => 'Utilise',
 'Powered by Adodb' => '',
 'Powered by Smarty' => '',
-'Powered by TikiPro' => '',
+'Powered by Bitweaver' => '',
 'ppd' => 'ar/jo',
 'pre' => 'pre',
 'Preferences' => 'Préférences',
@@ -4355,7 +4355,7 @@ All your tables will be replaced with the information in the backup.' => '',
 'Site Statistics' => '',
 'Site Stats' => 'Statistiques du site',
 'Sites to validate' => 'Sites à valider',
-'Sites using TikiPro' => '',
+'Sites using Bitweaver' => '',
 'Site Theme' => '',
 'Site title' => 'Titre de la fenêtre',
 '{$siteTitle|default:"Home"}' => '',
@@ -4733,7 +4733,7 @@ to preview the appeareance of the page, no versions are stored for this page.' =
 ' => '',
 'The text in RED is' => '',
 'The text is' => '',
-'The Themes package is an integral part of TikiPro which allows you to control the look and feel of you site.' => '',
+'The Themes package is an integral part of Bitweaver which allows you to control the look and feel of you site.' => '',
 'The thumbnail name must be' => 'Le nom de la vignette doit être',
 'the title of the map
 ' => 'le titre de la carta
@@ -4782,7 +4782,7 @@ dictionary, so it will not be translated, but the enclosing tr tags will dissape
 'this page' => 'cette page',
 'This page is being edited by' => 'Cette page est en train d\'être éditée par',
 'This plugin allows a Flash SWF file to be displayed.' => '',
-'This plugin automatically creates a link to the appropriate ))SourceForge(( object for ))TikiPro((.' => '',
+'This plugin automatically creates a link to the appropriate ))SourceForge(( object for ))Bitweaver((.' => '',
 'This plugin creates definition lists.' => '',
 'This plugin displays a graphical GAUGE.' => '',
 'This plugin insert a list of items for the current category or a given category.' => '',
@@ -4819,10 +4819,10 @@ phones, PDA\'s, i-mode devices and much more.' => '',
 'This will automatically recognise what the browsers default language is set to and display that language.<br />Please make sure you import appropriate languages first and disable / remove languages you don\'t want to support since loading a language for the first time will access your database quite a bit and might cause you system to slow down temporarily.' => '',
 'This will convert any posted URL into an easily readable and clickable link' => '',
 'This will display - P1 was set to = 7 & P2 was set to = 8' => '',
-'This will display translation strings for all TikiPro versions.' => '',
-'This will display translation strings for all TikiPro versions. This means it will also show strings that are not used at all and might be useless to you.' => '',
+'This will display translation strings for all Bitweaver versions.' => '',
+'This will display translation strings for all Bitweaver versions. This means it will also show strings that are not used at all and might be useless to you.' => '',
 'This will export all strings, even ones that are not in use. if you have not modified these strings, there isn\'t really much point in including them.' => '',
-'This will export translation strings for the all TikiPro versions.' => '',
+'This will export translation strings for the all Bitweaver versions.' => '',
 'This will prevent the generation of a new version. You can use this, if your changes are minor.' => '',
 'This will record any untranslated language strings.' => '',
 'This will restore the entire wiki to when you created this tag. All the entries since then will be lost.' => '',
@@ -4858,11 +4858,11 @@ phones, PDA\'s, i-mode devices and much more.' => '',
 'Tikipackage:blogs/center list blog posts.tpl' => '',
 'Tikipackage:fisheye/center list images.tpl' => '',
 'Tikipackage:users/center user wiki page.tpl' => '',
-'TikiPro' => '',
+'Bitweaver' => '',
 'TiKiPro</a> Web Site. ' => '',
-'TikiPro Docs' => '',
+'Bitweaver Docs' => '',
 'Tikipro gives you even more choices by allowing you to simply combine tags to form different formatting combinations. For example, \'\'__<i><b>this text is both italicized &amp; bold</b></i>__\'\'. __===<b><u>This text is both bold &amp; underlined</u></b>===__. \'\'__<i><u>This text is both italicized &amp; underlined</u></i>__\'\'.' => '',
-'TikiPro is hosted by SourceForge' => '',
+'Bitweaver is hosted by SourceForge' => '',
 'Tiki Projects' => '',
 'Tiki RSS Feed Error Message' => '',
 'Tiki RSS feed for articles' => '',
@@ -4917,7 +4917,7 @@ phones, PDA\'s, i-mode devices and much more.' => '',
 'to {$groupInfo.group_name}' => '',
 'to groups' => 'dans un groupe',
 'To <i>italicize</i> a word or phrase using Wiki syntax, simply surround it with two single quotes (apostrophes), like' => '',
-'To include any content from tikipro insert the apprpropriate numeric content id. This can include blog posts, images, wiki texts...<br />
+'To include any content from bitweaver insert the apprpropriate numeric content id. This can include blog posts, images, wiki texts...<br />
 					Avaliable content can be viewed <a href="/liberty/list_content.php">here</a>' => '',
 'To include any wiki page you can use it\'s page_id number.' => '',
 'To include any wiki page you can use it\'s page name (this has to be a unique name. if it\'s not unique, use the page_id instead) (this method is deprecated).' => '',
@@ -5012,7 +5012,7 @@ phones, PDA\'s, i-mode devices and much more.' => '',
 'trackers' => 'traqueurs',
 'Tracker was modified at ' => 'Le traqueur a été modifié à ',
 'Track Translation Usage' => '',
-'Track which strings are used in this version of TikiPro so only the currently used strings appear while editing translations. You MUST <a href="/languages/edit_languages.php">clear your language and templates cache</a> after enabling this option.' => '',
+'Track which strings are used in this version of Bitweaver so only the currently used strings appear while editing translations. You MUST <a href="/languages/edit_languages.php">clear your language and templates cache</a> after enabling this option.' => '',
 'Traditional Chinese' => 'Chinois trad.',
 'Transcript' => 'Rapport',
 'transcripts' => 'rapports',
@@ -5093,7 +5093,7 @@ phones, PDA\'s, i-mode devices and much more.' => '',
 'Upload a game' => 'Télécharger un jeu',
 'Upload a new game' => 'Télécharger un nouveau jeu',
 'Upload an image that will be shown on your personal page. This could possibly be a corporate image.' => '',
-'Upload a personal photo to be displayed on your TikiPro homepage.' => '',
+'Upload a personal photo to be displayed on your Bitweaver homepage.' => '',
 'Upload a small image or icon to be displayed next to your name on your forum and blog postings.' => '',
 'Upload Avatar' => '',
 'Upload backup' => 'Télécharger le fichier de sauvegarde',
@@ -5591,7 +5591,7 @@ phones, PDA\'s, i-mode devices and much more.' => '',
 'Wiki Watch' => 'Notification des changements Wiki',
 'WikiWords' => 'MotsWiki',
 'Will be replaced by the actual value of the dynamic content block with id=n' => 'pour afficher la valeur courante du contenu dynamique d\'identifiant n',
-'Will create a Tab interface on a page. The name on each tab is the name given to the imported page.The value sent with the TabX parameter is a TikiPro Numeric Content Id. This allows blog posts, images, wiki pages...and more to be added<br /><strong>Note:</strong> The order used when the tabs are specified does not matter. The Tabname does - Tab1 is always first and Tab99 will always be last. Avaliable content can be viewed ' => '',
+'Will create a Tab interface on a page. The name on each tab is the name given to the imported page.The value sent with the TabX parameter is a Bitweaver Numeric Content Id. This allows blog posts, images, wiki pages...and more to be added<br /><strong>Note:</strong> The order used when the tabs are specified does not matter. The Tabname does - Tab1 is always first and Tab99 will always be last. Avaliable content can be viewed ' => '',
 'Will create a table of contents of the WikiPage based on the headings below.' => '',
 'Will display the text centered' => 'pour centrer le texte',
 'Will display using the indicated HTML color' => 'pour afficher le texte avec la couleur HTML indiquée',
@@ -5802,7 +5802,7 @@ a moderator approves it.' => '',
 'You sent a request with the subject:' => '',
 'You should first ask that a calendar is created, so you can create events attached to it.' => 'Vous devez d\'abord demandé qu\'un calendrier soit créé pour pouvoir y attacher des événements.',
 'You will need to <a href="edit_languages.php?clear_cache=1">clear the System Cache</a> to see the changes.' => '',
-'You will need to <a href="`$gTikiLoc.LANGUAGES_PKG_URL`edit_language.php">clear the System Cache</a> to see the changes.' => '',
+'You will need to <a href="`$gTikiLoc.LANGUAGES_PKG_URL`edit_languages.php">clear the System Cache</a> to see the changes.' => '',
 'You will receive an email with information to login for the first time into this site' => 'Vous allez recevoir un email avec les informations vous expliquant comment faire pour activer votre compte',
 'You will receive an email with your password soon' => '',
 'You will remove' => 'Vous allez retirer',
@@ -5823,4 +5823,4 @@ a moderator approves it.' => '',
 '最後の変更' => '',
 '' => '',
 );
-?>
\ No newline at end of file
+?>
diff --git a/lang/no/language.php b/lang/no/language.php
index f9f31cc..e4e1e2c 100644
--- a/lang/no/language.php
+++ b/lang/no/language.php
@@ -307,7 +307,7 @@ $lang=Array(
 'Advanced' => 'Avansert',
 'Advanced Options' => 'Avanserte Valg',
 'Advanced Search' => 'Avansert Søk',
-'A filter to limit which <strong>TikiPro</strong> Object will be displayed on the page. The key-words are:' => 'Ett filter for å begrense hvilke <strong>TikiPro</strong> Objekt som vises på siden. Nøkkelordene er:',
+'A filter to limit which <strong>Bitweaver</strong> Object will be displayed on the page. The key-words are:' => 'Ett filter for å begrense hvilke <strong>Bitweaver</strong> Objekt som vises på siden. Nøkkelordene er:',
 'After changing this setting you might have to log in again.' => 'Etter at du har endret denne innstillingen må du kanskje logge inn på nytt.',
 'After page' => 'Efter sida',
 'Again' => 'Igjen',
@@ -735,7 +735,7 @@ from Admin->General
 ' | ::boolean:: |  if True (any value = True) the content will not be parsed. There default is __No__.
 ' => '',
 'both' => 'begge',
-'Both of these examples display "The Flash Mind Reader" by Andy Naughton. The first example is on your site and is not very large. The second example is located on the TikiPro.org site and takes the width of the center column with an appropriat height.' => 'Begge disse eksemplene viser "The Flash Mind Reader" av Andy Naughton. Det første eksemplet finnes på nettstedet TikiPro.org og tar for seg bredden til senter kolonnen med omtrentlig høyde.',
+'Both of these examples display "The Flash Mind Reader" by Andy Naughton. The first example is on your site and is not very large. The second example is located on the Bitweaver.org site and takes the width of the center column with an appropriat height.' => 'Begge disse eksemplene viser "The Flash Mind Reader" av Andy Naughton. Det første eksemplet finnes på nettstedet Bitweaver.org og tar for seg bredden til senter kolonnen med omtrentlig høyde.',
 'Bottom bar' => 'Sidfot',
 'box' => 'boks',
 'Box content' => 'Boksens innhold',
@@ -1140,10 +1140,10 @@ from Admin->General
 'Compile' => '',
 'Complete' => 'Ferdig',
 'Complete allows <em>anything at all</em>.  I (<a
-    href="http://tikipro.org/wiki/index.php?page=UserPagerlpowell">rlpowell</a>)
+    href="http://bitweaver.org/wiki/index.php?page=UserPagerlpowell">rlpowell</a>)
     cannot guarantee that it is bug-free or secure.' => '',
 'Complete allows <em>anything at all</em>.  I (<a

-    href="http://tikipro.org/wiki/index.php?page=UserPagerlpowell">rlpowell</a>)

+    href="http://bitweaver.org/wiki/index.php?page=UserPagerlpowell">rlpowell</a>)

     cannot guarantee that it is bug-free or secure.' => '',
 'Complete allows <em>anything at all</em>.  I (<a
     href="http://tikiwiki.org/tiki-index.php?page=UserPagerlpowell">rlpowell</a>)
@@ -1344,7 +1344,7 @@ name as the user)' => '',
 'Create PDF for EclipseCVS' => 'Opprett PDF for Eclipse CVS',
 'Creates a box with the data' => 'Skapa en låda med data',
 'Creates a definition list' => '',
-'Creates a listing of TikiPro objects that have not been categorized.' => 'Opprett en listing av TikiPro objekt som ennå ikke har blitt kategorisert',
+'Creates a listing of Bitweaver objects that have not been categorized.' => 'Opprett en listing av Bitweaver objekt som ennå ikke har blitt kategorisert',
 'Creates a ranking system based on the number of times a page is accessed.' => 'Opprett et rangeringssystem basert på antall ganger en side er besøkt',
 'creates a table' => 'opprett en tabell',
 'creates a title bar' => 'lag en tittellinje',
@@ -1774,10 +1774,10 @@ Set optional paramater -+ln+- to 1 if you need line numbering feature.' => '',
 'Edit this user module:' => '',
 'Edit TikiExportUpdate' => '',
 'Edit TikiNotifications' => '',
-'Edit TikiPro' => '',
-'Edit TikiProRequirements' => '',
-'Edit TikiPro_sites' => '',
-'Edit TikiWiki_and_TikiPro' => '',
+'Edit Bitweaver' => '',
+'Edit BitweaverRequirements' => '',
+'Edit Bitweaver_sites' => '',
+'Edit TikiWiki_and_Bitweaver' => '',
 'Edit tpl' => '',
 'Edit tracker fields' => 'Redigera spårhundens poster',
 'Edit Translation:' => '',
@@ -2018,7 +2018,7 @@ activity' => '',
 'Font' => 'Font',
 'Footnotes' => 'Fotnoter',
 'for' => 'for',
-'For additional information about this plugin - see TikiPro.Org or click <a class=\'wiki\' target=_blank href=\'{$p.tpopg}\'><strong>Here</strong></a> to visit.' => '',
+'For additional information about this plugin - see Bitweaver.Org or click <a class=\'wiki\' target=_blank href=\'{$p.tpopg}\'><strong>Here</strong></a> to visit.' => '',
 'for bullet lists' => 'for punktliste',
 'Force to use chars and nums in passwords' => 'Kräv att lösenordet innehåller siffror och bokstäver',
 'for definiton lists' => 'for definisjonsliste',
@@ -2026,10 +2026,10 @@ activity' => '',
 'ForMenu' => '',
 'For more information, please see <a href="{$helpurl}WikiSyntax">WikiSyntax</a>' => '',
 'For more information, please see <a
-href="http://www.tikipro.org/wiki/index.php?page=WikiSyntax">WikiSyntax</a>
+href="http://www.bitweaver.org/wiki/index.php?page=WikiSyntax">WikiSyntax</a>
 on <a href="http://www.tikiwiki.org">TikiWiki.org</a>.' => '',
 'For more information, please see <a

-href="http://www.tikipro.org/wiki/index.php?page=WikiSyntax">WikiSyntax</a>

+href="http://www.bitweaver.org/wiki/index.php?page=WikiSyntax">WikiSyntax</a>

 on <a href="http://www.tikiwiki.org">TikiWiki.org</a>.' => '',
 'For more information, please see <a
 href="http://www.tikiwiki.org/tiki-index.php?page=WikiSyntax">WikiSyntax</a>
@@ -2070,8 +2070,8 @@ on TikiWiki.org.' => '',
 'Forward messages to this forum to this e-mail address, in a format that can be used for sending back to the inbound forum e-mail address' => '',
 'Forward messages to this forum to this e-mail address, in a format that can be
 used for sending back to the inbound forum e-mail address' => '',
-'For Web-Safe Color Names see <a class=\'wiki\' target=_blank href=\'http://www.tikipro.org/wiki/Browser+ColorNames\'>TikiPro</a> or for HTML Color numbers see <a class=\'wiki\' target=_blank href=\'http://www.pagetutor.com/pagetutor/makapage/picker/\'>The Color Picker II</a>' => '',
-'For Web-Safe Color Names see <a class=\'wiki\' target=_blank href=\'http://www.tikipro.org/wiki/index.php?page=Browser+ColorNames\'>TikiPro</a> or for HTML Color numbers see <a class=\'wiki\' target=_blank href=\'http://www.pagetutor.com/pagetutor/makapage/picker/\'>The Color Picker II</a>' => '',
+'For Web-Safe Color Names see <a class=\'wiki\' target=_blank href=\'http://www.bitweaver.org/wiki/Browser+ColorNames\'>Bitweaver</a> or for HTML Color numbers see <a class=\'wiki\' target=_blank href=\'http://www.pagetutor.com/pagetutor/makapage/picker/\'>The Color Picker II</a>' => '',
+'For Web-Safe Color Names see <a class=\'wiki\' target=_blank href=\'http://www.bitweaver.org/wiki/index.php?page=Browser+ColorNames\'>Bitweaver</a> or for HTML Color numbers see <a class=\'wiki\' target=_blank href=\'http://www.pagetutor.com/pagetutor/makapage/picker/\'>The Color Picker II</a>' => '',
 'for wiki references' => 'som wiki referencer',
 'Found' => 'Funnet',
 'Found \'<span class="highlight">cvs</span>\' in 0 pages' => '',
@@ -2959,7 +2959,7 @@ address.' => '',
 'Most read topics' => 'Mest lästa ämnen',
 'Most Recent Editor' => 'Siste skribent',
 'Most relevant pages' => 'Mest relevante sider',
-'Most TikiPro Objects can be selected, including' => 'De fleste TikiPro Objekt kan velges, inkludert',
+'Most Bitweaver Objects can be selected, including' => 'De fleste Bitweaver Objekt kan velges, inkludert',
 'Most visited blogs' => 'Mest besøkte blogger',
 'Most visited forums' => 'Mest besökta fora',
 'Most visited sub-categories' => 'Mest besökta underkategorier',
@@ -3017,8 +3017,8 @@ address.' => '',
 'My Tiki' => 'My Tiki',
 'MyTiki (click!)' => 'MyTiki (click!)',
 'MyTikiDoc' => '',
-'My TikiPro' => 'Min TikiPro',
-'My TikiPro Docs' => '',
+'My Bitweaver' => 'Min Bitweaver',
+'My Bitweaver Docs' => '',
 'my tiki tpl' => '',
 'My User Groups' => 'Mine Brukergrupper',
 'My watches' => 'My watches',
@@ -3742,7 +3742,7 @@ For kernel/trash it would look in AlienSmileys, then "' => 'Tillatelse avslått
 'powered by' => 'drevet av',
 'Powered by Adodb' => 'Drevet av Adodb',
 'Powered by Smarty' => 'Drevet av Smarty',
-'Powered by TikiPro' => 'Drevet av TikiPro',
+'Powered by Bitweaver' => 'Drevet av Bitweaver',
 'ppd' => 'rättighetsbegränsing',
 'pre' => 'pre',
 'Preferences' => 'Innstilinger',
@@ -4349,7 +4349,7 @@ All your tables will be replaced with the information in the backup.' => '',
 'Site Statistics' => '',
 'Site Stats' => 'Nettsted Statistikk',
 'Sites to validate' => 'Sites to validate',
-'Sites using TikiPro' => '',
+'Sites using Bitweaver' => '',
 'Site Theme' => '',
 'Site title' => 'Nettleserens tittel',
 '{$siteTitle|default:"Home"}' => '',
@@ -4721,7 +4721,7 @@ to preview the appeareance of the page, no versions are stored for this page.' =
 ' => '',
 'The text in RED is' => '',
 'The text is' => '',
-'The Themes package is an integral part of TikiPro which allows you to control the look and feel of you site.' => '',
+'The Themes package is an integral part of Bitweaver which allows you to control the look and feel of you site.' => '',
 'The thumbnail name must be' => 'Indexbildens namn måste vara',
 'the title of the map
 ' => '',
@@ -4769,7 +4769,7 @@ dictionary, so it will not be translated, but the enclosing tr tags will dissape
 'this page' => '',
 'This page is being edited by' => '',
 'This plugin allows a Flash SWF file to be displayed.' => '',
-'This plugin automatically creates a link to the appropriate ))SourceForge(( object for ))TikiPro((.' => '',
+'This plugin automatically creates a link to the appropriate ))SourceForge(( object for ))Bitweaver((.' => '',
 'This plugin creates definition lists.' => '',
 'This plugin displays a graphical GAUGE.' => '',
 'This plugin insert a list of items for the current category or a given category.' => '',
@@ -4806,10 +4806,10 @@ phones, PDA\'s, i-mode devices and much more.' => '',
 'This will automatically recognise what the browsers default language is set to and display that language.<br />Please make sure you import appropriate languages first and disable / remove languages you don\'t want to support since loading a language for the first time will access your database quite a bit and might cause you system to slow down temporarily.' => '',
 'This will convert any posted URL into an easily readable and clickable link' => '',
 'This will display - P1 was set to = 7 & P2 was set to = 8' => '',
-'This will display translation strings for all TikiPro versions.' => '',
-'This will display translation strings for all TikiPro versions. This means it will also show strings that are not used at all and might be useless to you.' => '',
+'This will display translation strings for all Bitweaver versions.' => '',
+'This will display translation strings for all Bitweaver versions. This means it will also show strings that are not used at all and might be useless to you.' => '',
 'This will export all strings, even ones that are not in use. if you have not modified these strings, there isn\'t really much point in including them.' => '',
-'This will export translation strings for the all TikiPro versions.' => '',
+'This will export translation strings for the all Bitweaver versions.' => '',
 'This will prevent the generation of a new version. You can use this, if your changes are minor.' => '',
 'This will record any untranslated language strings.' => '',
 'This will restore the entire wiki to when you created this tag. All the entries since then will be lost.' => '',
@@ -4845,11 +4845,11 @@ phones, PDA\'s, i-mode devices and much more.' => '',
 'Tikipackage:blogs/center list blog posts.tpl' => '',
 'Tikipackage:fisheye/center list images.tpl' => '',
 'Tikipackage:users/center user wiki page.tpl' => '',
-'TikiPro' => '',
+'Bitweaver' => '',
 'TiKiPro</a> Web Site. ' => '',
-'TikiPro Docs' => '',
+'Bitweaver Docs' => '',
 'Tikipro gives you even more choices by allowing you to simply combine tags to form different formatting combinations. For example, \'\'__<i><b>this text is both italicized &amp; bold</b></i>__\'\'. __===<b><u>This text is both bold &amp; underlined</u></b>===__. \'\'__<i><u>This text is both italicized &amp; underlined</u></i>__\'\'.' => '',
-'TikiPro is hosted by SourceForge' => '',
+'Bitweaver is hosted by SourceForge' => '',
 'Tiki Projects' => '',
 'Tiki RSS Feed Error Message' => '',
 'Tiki RSS feed for articles' => '',
@@ -4904,7 +4904,7 @@ phones, PDA\'s, i-mode devices and much more.' => '',
 'to {$groupInfo.group_name}' => '',
 'to groups' => 'til grupper',
 'To <i>italicize</i> a word or phrase using Wiki syntax, simply surround it with two single quotes (apostrophes), like' => '',
-'To include any content from tikipro insert the apprpropriate numeric content id. This can include blog posts, images, wiki texts...<br />
+'To include any content from bitweaver insert the apprpropriate numeric content id. This can include blog posts, images, wiki texts...<br />
 					Avaliable content can be viewed <a href="/liberty/list_content.php">here</a>' => '',
 'To include any wiki page you can use it\'s page_id number.' => '',
 'To include any wiki page you can use it\'s page name (this has to be a unique name. if it\'s not unique, use the page_id instead) (this method is deprecated).' => '',
@@ -4999,7 +4999,7 @@ phones, PDA\'s, i-mode devices and much more.' => '',
 'trackers' => 'trackers',
 'Tracker was modified at ' => 'Tracker was modified at ',
 'Track Translation Usage' => '',
-'Track which strings are used in this version of TikiPro so only the currently used strings appear while editing translations. You MUST <a href="/languages/edit_languages.php">clear your language and templates cache</a> after enabling this option.' => '',
+'Track which strings are used in this version of Bitweaver so only the currently used strings appear while editing translations. You MUST <a href="/languages/edit_languages.php">clear your language and templates cache</a> after enabling this option.' => '',
 'Traditional Chinese' => '',
 'Transcript' => 'Transcript',
 'transcripts' => 'transcripts',
@@ -5080,7 +5080,7 @@ phones, PDA\'s, i-mode devices and much more.' => '',
 'Upload a game' => 'Lägg til ett spel',
 'Upload a new game' => 'Lägg til ett nytt spel',
 'Upload an image that will be shown on your personal page. This could possibly be a corporate image.' => 'Last opp et bilde som vil bli vist på din personlige side. Dette kan også være et firmabilde.',
-'Upload a personal photo to be displayed on your TikiPro homepage.' => 'Last opp et personligt bilde som blir vist på din TikiPro hjemmeside',
+'Upload a personal photo to be displayed on your Bitweaver homepage.' => 'Last opp et personligt bilde som blir vist på din Bitweaver hjemmeside',
 'Upload a small image or icon to be displayed next to your name on your forum and blog postings.' => 'Last opp et lite bilde eller ikon som skal vises ved navnet ditt i fora og blog innleggene dine.',
 'Upload Avatar' => 'Last opp Avatar',
 'Upload backup' => 'Återkspa säkerhetskopia',
@@ -5578,7 +5578,7 @@ phones, PDA\'s, i-mode devices and much more.' => '',
 'Wiki Watch' => '',
 'WikiWords' => '',
 'Will be replaced by the actual value of the dynamic content block with id=n' => 'Kommer att ersättas av det faktiska värdet av den dynamiska innehållsblok med ID=n',
-'Will create a Tab interface on a page. The name on each tab is the name given to the imported page.The value sent with the TabX parameter is a TikiPro Numeric Content Id. This allows blog posts, images, wiki pages...and more to be added<br /><strong>Note:</strong> The order used when the tabs are specified does not matter. The Tabname does - Tab1 is always first and Tab99 will always be last. Avaliable content can be viewed ' => '',
+'Will create a Tab interface on a page. The name on each tab is the name given to the imported page.The value sent with the TabX parameter is a Bitweaver Numeric Content Id. This allows blog posts, images, wiki pages...and more to be added<br /><strong>Note:</strong> The order used when the tabs are specified does not matter. The Tabname does - Tab1 is always first and Tab99 will always be last. Avaliable content can be viewed ' => '',
 'Will create a table of contents of the WikiPage based on the headings below.' => '',
 'Will display the text centered' => 'Kommer att visa texten centrerad',
 'Will display using the indicated HTML color' => 'Kommer att visas med den valda HTML färgen',
@@ -5785,7 +5785,7 @@ a moderator approves it.' => '',
 'You sent a request with the subject:' => '',
 'You should first ask that a calendar is created, so you can create events attached to it.' => 'You should first ask that a calendar is created, so you can create events attached to it.',
 'You will need to <a href="edit_languages.php?clear_cache=1">clear the System Cache</a> to see the changes.' => '',
-'You will need to <a href="`$gTikiLoc.LANGUAGES_PKG_URL`edit_language.php">clear the System Cache</a> to see the changes.' => '',
+'You will need to <a href="`$gTikiLoc.LANGUAGES_PKG_URL`edit_languages.php">clear the System Cache</a> to see the changes.' => '',
 'You will receive an email with information to login for the first time into this site' => 'You will receive an email with information to login for the first time into this site',
 'You will receive an email with your password soon' => 'You will receive an email with your password soon',
 'You will remove' => 'You will remove',
@@ -5806,4 +5806,4 @@ a moderator approves it.' => '',
 '最後の変更' => '',
 '' => 'Goddag Mann Økseskaft…',
 );
-?>
\ No newline at end of file
+?>
diff --git a/lang/zh-cn/language.php b/lang/zh-cn/language.php
index e3f1201..fc7bbb8 100644
--- a/lang/zh-cn/language.php
+++ b/lang/zh-cn/language.php
@@ -377,7 +377,7 @@ dictionary, so it will not be translated, but the enclosing tr tags will dissape
 'A date used to compare to the present date. Several date formats are accepted, but spelling it out like this: <strong>May 10 2004</strong> is probably the simplest. A time can be include with the date like this: <strong>20:02:00 or 8:02pm</strong> . There is <strong>NO</strong> Default.' => '',
 'A direction can be defined by adding either' => '',
 'A filter to limit which <strong>bitweaver</strong> Object will be displayed on the page. The key-words are:' => '',
-'A filter to limit which <strong>TikiPro</strong> Object will be displayed on the page. The key-words are:' => '',
+'A filter to limit which <strong>Bitweaver</strong> Object will be displayed on the page. The key-words are:' => '',
 'A gallery named <strong>{displayname hash=$gBitUser->mInfo nolink=1}\'s Gallery</strong> will be created for you and images will be added to it.' => '一个名为<strong>{displayname hash=$gBitUser->mInfo nolink=1}的图片夹</strong>将要建立，并且你的图片会传到此处。',
 'A gallery named <strong>{displayname hash=$gTikiUser->mInfo nolink=1}\'s Gallery</strong> will be created for you and images will be added to it.' => '一个名为<strong>{displayname hash=$gTikiUser->mInfo nolink=1}的图片夹</strong>将要建立，并且你的图片会传到此处。',
 'A link to this post was sent to the following addresses:' => '已经发送至此日志的链接至下列地址:',
@@ -1024,7 +1024,7 @@ dictionary, so it will not be translated, but the enclosing tr tags will dissape
 'boolean/string' => '',
 'both' => '粗斜体',
 'Both of these examples display "The Flash Mind Reader" by Andy Naughton. The first example is on your site and is not very large. The second example is located on the bitweaver.org site and takes the width of the center column with an appropriat height.' => '',
-'Both of these examples display "The Flash Mind Reader" by Andy Naughton. The first example is on your site and is not very large. The second example is located on the TikiPro.org site and takes the width of the center column with an appropriat height.' => '',
+'Both of these examples display "The Flash Mind Reader" by Andy Naughton. The first example is on your site and is not very large. The second example is located on the Bitweaver.org site and takes the width of the center column with an appropriat height.' => '',
 'Bottom bar' => '最下列',
 'box' => '盒',
 'Box content' => '方块内容',
@@ -1436,7 +1436,7 @@ dictionary, so it will not be translated, but the enclosing tr tags will dissape
 'Compile' => '',
 'Complete' => 'Complete',
 'Complete allows <em>anything at all</em>.  I (<a
-    href="http://tikipro.org/wiki/index.php?page=UserPagerlpowell">rlpowell</a>)
+    href="http://bitweaver.org/wiki/index.php?page=UserPagerlpowell">rlpowell</a>)
     cannot guarantee that it is bug-free or secure.' => '',
 'Complete allows <em>anything at all</em>.  I (<a
     href="http://tikiwiki.org/tiki-index.php?page=UserPagerlpowell">rlpowell</a>)
@@ -1445,7 +1445,7 @@ dictionary, so it will not be translated, but the enclosing tr tags will dissape
     href="http:tikiwiki.org/tiki-index.php?page=UserPagerlpowell">rlpowell</a>)
     cannot guarantee that it is bug-free or secure.' => '',
 'Complete allows <em>anything at all</em>.  I (<a
-    href="http://tikipro.org/wiki/index.php?page=UserPagerlpowell">rlpowell</a>)
+    href="http://bitweaver.org/wiki/index.php?page=UserPagerlpowell">rlpowell</a>)
     cannot guarantee that it is bug-free or secure.' => '',
 'Complete allows <em>anything at all</em>.  I (<a
     href="http://tikiwiki.org/tiki-index.php?page=UserPagerlpowell">rlpowell</a>)
@@ -1684,7 +1684,7 @@ name as the user)' => '',
 'Creates a link to SourceForge. Can be to the Bugs / RFEs / Patches / Support pages. Can also be to individual item..' => '',
 'Creates a link to SourceForge. Can link to the Bugs / RFEs / Patches / Support Index pages or individual items on those pages.' => '',
 'Creates a listing of bitweaver objects that have not been categorized.' => '',
-'Creates a listing of TikiPro objects that have not been categorized.' => '',
+'Creates a listing of Bitweaver objects that have not been categorized.' => '',
 'Creates a ranking system based on the number of times a page is accessed.' => '',
 'creates a table' => '建立表格',
 'creates a title bar' => '建立标题列',
@@ -2136,10 +2136,10 @@ Set optional paramater -+ln+- to 1 if you need line numbering feature.' => '',
 'Edit this user module:' => '编辑此用户模块:',
 'Edit TikiExportUpdate' => '',
 'Edit TikiNotifications' => '',
-'Edit TikiPro' => '',
-'Edit TikiProRequirements' => '',
-'Edit TikiPro_sites' => '',
-'Edit TikiWiki_and_TikiPro' => '',
+'Edit Bitweaver' => '',
+'Edit BitweaverRequirements' => '',
+'Edit Bitweaver_sites' => '',
+'Edit TikiWiki_and_Bitweaver' => '',
 'Edit tpl' => '',
 'Edit tracker fields' => '编辑追踪字段',
 'Edit Translation:' => '',
@@ -2400,7 +2400,7 @@ activity' => '',
 'Footnotes' => '脚注',
 'for' => '表示',
 'For additional information about this plugin - see bitweaver.Org or click <a class=\'wiki\' target=_blank href=\'{$p.tpopg}\'><strong>Here</strong></a> to visit.' => '',
-'For additional information about this plugin - see TikiPro.Org or click <a class=\'wiki\' target=_blank href=\'{$p.tpopg}\'><strong>Here</strong></a> to visit.' => '',
+'For additional information about this plugin - see Bitweaver.Org or click <a class=\'wiki\' target=_blank href=\'{$p.tpopg}\'><strong>Here</strong></a> to visit.' => '',
 'for additional information about this plugin, see <a class="external" href="http://www.bitweaver.org/wiki/index.php?page={$p.help_page}">{$p.help_page}</a>.' => '',
 'for additional information about this plugin, see <a onkeypress="popUpWin(this.href,\'full\',800,800);" onclick="popUpWin(this.href,\'full\',800,800);return false;" class="external" href="http://www.bitweaver.org/wiki/index.php?page=DataPluginAddTabs">DataPluginAddTabs</a>.' => '',
 'for additional information about this plugin, see <a onkeypress="popUpWin(this.href,\'full\',800,800);" onclick="popUpWin(this.href,\'full\',800,800);return false;" class="external" href="http://www.bitweaver.org/wiki/index.php?page=DataPluginAgentInfo">DataPluginAgentInfo</a>.' => '',
@@ -2426,7 +2426,7 @@ activity' => '',
 'for links' => '表示链接',
 'For more information and to enable / disable these plugins, please view the Liberty Plugins page.' => '',
 'For more information, please see <a
-href="http://www.tikipro.org/wiki/index.php?page=WikiSyntax">WikiSyntax</a>
+href="http://www.bitweaver.org/wiki/index.php?page=WikiSyntax">WikiSyntax</a>
 on <a href="http://www.tikiwiki.org">TikiWiki.org</a>.' => '',
 'For more information, please see <a
 href="http://www.tikiwiki.org/tiki-index.php?page=WikiSyntax">WikiSyntax</a>
@@ -2435,7 +2435,7 @@ on <a href="http://www.tikiwiki.org">TikiWiki.org</a>.' => '',
 href="http:www.tikiwiki.org/tiki-index.php?page=WikiSyntax">WikiSyntax</a>
 on <a href="http:www.tikiwiki.org">TikiWiki.org</a>.' => '',
 'For more information, please see <a
-href="http://www.tikipro.org/wiki/index.php?page=WikiSyntax">WikiSyntax</a>
+href="http://www.bitweaver.org/wiki/index.php?page=WikiSyntax">WikiSyntax</a>
 on <a href="http://www.tikiwiki.org">TikiWiki.org</a>.' => '',
 'For more information, please see <a
 href="http://www.tikiwiki.org/tiki-index.php?page=WikiSyntax">WikiSyntax</a>
@@ -2455,8 +2455,8 @@ on TikiWiki.org.' => '',
 'For official language codes, see <a class="external" href="http://www.loc.gov/standards/iso639-2/langcodes.html">ISO639-1</a> and to add a localistion you can append the country code from <a class="external" href="http://www.iso.org/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html">ISO 3166-1</a>.<br />e.g. ISO639-1 for english is "en" and the country code for britain is "uk". The resulting code is "en-uk".' => '',
 'For the Entire Site' => '',
 'For Web-Safe Color Names see <a class=\'wiki\' target=_blank href=\'http://www.bitweaver.org/wiki/Browser+ColorNames\'>bitweaver</a> or for HTML Color numbers see <a class=\'wiki\' target=_blank href=\'http://www.pagetutor.com/pagetutor/makapage/picker/\'>The Color Picker II</a>' => '',
-'For Web-Safe Color Names see <a class=\'wiki\' target=_blank href=\'http://www.tikipro.org/wiki/Browser+ColorNames\'>TikiPro</a> or for HTML Color numbers see <a class=\'wiki\' target=_blank href=\'http://www.pagetutor.com/pagetutor/makapage/picker/\'>The Color Picker II</a>' => '',
-'For Web-Safe Color Names see <a class=\'wiki\' target=_blank href=\'http://www.tikipro.org/wiki/index.php?page=Browser+ColorNames\'>TikiPro</a> or for HTML Color numbers see <a class=\'wiki\' target=_blank href=\'http://www.pagetutor.com/pagetutor/makapage/picker/\'>The Color Picker II</a>' => '',
+'For Web-Safe Color Names see <a class=\'wiki\' target=_blank href=\'http://www.bitweaver.org/wiki/Browser+ColorNames\'>Bitweaver</a> or for HTML Color numbers see <a class=\'wiki\' target=_blank href=\'http://www.pagetutor.com/pagetutor/makapage/picker/\'>The Color Picker II</a>' => '',
+'For Web-Safe Color Names see <a class=\'wiki\' target=_blank href=\'http://www.bitweaver.org/wiki/index.php?page=Browser+ColorNames\'>Bitweaver</a> or for HTML Color numbers see <a class=\'wiki\' target=_blank href=\'http://www.pagetutor.com/pagetutor/makapage/picker/\'>The Color Picker II</a>' => '',
 'for wiki references' => '表示 wiki 引用',
 'Force to use chars and nums in passwords' => '强制在密码中使用字符和数字',
 'ForMenu' => 'ForMenu',
@@ -3392,7 +3392,7 @@ address.' => '',
 'Most Recent Editor' => '最多最新修改',
 'Most recently modified pages' => '最多最新修改页面',
 'Most relevant pages' => '最相关页面',
-'Most TikiPro Objects can be selected, including' => '',
+'Most Bitweaver Objects can be selected, including' => '',
 'Most visited blogs' => '最多访问的日志',
 'Most visited forums' => '最多访客论坛',
 'Most visited sub-categories' => '最常被访问的子分类',
@@ -3454,8 +3454,8 @@ address.' => '',
 'My tasks' => '我的任务',
 'My Tiki' => '我的 Tiki',
 'my tiki tpl' => '',
-'My TikiPro' => '',
-'My TikiPro Docs' => '',
+'My Bitweaver' => '',
+'My Bitweaver Docs' => '',
 'My User Groups' => '我的用户组',
 'My watches' => '我的监视',
 'My {$siteTitle|default:\'Site\'}' => '',
@@ -4219,7 +4219,7 @@ For kernel/trash it would look in AlienSmileys, then "' => '',
 'Powered by Adodb' => '',
 'Powered by bitweaver' => '',
 'Powered by Smarty' => '',
-'Powered by TikiPro' => '',
+'Powered by Bitweaver' => '',
 'ppd' => '每日发表数',
 'pre' => 'pre',
 'Preferences' => '信息配置',
@@ -4854,7 +4854,7 @@ All your tables will be replaced with the information in the backup.' => '',
 'sites from the directory' => '个站点由这个目录',
 'Sites to validate' => '待确认的站点',
 'Sites using bitweaver' => '',
-'Sites using TikiPro' => '',
+'Sites using Bitweaver' => '',
 'Size' => '大小',
 'Size of page in bytes.' => '',
 'Size of Wiki Pages' => 'Wiki 页面大小',
@@ -5240,7 +5240,7 @@ to preview the appeareance of the page, no versions are stored for this page.' =
 'The text in RED is' => '',
 'The text is' => '',
 'The Text used for the link to the Specific Map' => '',
-'The Themes package is an integral part of TikiPro which allows you to control the look and feel of you site.' => '',
+'The Themes package is an integral part of Bitweaver which allows you to control the look and feel of you site.' => '',
 'The thumbnail name must be' => '缩列图的名称必须是',
 'The Title Bar is only visible when the Message Box is' => '',
 'The Title Bar is something like a Horizontal Rule with the Text Centered on it. It is used as a link to' => '',
@@ -5331,7 +5331,7 @@ to preview the appeareance of the page, no versions are stored for this page.' =
 'This plugin allows comments (Text that is not displayed) to be stored.' => '',
 'This plugin allows Comments (Text that will not be displayed) to be added to a page.' => '',
 'This plugin automatically creates a link to the appropriate ))SourceForge(( object for ))bitweaver((.' => '',
-'This plugin automatically creates a link to the appropriate ))SourceForge(( object for ))TikiPro((.' => '',
+'This plugin automatically creates a link to the appropriate ))SourceForge(( object for ))Bitweaver((.' => '',
 'This plugin creates a expandable box of text.. All text should be entered between the ' => '',
 'This plugin creates definition lists.' => '',
 'This plugin displays a graphical GAUGE.' => '',
@@ -5377,10 +5377,10 @@ phones, PDA\'s, i-mode devices and much more.' => '',
 'This will display - P1 was set to = 7 & P2 was set to = 8' => '',
 'This will display 2 boxes side by side with a Title Bar and text in each.^' => '',
 'This will display translation strings for all bitweaver versions. This means it will also show strings that are not used at all and might be useless to you.' => '',
-'This will display translation strings for all TikiPro versions.' => '',
-'This will display translation strings for all TikiPro versions. This means it will also show strings that are not used at all and might be useless to you.' => '',
+'This will display translation strings for all Bitweaver versions.' => '',
+'This will display translation strings for all Bitweaver versions. This means it will also show strings that are not used at all and might be useless to you.' => '',
 'This will export all strings, even ones that are not in use. if you have not modified these strings, there isn\'t really much point in including them.' => '这将导出所有的字符串，即使他并没有被使用。如果你想包含这些字符，你必需修改他们。',
-'This will export translation strings for the all TikiPro versions.' => '',
+'This will export translation strings for the all Bitweaver versions.' => '',
 'This will prevent the generation of a new version. You can use this, if your changes are minor.' => '这将阻止产生新的版本。如果你不需要新版本产生可以使用这个选项！',
 'This will record any untranslated language strings.' => '',
 'This will restore the entire wiki to when you created this tag. All the entries since then will be lost.' => '',
@@ -5431,10 +5431,10 @@ phones, PDA\'s, i-mode devices and much more.' => '',
 'Tikipackage:blogs/center list blog posts.tpl' => '',
 'Tikipackage:fisheye/center list images.tpl' => '',
 'Tikipackage:users/center user wiki page.tpl' => '',
-'TikiPro' => '',
-'TikiPro Docs' => '',
+'Bitweaver' => '',
+'Bitweaver Docs' => '',
 'Tikipro gives you even more choices by allowing you to simply combine tags to form different formatting combinations. For example, \'\'__<i><b>this text is both italicized &amp; bold</b></i>__\'\'. __===<b><u>This text is both bold &amp; underlined</u></b>===__. \'\'__<i><u>This text is both italicized &amp; underlined</u></i>__\'\'.' => '',
-'TikiPro is hosted by SourceForge' => '',
+'Bitweaver is hosted by SourceForge' => '',
 'TiKiPro</a> Web Site. ' => '',
 'TikiWiki Assistant' => '',
 'TikiWiki Syntax Format Parser' => '',
@@ -5482,9 +5482,9 @@ phones, PDA\'s, i-mode devices and much more.' => '',
 					Avaliable content can be viewed <a href="/liberty/list_content.php">here</a>' => '',
 'To include any content from bitweaver insert the apprpropriate numeric content id. This can include blog posts, images, wiki texts...<br />
 					Avaliable content can be viewed <a href="/liberty/list_content.php">here</a>' => '',
-'To include any content from tikipro insert the apprpropriate numeric content id. This can include blog posts, images, wiki texts...<br />
+'To include any content from bitweaver insert the apprpropriate numeric content id. This can include blog posts, images, wiki texts...<br />
 					Avaliable content can be viewed <a href="/liberty/list_content.php">here</a>' => '',
-'To include any content from tikipro insert the apprpropriate numeric content id. This can include blog posts, images, wiki texts...<br />
+'To include any content from bitweaver insert the apprpropriate numeric content id. This can include blog posts, images, wiki texts...<br />
 					Avaliable content can be viewed <a href="/liberty/list_content.php">here</a>' => '',
 'To include any wiki page you can use it\'s page name (this has to be a unique name. if it\'s not unique, use the page_id instead) (this method is deprecated).' => '',
 'To include any wiki page you can use it\'s page_id number.' => '',
@@ -5578,7 +5578,7 @@ phones, PDA\'s, i-mode devices and much more.' => '',
 'Total votes' => '总票数',
 'to_version' => '至版本',
 'Track Translation Usage' => '',
-'Track which strings are used in this version of TikiPro so only the currently used strings appear while editing translations. You MUST <a href="/languages/edit_languages.php">clear your language and templates cache</a> after enabling this option.' => '',
+'Track which strings are used in this version of Bitweaver so only the currently used strings appear while editing translations. You MUST <a href="/languages/edit_languages.php">clear your language and templates cache</a> after enabling this option.' => '',
 'Track which strings are used in your version of bitweaver so only the currently used strings appear while editing translations. You must clear your language and templates cache after enabling this option.' => '',
 'Trackback pings' => '跟踪插件',
 'Tracker' => '追踪',
@@ -5667,7 +5667,7 @@ phones, PDA\'s, i-mode devices and much more.' => '',
 'Upload a game' => '上传游戏',
 'Upload a new game' => '上传新游戏',
 'Upload a personal photo to be displayed on your bitweavercvs homepage.' => '',
-'Upload a personal photo to be displayed on your TikiPro homepage.' => '',
+'Upload a personal photo to be displayed on your Bitweaver homepage.' => '',
 'Upload a small image or icon to be displayed next to your name on your forum and blog postings.' => '',
 'Upload an image that will be shown on your personal page. This could possibly be a corporate image.' => '上传用于你个人页面显示的图片。这个可以是公司的标志。',
 'Upload Avatar' => '上传头像',
@@ -6311,7 +6311,7 @@ this link:
 'You must supply all the information, including title and year.' => '你必须提供所有信息, 包含标题与年份.',
 'you or someone registered this email address at' => '你或是某位注册此 email 地址的人',
 'You should first ask that a calendar is created, so you can create events attached to it.' => '你必须在建立日历时先询问, 以便建立要附加上去的事件',
-'You will need to <a href="`$smarty.const.LANGUAGES_PKG_URL`edit_language.php">clear the System Cache</a> to see the changes.' => '',
+'You will need to <a href="`$smarty.const.LANGUAGES_PKG_URL`edit_languages.php">clear the System Cache</a> to see the changes.' => '',
 'You will receive an email with information to login for the first time into this site' => '你将会收到 email 说明初次登录本站的信息',
 'You will receive an email with your password soon' => '你很快就会收到含有密码的 email',
 'You will remove' => '将会移除',