diff options
| -rwxr-xr-x | docs/CHANGELOG | 3 | ||||
| -rw-r--r-- | lib/class/stream.class.php | 4 | ||||
| -rw-r--r-- | templates/show_install.inc | 2 | ||||
| -rw-r--r-- | templates/show_install_account.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_install_config.inc | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/docs/CHANGELOG b/docs/CHANGELOG index d50bf0fb..a41dd0b3 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -21,7 +21,8 @@ - Added Norwegian translation (Thx Ruudboy) - Added a clean_catalog() to the /bin/catalog_update.php.inc script - Removed all instances of $user->id - - Improved XMLRPC client and server functions + - Improved XMLRPC client and server functions, no longer attempts + to pull all songs at once, pulls in 500 song chunks - Added tables/fields for Dynamic Playlists and IP tracking -------------------------------------------------------------------------- diff --git a/lib/class/stream.class.php b/lib/class/stream.class.php index d550366c..1da0af29 100644 --- a/lib/class/stream.class.php +++ b/lib/class/stream.class.php @@ -195,9 +195,9 @@ class Stream { echo "ICECAST2<br>\n"; exec("killall ices"); $filename = conf('icecast_tracklist'); - echo "$filename " . _("Opened for writting") . "<br>\n"; + echo "$filename " . _("Opened for writing") . "<br>\n"; - /* Open the file for writting */ + /* Open the file for writing */ if (!$handle = @fopen($filename, "w")) { log_event($_SESSION['userdata']['username'],"icecast","Fopen: $filename Failed"); echo _("Error, cannot write") . " $filename<br>\n"; diff --git a/templates/show_install.inc b/templates/show_install.inc index ea1666b6..994cce73 100644 --- a/templates/show_install.inc +++ b/templates/show_install.inc @@ -33,7 +33,7 @@ <div class="text-box"> <span class="header1"><?php echo _("Ampache Installation"); ?></span> <p> -<?php echo _("This Page handles the installation of the ampache database and the creation of the ampache.cfg.php file. Before you continue please make sure that you have the following pre-requisits"); ?> +<?php echo _("This Page handles the installation of the Ampache database and the creation of the ampache.cfg.php file. Before you continue please make sure that you have the following pre-requisites"); ?> </br /> <ul> <li><?php echo _("A MySQL Server with a username and password that can create/modify databases"); ?></li> diff --git a/templates/show_install_account.inc.php b/templates/show_install_account.inc.php index 014e48dc..1cc18fff 100644 --- a/templates/show_install_account.inc.php +++ b/templates/show_install_account.inc.php @@ -34,7 +34,7 @@ <div class="text-box"> <span class="header1"><?php echo _("Ampache Installation"); ?></span> <p> -<?php echo _("This Page handles the installation of the ampache database and the creation of the ampache.cfg.php file. Before you continue please make sure that you have the following pre-requisits"); ?> +<?php echo _("This Page handles the installation of the Ampache database and the creation of the ampache.cfg.php file. Before you continue please make sure that you have the following pre-requisites"); ?> </br /> <ul> <li><?php echo _("A MySQL Server with a username and password that can create/modify databases"); ?></li> diff --git a/templates/show_install_config.inc b/templates/show_install_config.inc index 28544569..b6f5b297 100644 --- a/templates/show_install_config.inc +++ b/templates/show_install_config.inc @@ -34,7 +34,7 @@ <div class="text-box"> <span class="header1"><?php echo _("Ampache Installation"); ?></span> <p> -<?php echo _("This Page handles the installation of the ampache database and the creation of the ampache.cfg.php file. Before you continue please make sure that you have the following pre-requisits"); ?> +<?php echo _("This Page handles the installation of the Ampache database and the creation of the ampache.cfg.php file. Before you continue please make sure that you have the following pre-requisites"); ?> </br /> <ul> <li><?php echo _("A MySQL Server with a username and password that can create/modify databases"); ?></li> |