diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-01-24 08:59:59 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-01-24 08:59:59 +0000 |
| commit | 0fbaabb4c3047b4b49ec35d04e5aa10c7c0a3213 (patch) | |
| tree | 754e47971e6edcbaeb3108b7f986a1f612cac48f | |
| parent | f881a29430dc6d1cbca1a74a22048dd605a27ad0 (diff) | |
| download | ampache-0fbaabb4c3047b4b49ec35d04e5aa10c7c0a3213.tar.gz ampache-0fbaabb4c3047b4b49ec35d04e5aa10c7c0a3213.tar.bz2 ampache-0fbaabb4c3047b4b49ec35d04e5aa10c7c0a3213.zip | |
stll some faulty french translations but its a little better
| -rw-r--r-- | config/ampache.cfg.php.dist | 6 | ||||
| -rwxr-xr-x | docs/INSTALL | 11 | ||||
| -rwxr-xr-x | docs/MIGRATION | 10 | ||||
| -rwxr-xr-x | docs/README | 14 | ||||
| -rw-r--r-- | lib/init.php | 4 | ||||
| -rw-r--r-- | locale/fr_FR/LC_MESSAGES/messages.mo | bin | 35565 -> 42029 bytes | |||
| -rw-r--r-- | locale/fr_FR/LC_MESSAGES/messages.po | 175 | ||||
| -rw-r--r-- | server/ajax.server.php | 11 | ||||
| -rw-r--r-- | song.php | 4 | ||||
| -rw-r--r-- | templates/header.inc | 1 |
10 files changed, 78 insertions, 158 deletions
diff --git a/config/ampache.cfg.php.dist b/config/ampache.cfg.php.dist index e02b99ba..5fb88847 100644 --- a/config/ampache.cfg.php.dist +++ b/config/ampache.cfg.php.dist @@ -180,8 +180,8 @@ ratings = "true" # This defines the "Min" memory limit for PHP if your php.ini # has a lower value set Ampache will set it up to this. If you # set it below 16MB getid3() will not work! -# DEFAULT: 16 -#memory_limit = 16 +# DEFAULT: 24 +#memory_limit = 24 # Album Art Preferred Filename # Specify a filename to look for if you always give the same filename @@ -203,7 +203,7 @@ ratings = "true" # Simply arrange the following in the order you would like # ampache to search if you want to disable one of the search # method simply comment it out valid values are -# POSSIBLE VALUES: id3 folder amazon +# POSSIBLE VALUES: db id3 folder amazon # DEFAULT: db,id3,folder,amazon album_art_order = "db" album_art_order = "id3" diff --git a/docs/INSTALL b/docs/INSTALL index 58658d73..9ab59f9c 100755 --- a/docs/INSTALL +++ b/docs/INSTALL @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- ------------------- INSTALL - Ampache v.3.3 - 03/27/2005 ----------------------- +----------------- INSTALL - Ampache v.3.3.3 - 01/27/2007 ---------------------- ------------------------------------------------------------------------------- I'm assuming that you have Apache, PHP and MySQL running when you @@ -210,6 +210,15 @@ the fileupdate.pl program to run at timed intervals. This program will query the database and attempt to sort and rename your files based on the patterns you have specified and the tag information in the database. + + 3.5 Updating Tags from flagged information + + Ampache has a flagging system that allows users and admins to flag songs to be + re-encoded or modify their meta-data inside the website. Jirwin created a + command line script called write_tags.php.inc located in /bin that will attempt + to write out the tags as set, and approved in your Ampache database. This is a + *EXPERIMENTAL* feature and caution should be used as it may destroy your audio + files diff --git a/docs/MIGRATION b/docs/MIGRATION index a28ba887..8751e0d8 100755 --- a/docs/MIGRATION +++ b/docs/MIGRATION @@ -1,7 +1,15 @@ ------------------------------------------------------------------------------- ---------- MIGRATION - Ampache v.3.3 ----------- +--------- MIGRATION - Ampache v.3.3.3 ----------- ------------------------------------------------------------------------------- +- Migrating from Ampache 3.3.X --> 3.3.3 + + The newest release of Ampache will prompt Admins to download and + install a config file if their current one is out of date. While + ampache may work without the new config file, results may vary + it is strongly recommended that if prompted you install the newly + created config file + - Migrating from Ampache 3.3 --> 3.X+ After running /update.php check /test.php to make sure that you diff --git a/docs/README b/docs/README index e8f235d9..04f7475e 100755 --- a/docs/README +++ b/docs/README @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- ---------- README - Ampache v.3.3 ----------- +--------- README - Ampache v.3.3.3 ----------- ------------------------------------------------------------------------------- Contents: @@ -39,12 +39,15 @@ Contents: - MP3 (id3v1 && id3v2) - OGG - - WMA + - WMA/ASF - FLAC - RM - - AAC/M4A + - AAC/M4A/MP4 - MPC - WV + - SHN + - APE + - SPX B) Supported Stream Methods @@ -62,11 +65,13 @@ Contents: - Realtime Downsampled - XSPF Based Flash Player - Automatic Downsampling based on load + - Local/Remote network definition based downsampling - On the Fly Transcoding - Localplay - Music Player Daemon (MPD) - Xbox Media Center (XMBC) - Icecast2 + - Winamp using (HTTPQ) - Democratic Vote based play C) Current Translations @@ -118,7 +123,7 @@ Contents: PHP4 ICONV PHP4 ZLIB support (recommended) MySQL >= 4.x http://www.mysql.com - 16MB of Ram + 24MB of Ram 3. Setting Up @@ -127,7 +132,6 @@ Contents: your database or config.php files. You will need to follow the entire Ampache install guidelines oultined in the INSTALL file. - 3a. Upgrading Your Ampache Install If you are upgrading from an older version of Ampache we recommend diff --git a/lib/init.php b/lib/init.php index f3c2f109..ead55cbe 100644 --- a/lib/init.php +++ b/lib/init.php @@ -207,8 +207,8 @@ if (substr($post_size,strlen($post_size)-1,strlen($post_size)) != 'M') { ini_set('post_max_size','8M'); } -if ($results['memory_limit'] < 16) { - $results['memory_limit'] = 16; +if ($results['memory_limit'] < 24) { + $results['memory_limit'] = 24; } set_memory_limit($results['memory_limit']); diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo Binary files differindex a7c8d21a..54a94a71 100644 --- a/locale/fr_FR/LC_MESSAGES/messages.mo +++ b/locale/fr_FR/LC_MESSAGES/messages.mo diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po index 0a45e144..360de5fd 100644 --- a/locale/fr_FR/LC_MESSAGES/messages.po +++ b/locale/fr_FR/LC_MESSAGES/messages.po @@ -61,7 +61,6 @@ msgstr "Trouvé" #: ../../lib/class/catalog.class.php:1025 ../../lib/preferences.php:269 #: ../../lib/preferences.php:319 ../../lib/ui.lib.php:1194 #: ../../admin/catalog.php:259 -#, fuzzy msgid "None" msgstr "Non" @@ -190,7 +189,7 @@ msgstr "test des tags des morceaux trouvés" #: ../../lib/class/catalog.class.php:1522 msgid "Verifed" -msgstr "" +msgstr "Vérifié" #: ../../lib/class/catalog.class.php:1574 msgid " FOUND" @@ -205,17 +204,14 @@ msgid "Album Art Already Found" msgstr "Jaquette(s) d'album(s) déja trouvée(s)" #: ../../lib/class/catalog.class.php:1634 -#, fuzzy msgid "Update Finished." msgstr "Mise á jour du catalogue terminée" #: ../../lib/class/catalog.class.php:1634 -#, fuzzy msgid "Checked" msgstr "Test" #: ../../lib/class/catalog.class.php:1634 -#, fuzzy msgid "songs updated." msgstr " a été mis á jour" @@ -325,14 +321,12 @@ msgid "Error: Name Identical" msgstr "Erreur : noms identiques" #: ../../lib/class/flag.class.php:264 -#, fuzzy msgid "Approved" msgstr "Déplacé" #: ../../lib/class/flag.class.php:265 -#, fuzzy msgid "Pending" -msgstr "Ajout" +msgstr "Attente" #: ../../lib/class/flag.class.php:277 ../../templates/show_flag.inc.php:56 #: ../../templates/show_playlists.inc.php:57 @@ -349,7 +343,6 @@ msgid "Re-encode" msgstr "" #: ../../lib/class/flag.class.php:286 ../../templates/show_flag.inc.php:59 -#, fuzzy msgid "Other" msgstr "autre" @@ -367,12 +360,10 @@ msgid "Now Playing" msgstr "En cours de lecture" #: ../../lib/class/localplay.class.php:564 -#, fuzzy msgid "Stopped" msgstr "Stop" #: ../../lib/class/localplay.class.php:567 -#, fuzzy msgid "Paused" msgstr "Pause" @@ -441,7 +432,6 @@ msgstr "" #: ../../templates/show_localplay.inc.php:26 #: ../../templates/show_playtype_switch.inc.php:32 #: ../../ampache/templates/sidebar.inc.php:170 -#, fuzzy msgid "Localplay" msgstr "Lecture en local" @@ -475,7 +465,6 @@ msgid "XSPF" msgstr "" #: ../../lib/preferences.php:326 -#, fuzzy msgid "Disabled" msgstr "Désactiver" @@ -562,7 +551,6 @@ msgid "Local Play" msgstr "Lecture en local" #: ../../lib/ui.lib.php:799 -#, fuzzy msgid "Random Play" msgstr "Aléatoire" @@ -584,27 +572,22 @@ msgid "Preferences" msgstr "Préférences" #: ../../lib/ui.lib.php:811 ../../lib/ui.lib.php:815 -#, fuzzy msgid "Admin-Catalog" msgstr "Ajouter un catalogue" #: ../../lib/ui.lib.php:819 -#, fuzzy msgid "Admin-User Management" msgstr "Gestion des utilisateurs" #: ../../lib/ui.lib.php:823 -#, fuzzy msgid "Admin-Mail Users" msgstr "E-mail aux utilisateurs" #: ../../lib/ui.lib.php:827 -#, fuzzy msgid "Admin-Manage Access Lists" msgstr "Liste d'accès" #: ../../lib/ui.lib.php:831 -#, fuzzy msgid "Admin-Site Preferences" msgstr "Préférences administrateur" @@ -613,7 +596,6 @@ msgid "Admin-Manage Modules" msgstr "" #: ../../lib/ui.lib.php:839 -#, fuzzy msgid "Browse Music" msgstr "Parcourir" @@ -638,7 +620,6 @@ msgstr "Artistes" #: ../../lib/ui.lib.php:855 ../../templates/sidebar.inc.php:110 #: ../../ampache/templates/sidebar.inc.php:112 -#, fuzzy msgid "Statistics" msgstr "Statistiques des catalogues" @@ -728,12 +709,10 @@ msgstr "" #: ../../admin/catalog.php:62 ../../admin/catalog.php:82 #: ../../admin/catalog.php:107 ../../admin/catalog.php:168 -#, fuzzy msgid "Catalog Updated" msgstr "Mise á jour du catalogue terminée" #: ../../admin/catalog.php:119 -#, fuzzy msgid "Catalog Deleted" msgstr "Nettoyage de catalogue terminé" @@ -742,7 +721,6 @@ msgid "The Catalog and all associated records has been deleted" msgstr "" #: ../../admin/catalog.php:128 -#, fuzzy msgid "Songs Removed" msgstr "Fichiers enlevés" @@ -751,19 +729,16 @@ msgid "No Songs Removed" msgstr "" #: ../../admin/catalog.php:134 -#, fuzzy msgid "Disabled Songs Processed" msgstr "Voir les morceaux désactivés" #: ../../admin/catalog.php:155 -#, fuzzy msgid "Catalog Cleaned" msgstr "Nettoyage de catalogue terminé" #: ../../admin/catalog.php:198 -#, fuzzy msgid "Catalog Created" -msgstr "Nom de catalogue" +msgstr "catalogue a créé" #: ../../admin/catalog.php:199 #, fuzzy @@ -771,9 +746,8 @@ msgid "Catalog Created and Songs Indexed" msgstr "Nettoyage de catalogue terminé" #: ../../admin/catalog.php:212 -#, fuzzy msgid "Catalog statistics cleared" -msgstr "Statistiques des catalogues" +msgstr "Statistiques des catalogues effacer" #: ../../admin/catalog.php:222 msgid "Now Playing Cleared" @@ -824,9 +798,8 @@ msgstr "" "sactivé(s)" #: ../../admin/flag.php:139 -#, fuzzy msgid "Album Updated" -msgstr "Mis á jour" +msgstr "l'Album mis á jour" #: ../../admin/flag.php:181 #, fuzzy @@ -839,17 +812,16 @@ msgid "Songs Updated" msgstr "Score mis á jour" #: ../../admin/flag.php:254 -#, fuzzy msgid "Flag Removed" -msgstr "Fichiers enlevés" +msgstr "marquée enlevés" #: ../../admin/flag.php:255 msgid "Flag Removed from" -msgstr "" +msgstr "marquée effacer de" #: ../../admin/flag.php:270 msgid "Flags Updated" -msgstr "marquée ajoutée" +msgstr "marquée ajoutée" #: ../../admin/flag.php:289 msgid "Songs Disabled" @@ -870,17 +842,14 @@ msgid "The requested song(s) have been enabled" msgstr "" #: ../../admin/flag.php:305 -#, fuzzy msgid "Flagged Records" msgstr "Marqué par" #: ../../admin/preferences.php:60 ../../admin/preferences.php:83 -#, fuzzy msgid "Site" -msgstr "Taille" +msgstr "Site" #: ../../admin/access.php:42 -#, fuzzy msgid "Confirm Delete" msgstr "Entrée effacée" @@ -906,12 +875,10 @@ msgstr "" "Votre nouvelle liste d'accès a été créée" #: ../../admin/access.php:58 -#, fuzzy msgid "Entry Updated" msgstr "Entrée ajoutée" #: ../../admin/access.php:58 -#, fuzzy msgid "Access List Entry updated" msgstr "Ajouter une entrée dans la liste d'accès" @@ -933,7 +900,7 @@ msgstr "" #: ../../admin/users.php:143 msgid "Are you sure you want to permanently delete" -msgstr "Êtes-vous sûr de vouloir supprimer définitivement" +msgstr "étes-vous sûr de vouloir supprimer définitivement" #: ../../admin/users.php:148 ../../templates/show_confirm_action.inc.php:29 #: ../../templates/show_search.inc:78 @@ -993,14 +960,12 @@ msgid "Your E-mail was successfully sent." msgstr "" #: ../../admin/modules.php:41 -#, fuzzy msgid "Module Activated" -msgstr "Utilisateur activé" +msgstr "Mode activé" #: ../../admin/modules.php:48 -#, fuzzy msgid "Are you sure you want to remove this module?" -msgstr "Voulez-vous vraiment supprimer cette liste de lecture ?" +msgstr "Voulez-vous vraiment supprimer cette mode ?" #: ../../admin/modules.php:56 #, fuzzy @@ -1013,12 +978,10 @@ msgid "Plugin Activated" msgstr "Utilisateur activé" #: ../../admin/modules.php:79 -#, fuzzy msgid "Are you sure you want to remove this plugin?" msgstr "Voulez-vous vraiment supprimer cette liste de lecture ?" #: ../../admin/modules.php:95 -#, fuzzy msgid "Plugin Deactivated" msgstr "Utilisateur activé" @@ -1033,14 +996,12 @@ msgstr "Morceau marqué" #: ../../templates/show_flag.inc.php:45 #: ../../templates/show_edit_song.inc.php:27 -#, fuzzy msgid "File" msgstr "fichier" #: ../../templates/show_flag.inc.php:49 -#, fuzzy msgid "Item" -msgstr "Flux" +msgstr "article" #: ../../templates/show_flag.inc.php:53 msgid "Reason to flag" @@ -1048,12 +1009,12 @@ msgstr "Raison du marquage" #: ../../templates/show_flag.inc.php:57 msgid "Incorrect Tags" -msgstr "" +msgstr "mal Tags" #: ../../templates/show_flag.inc.php:70 #: ../../templates/show_flagged.inc.php:30 msgid "Flag" -msgstr "Marque" +msgstr "Marquée" #: ../../templates/show_install_account.inc.php:36 #: ../../templates/show_install_lang.inc.php:32 @@ -1215,7 +1176,6 @@ msgid "Download" msgstr "Télécharger" #: ../../templates/show_playlists.inc.php:75 -#, fuzzy msgid "No Playlists Found" msgstr "Non trouvé" @@ -1245,9 +1205,8 @@ msgid "Yes" msgstr "Oui" #: ../../templates/show_tv.inc.php:42 -#, fuzzy msgid "Controls" -msgstr "Sections administrateur" +msgstr "Commandes" #: ../../templates/show_tv.inc.php:57 #: ../../templates/show_localplay.inc.php:42 @@ -1256,7 +1215,6 @@ msgid "Current Playlist" msgstr "Créer un nouvelle liste de lecture" #: ../../templates/show_playlist_edit.inc.php:27 -#, fuzzy msgid "Editing Playlist" msgstr "Editer la liste de lecture" @@ -1296,7 +1254,6 @@ msgstr "Privé" #: ../../templates/show_play_selected.inc.php:64 #: ../../templates/show_preference_admin.inc.php:47 #: ../../templates/show_edit_access.inc:78 -#, fuzzy msgid "Update" msgstr "Mis á jour" @@ -1312,9 +1269,8 @@ msgstr "E-mail aux utilisateurs" #: ../../templates/sidebar.inc.php:31 #: ../../ampache/templates/sidebar.inc.php:31 -#, fuzzy msgid "Config" -msgstr "écrire la configuration" +msgstr "configuration" #: ../../templates/sidebar.inc.php:32 #: ../../ampache/templates/sidebar.inc.php:32 @@ -1323,7 +1279,6 @@ msgstr "Liste d'accès" #: ../../templates/sidebar.inc.php:37 #: ../../ampache/templates/sidebar.inc.php:37 -#, fuzzy msgid "Song Title" msgstr "Titre du morceau" @@ -1362,7 +1317,6 @@ msgid "Logout" msgstr "Déconnexion" #: ../../templates/show_admin_tools.inc.php:27 -#, fuzzy msgid "Catalogs" msgstr "Catalogues" @@ -1389,7 +1343,6 @@ msgid "Verify" msgstr "Vérifier" #: ../../templates/show_admin_tools.inc.php:46 -#, fuzzy msgid "Clean" msgstr "Supprimer les informations" @@ -1402,29 +1355,24 @@ msgid "Gather Art" msgstr "" #: ../../templates/show_admin_tools.inc.php:65 -#, fuzzy msgid "No Catalogs Found" msgstr "Aucun catalogue trouvé !" #: ../../templates/show_admin_tools.inc.php:71 -#, fuzzy msgid "Clean All" msgstr "Nettoyer tous les Catalogues" #: ../../templates/show_admin_tools.inc.php:72 -#, fuzzy msgid "Verify All" -msgstr "Tout voir" +msgstr "Tout Vérifier" #: ../../templates/show_admin_tools.inc.php:73 -#, fuzzy msgid "Add to All" -msgstr "Ajouter á" +msgstr "Ajouter á tout" #: ../../templates/show_admin_tools.inc.php:74 -#, fuzzy msgid "Update All" -msgstr "Mis á jour" +msgstr "Tout Mis á jour" #: ../../templates/show_admin_tools.inc.php:77 #: ../../templates/show_add_catalog.inc.php:78 @@ -1444,12 +1392,10 @@ msgid "Clear Now Playing" msgstr "Effacer lecture en cours" #: ../../templates/show_admin_tools.inc.php:85 ../../templates/header.inc:75 -#, fuzzy msgid "Generate New Config" msgstr "écrire la configuration" #: ../../templates/show_admin_tools.inc.php:86 -#, fuzzy msgid "Preferences Permissions" msgstr "Préférences" @@ -1458,7 +1404,6 @@ msgid "Export To Itunes DB" msgstr "" #: ../../templates/show_admin_tools.inc.php:88 -#, fuzzy msgid "Check for New Version" msgstr "Test de la configuration" @@ -1488,7 +1433,6 @@ msgid "Rename Artist" msgstr "Renommer l'artiste" #: ../../templates/show_artist_box.inc.php:39 -#, fuzzy msgid "Find duplicate artists" msgstr "Trouver des doublons" @@ -1503,7 +1447,6 @@ msgid "Results Per Page" msgstr "Résultats par page" #: ../../templates/show_user.inc.php:42 -#, fuzzy msgid "New Password" msgstr "Mot de passe" @@ -1518,28 +1461,25 @@ msgid "Clear Stats" msgstr "Vider les statistiques" #: ../../templates/show_user.inc.php:65 -#, fuzzy msgid "Update Account" msgstr "Créer un compte" #: ../../templates/show_user_stats.inc.php:22 msgid "Favorites" -msgstr "" +msgstr "Favoris" #: ../../templates/show_user_stats.inc.php:29 -#, fuzzy msgid "Favorite Artists" -msgstr "Liste complète des artistes" +msgstr "Liste favoris des artistes" #: ../../templates/show_user_stats.inc.php:40 -#, fuzzy msgid "Favorite Albums" -msgstr "Tous les albums" +msgstr "Liste favoris des albums" #: ../../templates/show_user_stats.inc.php:51 #, fuzzy msgid "Favorite Songs" -msgstr "Total des morceaux" +msgstr "Liste favoris des morceaux" #: ../../templates/show_tv_playlist.inc.php:31 #, fuzzy @@ -1623,19 +1563,16 @@ msgid "Start configuration" msgstr "Commencé configuration" #: ../../templates/show_modules.inc.php:38 -#, fuzzy msgid "Localplay Modules" msgstr "Lecture en local" #: ../../templates/show_modules.inc.php:41 -#, fuzzy msgid "Module Name" msgstr "Nom complet" #: ../../templates/show_modules.inc.php:48 #: ../../templates/show_modules.inc.php:81 #: ../../templates/show_tv_adminctl.inc.php:28 -#, fuzzy msgid "Activate" msgstr "Utilisateur activé" @@ -1651,7 +1588,6 @@ msgstr "Utilisateur activé" #: ../../templates/show_list_duplicates.inc.php:81 #: ../../templates/show_localplay_playlist.inc.php:51 #: ../../templates/show_disabled_songs.inc:44 -#, fuzzy msgid "No Records Found" msgstr "Aucun catalogue trouvé !" @@ -1660,17 +1596,14 @@ msgid "Available Plugins" msgstr "Plugins disponible" #: ../../templates/show_modules.inc.php:73 -#, fuzzy msgid "Description" msgstr "Description" #: ../../templates/show_modules.inc.php:74 -#, fuzzy msgid "Version" msgstr "Version de PHP" #: ../../templates/show_edit_song.inc.php:23 -#, fuzzy msgid "Edit Song" msgstr "édition" @@ -1686,10 +1619,9 @@ msgstr "OU" #: ../../templates/show_edit_album.inc.php:41 #: ../../templates/show_edit_artist.inc.php:35 msgid "Flag for Retagging" -msgstr "marqu&aecute;es pour indexation" +msgstr "marqu&aecute;es pour etiquettage" #: ../../templates/show_edit_song.inc.php:89 -#, fuzzy msgid "Update Song" msgstr "Mise á jour des catalogues" @@ -1741,7 +1673,6 @@ msgid "Most Popular Artists" msgstr "Artistes les plus populaires" #: ../../templates/show_mail_users.inc.php:63 -#, fuzzy msgid "Latest Album Additions" msgstr "Albums récemment ajoutés" @@ -1938,11 +1869,11 @@ msgstr "Genres les plus populaires" #: ../../templates/show_all_popular.inc.php:41 msgid "Most Popular Live Streams" -msgstr "Flux live plus populaire" +msgstr "Flux live les plus populaires" #: ../../templates/show_all_popular.inc.php:44 msgid "Most Popular Tags" -msgstr "Tags plus populaire" +msgstr "Tags les plus populaires" #: ../../templates/show_play_selected.inc.php:28 msgid "Play Selected" @@ -2140,7 +2071,7 @@ msgstr "Histoire d'IP" #: ../../templates/show_ip_history.inc.php:26 msgid "Show Unique" -msgstr "" +msgstr "Voir unique" #: ../../templates/show_ip_history.inc.php:34 msgid "Date" @@ -2184,13 +2115,11 @@ msgid "Guest" msgstr "Invite" #: ../../templates/show_edit_album.inc.php:23 -#, fuzzy msgid "Edit Album" msgstr "Editer l'Album" #: ../../templates/show_edit_album.inc.php:47 #: ../../templates/show_edit_artist.inc.php:41 -#, fuzzy msgid "Update Album" msgstr "Mis á jour" @@ -2199,17 +2128,14 @@ msgid "seconds ago" msgstr "secondes" #: ../../templates/show_recently_played.inc.php:23 -#, fuzzy msgid "minutes ago" msgstr "Minutes" #: ../../templates/show_recently_played.inc.php:23 -#, fuzzy msgid "hours ago" msgstr "heures" #: ../../templates/show_recently_played.inc.php:23 -#, fuzzy msgid "days ago" msgstr "jours" @@ -2222,12 +2148,10 @@ msgid "months ago" msgstr "mois" #: ../../templates/show_recently_played.inc.php:23 -#, fuzzy msgid "years ago" msgstr "année" #: ../../templates/show_recently_played.inc.php:26 -#, fuzzy msgid "Recently Played" msgstr "Moins joué" @@ -2236,7 +2160,6 @@ msgid "Last Played" msgstr "Derniers jouers" #: ../../templates/show_edit_artist.inc.php:23 -#, fuzzy msgid "Edit Artist" msgstr "Artiste" @@ -2249,7 +2172,6 @@ msgid "Song(s) Removed from Playlist" msgstr "Morceaux Supprimé" #: ../../localplay.php:77 -#, fuzzy msgid "Localplay Init Failed" msgstr "Controle de lecture locale" @@ -2262,7 +2184,6 @@ msgid "Show Artists starting with" msgstr "Voir les artistes commençant par" #: ../../browse.php:124 -#, fuzzy msgid "Show Titles Starting With" msgstr "Voir les artistes commençant par" @@ -2303,7 +2224,6 @@ msgid "Error: Password Does Not Match or Empty" msgstr "Erreur : Mot de passe ne correspondant pas ou vide" #: ../../preferences.php:61 -#, fuzzy msgid "Password Updated" msgstr "Mot de passe mise á jour" @@ -2356,9 +2276,8 @@ msgid "Are you sure you want to delete this playlist" msgstr "Voulez-vous vraiment supprimer cette liste de lecture ?" #: ../../playlist.php:57 -#, fuzzy msgid "Confirm Action" -msgstr "Confirmation du mot de passe" +msgstr "Confirmation d'action" #: ../../playlist.php:117 msgid "Playlist Created" @@ -2377,7 +2296,6 @@ msgid "Playlist Updated" msgstr "Liste de lecture mise á jour" #: ../../playlist.php:146 -#, fuzzy msgid "has been updated and is now" msgstr " a été mis á jour" @@ -2390,7 +2308,6 @@ msgid "Empty Playlists Deleted" msgstr "Liste de lecture supprimée" #: ../../flag.php:46 -#, fuzzy msgid "Item Flagged" msgstr "Marqué par" @@ -2413,7 +2330,6 @@ msgid "Album Art Not Located" msgstr "Jaquette d'album non trouvée" #: ../../albums.php:66 ../../albums.php:83 ../../albums.php:159 -#, fuzzy msgid "" "Album Art could not be located at this time. This may be due to write access " "error, or the file is not received corectly." @@ -2672,10 +2588,9 @@ msgstr "Reconstruire les préférences" #: ../../templates/show_preferences.inc:62 msgid "Interface" -msgstr "L'Interface" +msgstr "l'Interface" #: ../../templates/show_preferences.inc:65 -#, fuzzy msgid "Streaming" msgstr "Flux" @@ -2692,7 +2607,6 @@ msgid "System" msgstr "Le Serveur" #: ../../templates/show_preferences.inc:79 -#, fuzzy msgid "Modules" msgstr "Mode" @@ -2797,9 +2711,8 @@ msgstr "Adresse IP de fin" #: ../../templates/show_add_access.inc:57 #: ../../templates/show_edit_access.inc:67 -#, fuzzy msgid "Read" -msgstr "Raison" +msgstr "Lire" #: ../../templates/show_add_access.inc:58 #: ../../templates/show_edit_access.inc:68 @@ -2808,22 +2721,20 @@ msgstr "Lire/Ecrit" #: ../../templates/show_add_access.inc:64 #: ../../templates/show_edit_access.inc:31 -#, fuzzy msgid "ACL Type" -msgstr "Type" +msgstr "Type d'ACL" #: ../../templates/show_add_access.inc:67 -#, fuzzy msgid "Stream Access" -msgstr "Flux" +msgstr "Accés Flux" #: ../../templates/show_add_access.inc:68 msgid "Web Interface" -msgstr "" +msgstr "l'Interface Web" #: ../../templates/show_add_access.inc:69 msgid "Local Network Definition" -msgstr "" +msgstr "Définition de réseau local" #: ../../templates/show_add_access.inc:70 msgid "XML-RPC" @@ -2885,9 +2796,8 @@ msgid "Activity" msgstr "" #: ../../templates/show_users.inc:61 -#, fuzzy msgid "Last Ip" -msgstr "Dernier(s) vu(s)" +msgstr "Dernier(s) IPs" #: ../../templates/show_users.inc:66 msgid "On-line" @@ -2906,12 +2816,10 @@ msgid "Album Year" msgstr "Année de l'album" #: ../../templates/show_artist.inc:38 -#, fuzzy msgid "Tracks" msgstr "Pistes" #: ../../templates/show_edit_access.inc:23 -#, fuzzy msgid "Edit Access List" msgstr "Liste d'accès" @@ -2944,7 +2852,6 @@ msgid "PHP Version" msgstr "Version de PHP" #: ../../templates/show_test.inc:61 -#, fuzzy msgid "" "This tests to make sure that you are running a version of PHP that is known " "to work with Ampache." @@ -3057,7 +2964,6 @@ msgid "Search Ampache" msgstr "Recherche dans Ampache" #: ../../templates/show_similar_artists.inc:23 -#, fuzzy msgid "Similar Artists" msgstr "Liste complète des artistes" @@ -3067,21 +2973,19 @@ msgstr "" #: ../../templates/show_similar_artists.inc:62 msgid "Back" -msgstr "Avant" +msgstr "Préc&ecaute;dent" #: ../../templates/show_similar_artists.inc:73 -#, fuzzy msgid "Rename selected" -msgstr "Enlever les pistes sélectionnées" +msgstr "Renommer les sélectionnées" #: ../../templates/show_similar_artists.inc:83 msgid "Advanced Options" msgstr "Avancé" #: ../../templates/show_similar_artists.inc:144 -#, fuzzy msgid "Search Again" -msgstr "Recherche dans Ampache" +msgstr "Recherche encore" #: ../../templates/show_login_form.inc:35 #: ../../templates/show_login_form.inc:42 @@ -3150,7 +3054,6 @@ msgid "Exact" msgstr "exacte" #: ../../templates/show_search.inc:119 -#, fuzzy msgid "Maximum Results" msgstr "Nombre de résultats" diff --git a/server/ajax.server.php b/server/ajax.server.php index 3bd2fe11..3e913bea 100644 --- a/server/ajax.server.php +++ b/server/ajax.server.php @@ -49,12 +49,6 @@ switch ($action) { $value = scrub_in($_GET['value']); /* Return information based on function */ switch($function) { - case 'play': - case 'stop': - case 'pause': - case 'next': - case 'prev': - break; case 'skip': ob_start(); require_once(conf('prefix') . '/templates/show_localplay_playlist.inc.php'); @@ -67,7 +61,7 @@ switch ($action) { $results['lp_volume'] = $status['volume']; break; default: - $results = array(); + $results['3514'] = '0x1'; break; } // end switch on cmd $localplay->$function($value); @@ -197,7 +191,8 @@ switch ($action) { echo $xml_doc; break; default: - echo "Default Action"; + $results['3514'] = '0x1'; + echo xml_from_array($results); break; } // end switch action ?> @@ -37,8 +37,6 @@ $method = scrub_in($_REQUEST['method']); switch ($action) { case 'play_selected': - // Make sure they actually passed soemthing - if (!count($_POST['song'])) { header("Location:" . return_referer()); exit; } $type = scrub_in($_REQUEST['type']); if ($type == 'album') { $song_ids = get_songs_from_type($type, $_POST['song'], $_REQUEST['artist_id']); @@ -50,6 +48,8 @@ switch ($action) { else { $song_ids = $_POST['song']; } + // Make sure they actually passed soemthing + if (!count($song_ids)) { header("Location:" . return_referer()); exit; } break; /* This is run if we need to gather info based on a tmp playlist */ case 'tmp_playlist': diff --git a/templates/header.inc b/templates/header.inc index db02452f..1a8ca605 100644 --- a/templates/header.inc +++ b/templates/header.inc @@ -45,6 +45,7 @@ if (conf('use_rss')) { ?> <body> <script src="<?php echo $web_path; ?>/lib/javascript-base.js" language="javascript" type="text/javascript"></script> <script src="<?php echo $web_path; ?>/modules/kajax/ajax.js" language="javascript" type="text/javascript"></script> +<div id="3514" style="display:none;"></div> <div id="maincontainer" <?php if ($GLOBALS['theme']['orientation'] == 'horizontal') { echo " class=\"horizontal_menu\" "; |