Просмотр исходного кода

Merge branch 'master' of https://github.com/boonex/dolphin

AntonLV 12 лет назад
Родитель
Сommit
158fa91c84
4 измененных файлов с 7 добавлено и 7 удалено
  1. 2 2
      README.md
  2. 1 1
      install/cmd.php
  3. 1 1
      install/templates/initial.php
  4. 3 3
      modules/boonex/english/data/langs/system.xml

+ 2 - 2
README.md

@@ -1,10 +1,10 @@
-#[Dolphin 8](http://www.boonex.com)
+#[Dolphin U](http://www.boonex.com)
 
 
 Community software platform
 Community software platform
 
 
 ##License
 ##License
 
 
-Dolphin is licensed under the Creative Commons Public License, see license.txt for full details.
+Dolphin U is licensed under the Creative Commons Public License, see license.txt for full details.
 
 
 ##Help
 ##Help
 
 

+ 1 - 1
install/cmd.php

@@ -38,7 +38,7 @@ class BxDolInstallCmd
             'db_name' => 'test',
             'db_name' => 'test',
             'db_user' => 'root',
             'db_user' => 'root',
             'db_password' => 'root',
             'db_password' => 'root',
-            'site_title' => 'Dolphin Test',
+            'site_title' => 'Dolphin U Test',
             'site_email' => 'no-reply@example.com',
             'site_email' => 'no-reply@example.com',
             'admin_email' => 'admin@example.com',
             'admin_email' => 'admin@example.com',
             'admin_username' => 'admin',
             'admin_username' => 'admin',

+ 1 - 1
install/templates/initial.php

@@ -1,6 +1,6 @@
 <div class="bx-install-initial">
 <div class="bx-install-initial">
 
 
-    <img class="bx-def-margin-bottom bx-install-dolphin" src="img/dolphin.png" alt="Dolphin 8" />
+    <img class="bx-def-margin-bottom bx-install-dolphin" src="img/dolphin.png" alt="Dolphin U" />
 
 
     <?php include('lang_swither.php'); ?>
     <?php include('lang_swither.php'); ?>
 
 

+ 3 - 3
modules/boonex/english/data/langs/system.xml

@@ -523,7 +523,7 @@
 	<string name="_adm_dbd_btn_update"><![CDATA[Update]]></string>
 	<string name="_adm_dbd_btn_update"><![CDATA[Update]]></string>
 	<string name="_adm_dbd_txt_db_size"><![CDATA[Database size: ]]></string>
 	<string name="_adm_dbd_txt_db_size"><![CDATA[Database size: ]]></string>
 	<string name="_adm_dbd_txt_dolphin_n_available"><![CDATA[Dolphin {0} available!]]></string>
 	<string name="_adm_dbd_txt_dolphin_n_available"><![CDATA[Dolphin {0} available!]]></string>
-	<string name="_adm_dbd_txt_dolphin_on"><![CDATA[Dolphin on]]></string>
+	<string name="_adm_dbd_txt_dolphin_on"><![CDATA[Dolphin U on]]></string>
 	<string name="_adm_dbd_txt_installed"><![CDATA[Installed:]]></string>
 	<string name="_adm_dbd_txt_installed"><![CDATA[Installed:]]></string>
 	<string name="_adm_dbd_txt_media_size"><![CDATA[User media files: ]]></string>
 	<string name="_adm_dbd_txt_media_size"><![CDATA[User media files: ]]></string>
 	<string name="_adm_dbd_txt_space_size"><![CDATA[Total space used: ]]></string>
 	<string name="_adm_dbd_txt_space_size"><![CDATA[Total space used: ]]></string>
@@ -1655,7 +1655,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_inst_server_audit"><![CDATA[Server audit]]></string>
 	<string name="_sys_inst_server_audit"><![CDATA[Server audit]]></string>
 	<string name="_sys_inst_site_config"><![CDATA[Site configuration]]></string>
 	<string name="_sys_inst_site_config"><![CDATA[Site configuration]]></string>
 	<string name="_sys_inst_start_installation"><![CDATA[Start installation]]></string>
 	<string name="_sys_inst_start_installation"><![CDATA[Start installation]]></string>
-	<string name="_sys_inst_title"><![CDATA[Dolphin {0} Installation]]></string>
+	<string name="_sys_inst_title"><![CDATA[Dolphin U {0} Installation]]></string>
 	<string name="_sys_layout_1_column"><![CDATA[1 column]]></string>
 	<string name="_sys_layout_1_column"><![CDATA[1 column]]></string>
 	<string name="_sys_layout_2_columns"><![CDATA[2 columns]]></string>
 	<string name="_sys_layout_2_columns"><![CDATA[2 columns]]></string>
 	<string name="_sys_layout_3_columns"><![CDATA[3 columns]]></string>
 	<string name="_sys_layout_3_columns"><![CDATA[3 columns]]></string>
@@ -1789,7 +1789,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_page_block_title_profile_stats"><![CDATA[Profile stats]]></string>
 	<string name="_sys_page_block_title_profile_stats"><![CDATA[Profile stats]]></string>
 	<string name="_sys_page_block_title_unsubscribe_news"><![CDATA[Unsubscribe From Site Newsletters]]></string>
 	<string name="_sys_page_block_title_unsubscribe_news"><![CDATA[Unsubscribe From Site Newsletters]]></string>
 	<string name="_sys_page_block_title_unsubscribe_notifications"><![CDATA[Unsubscribe From Site Notifications]]></string>
 	<string name="_sys_page_block_title_unsubscribe_notifications"><![CDATA[Unsubscribe From Site Notifications]]></string>
-	<string name="_sys_page_lang_block_about"><![CDATA[This site is powered by BoonEx Dolphin. The rest is a mystery.]]></string>
+	<string name="_sys_page_lang_block_about"><![CDATA[This site is powered by BoonEx Dolphin U. The rest is a mystery.]]></string>
 	<string name="_sys_page_title_about"><![CDATA[About]]></string>
 	<string name="_sys_page_title_about"><![CDATA[About]]></string>
 	<string name="_sys_page_title_account_profile_switcher"><![CDATA[Switch Profile]]></string>
 	<string name="_sys_page_title_account_profile_switcher"><![CDATA[Switch Profile]]></string>
 	<string name="_sys_page_title_account_settings_delete"><![CDATA[Delete Account]]></string>
 	<string name="_sys_page_title_account_settings_delete"><![CDATA[Delete Account]]></string>