修正了后台配置文件中的 4 处描述错误

后台配置文件，增加了 8 个字段

修改了登录错误的提示语句。

+YUCHENG HU+

git-svn-id: https://svn.code.sf.net/p/hawebs/svn@404 a2543c7e-f6e9-4f8a-8bff-1ffc34733512

oss/joomla/trunk/administrator/components/com_jdownloads/check.restore.jdownloads.php

@@ -18,9 +18,9 @@ function checkAfterRestore() {
     
   //*********************************************
   // JD VERSION:
-     $jd_version = '1.6';
-     $jd_version_state = 'Stable';
-     $jd_version_svn = '730';   
+     $jd_version = '1.7.1';
+     $jd_version_state = 'RC';
+     $jd_version_svn = '754'; 
   //*********************************************
     
     $output = '';
@@ -304,8 +304,58 @@ function checkAfterRestore() {
             $database->SetQuery("INSERT INTO #__jdownloads_config (setting_name, setting_value) VALUES ('rating.only.for.regged', '0')");
             $database->query();
             $sum_configs++;                    
-        }                
-                               
+        }
+        
+        // added in version 1.7.0
+        // **********************
+        $database->setQuery("SELECT * FROM #__jdownloads_config WHERE setting_name = 'view.also.download.link.text'");
+        $temp = $database->loadResult();
+        if (!$temp) {   
+            $database->SetQuery("INSERT INTO #__jdownloads_config (setting_name, setting_value) VALUES ('view.also.download.link.text', '1')");
+            $database->query();
+            $sum_configs++;                    
+        
+            $database->SetQuery("INSERT INTO #__jdownloads_config (setting_name, setting_value) VALUES ('auto.file.short.description', '0')");
+            $database->query();
+            $sum_configs++;                    
+
+            $database->SetQuery("INSERT INTO #__jdownloads_config (setting_name, setting_value) VALUES ('auto.file.short.description.value', '200')");
+            $database->query();
+            $sum_configs++;
+            
+            $database->SetQuery("INSERT INTO #__jdownloads_config (setting_name, setting_value) VALUES ('view.jom.comment', '0')");
+            $database->query();
+            $sum_configs++; 
+            
+            $database->SetQuery("INSERT INTO #__jdownloads_config (setting_name, setting_value) VALUES ('use.lightbox.function', '1')");
+            $database->query();
+            $sum_configs++;                               
+            
+            $database->SetQuery("INSERT INTO #__jdownloads_config (setting_name, setting_value) VALUES ('use.alphauserpoints', '0')");
+            $database->query();
+            $sum_configs++;
+            
+            $database->SetQuery("INSERT INTO #__jdownloads_config (setting_name, setting_value) VALUES ('use.alphauserpoints.with.price.field', '0')");
+            $database->query();
+            $sum_configs++;
+
+            $database->SetQuery("INSERT INTO #__jdownloads_config (setting_name, setting_value) VALUES ('user.can.download.file.when.zero.points', '1')");
+            $database->query();
+            $sum_configs++;
+
+            $database->SetQuery("INSERT INTO #__jdownloads_config (setting_name, setting_value) VALUES ('user.message.when.zero.points', '".JText::_('JLIST_BACKEND_SET_AUP_FE_MESSAGE_NO_DOWNLOAD')."')");
+            $database->query();
+            $sum_configs++;
+                         
+            $database->SetQuery("INSERT INTO #__jdownloads_config (setting_name, setting_value) VALUES ('limited.download.number.per.day', '0')");
+            $database->query();
+            $sum_configs++;                    
+
+            $database->SetQuery("INSERT INTO #__jdownloads_config (setting_name, setting_value) VALUES ('limited.download.reached.message', '".JText::_('JLIST_FE_MESSAGE_AMOUNT_FILES_LIMIT')."')");
+            $database->query();
+            $sum_configs++;                                
+        
+        }            
                   
         if ($sum_configs == 0) {
             $output .= '<font color="green"><strong> '.JText::_('JLIST_INSTALL_1').'</strong></font><br />';
@@ -333,6 +383,8 @@ function checkAfterRestore() {
         }
         
         // new alias fields
+        $tables = array( $prefix.'jdownloads_cats' );
+        $result = $database->getTableFields( $tables );
         if (!$result[$prefix.'jdownloads_cats']['cat_alias']){
             $database->SetQuery("ALTER TABLE #__jdownloads_cats ADD cat_alias varchar(255) NOT NULL default '' AFTER cat_title");
             if ($database->query()) {
@@ -340,13 +392,60 @@ function checkAfterRestore() {
             }    
         }
         // new alias fields
+        $tables = array( $prefix.'jdownloads_files' );
+        $result = $database->getTableFields( $tables );
         if (!$result[$prefix.'jdownloads_files']['file_alias']){
             $database->SetQuery("ALTER TABLE #__jdownloads_files ADD file_alias varchar(255) NOT NULL default '' AFTER file_title");
             if ($database->query()) {
             $sum_added_fields++;
             }    
+        }        
+        // new field for created file user-id - submitted by id
+        if (!$result[$prefix.'jdownloads_files']['submitted_by']){
+            $database->SetQuery("ALTER TABLE #__jdownloads_files ADD submitted_by INT(11) NOT NULL default '0' AFTER modified_date");
+            if ($database->query()) {
+            $sum_added_fields++;
+            }    
         }
+
+        // new field for add AUP points when published
+        if (!$result[$prefix.'jdownloads_files']['set_aup_points']){
+            $database->SetQuery("ALTER TABLE #__jdownloads_files ADD set_aup_points TINYINT(1) NOT NULL default '0' AFTER submitted_by");
+            if ($database->query()) {
+            $sum_added_fields++;
+            }    
+        }          
         
+        // new field for file date
+        if (!$result[$prefix.'jdownloads_files']['file_date']){
+            $database->SetQuery("ALTER TABLE #__jdownloads_files ADD file_date datetime NOT NULL default '0000-00-00 00:00:00' AFTER date_added");
+            if ($database->query()) {
+            $sum_added_fields++;
+            }    
+        }       
+        // new field for publish date
+        if (!$result[$prefix.'jdownloads_files']['publish_from']){
+            $database->SetQuery("ALTER TABLE #__jdownloads_files ADD publish_from datetime NOT NULL default '0000-00-00 00:00:00' AFTER file_date");
+            if ($database->query()) {
+            $sum_added_fields++;
+            }    
+        }       
+        // new field for publish date
+        if (!$result[$prefix.'jdownloads_files']['publish_to']){
+            $database->SetQuery("ALTER TABLE #__jdownloads_files ADD publish_to datetime NOT NULL default '0000-00-00 00:00:00' AFTER publish_from");
+            if ($database->query()) {
+            $sum_added_fields++;
+            }    
+        }   
+        // new field for use publish from and end date
+        if (!$result[$prefix.'jdownloads_files']['use_timeframe']){
+            $database->SetQuery("ALTER TABLE #__jdownloads_files ADD use_timeframe TINYINT(1) NOT NULL default '0' AFTER publish_to");
+            if ($database->query()) {
+            $sum_added_fields++;
+            }    
+        }               
+        
+                
         if ($sum_added_fields == 0) {
             $output .= "<font color='green'><strong> ".JText::_('JLIST_INSTALL_1_2')."</strong></font><br />";
         } else {

oss/joomla/trunk/administrator/components/com_jdownloads/install.sql

@@ -39,6 +39,10 @@
 		  `url_license` varchar(255) NOT NULL default '',
 		  `size` varchar(255) NOT NULL default '',
 		  `date_added` datetime NOT NULL default '0000-00-00 00:00:00',
+		  `file_date` datetime NOT NULL default '0000-00-00 00:00:00',
+		  `publish_from` datetime NOT NULL default '0000-00-00 00:00:00',
+		  `publish_to` datetime NOT NULL default '0000-00-00 00:00:00',
+          `use_timeframe` tinyint(1) NOT NULL default '0',
 		  `url_download` varchar(255) NOT NULL default '',
           `extern_file` varchar(255) NOT NULL default '',
           `extern_site` tinyint(1) NOT NULL default '0',
@@ -52,7 +56,9 @@
 		  `created_by` varchar(255) NOT NULL default '',
 		  `created_mail` varchar(255) NOT NULL default '',
 		  `modified_by` varchar(255) NOT NULL default '',
-		  `modified_date` datetime NOT NULL default '0000-00-00 00:00:00',		  
+		  `modified_date` datetime NOT NULL default '0000-00-00 00:00:00',
+		  `submitted_by` int(11) NOT NULL default '0',
+		  `set_aup_points` tinyint(1) NOT NULL default '0',
 		  `downloads` int(11) NOT NULL default '0',
 		  `cat_id` int(11) NOT NULL default '0',
           `metakey` TEXT NOT NULL default '',

oss/joomla/trunk/administrator/components/com_jdownloads/toolbar.jdownloads.html.php

@@ -1,33 +1,13 @@
 <?php
 /**
- * Copyright (C) 2006-2010 YUCHENG HU
- *
- * ----------------------------------------------------------------------------------
- * HA WEBSYSTEMS
- * http://www.hawebs.net
- * http://www.tcivis.com
- *
- * Contact
- * [email protected] / [email protected]
- *
- * ----------------------------------------------------------------------------------
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- * GNU GENERAL PUBLIC LICENSE
- *
- * ----------------------------------------------------------------------------------
- */
+* @version 1.5
+* @package JDownloads
+* @copyright (C) 2009 www.jdownloads.com
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* 
+*
+*/
 
 defined( '_JEXEC' ) or die( 'Restricted access' );
 
@@ -66,6 +46,7 @@ class menujlist {
 	function FILES_LIST(){
         JToolBarHelper::title( JText::_('JLIST_BACKEND_CPANEL_FILES'), 'jdlogo' ); 
         JToolBarHelper::addNew('files.edit');
+        JToolBarHelper::custom( 'files.move', 'move.png', 'move_f2.png', 'Move', false ); 
         JToolBarHelper::custom( 'files.copy', 'copy.png', 'copy_f2.png', 'Copy', false );     
 		JToolBarHelper::publish('files.publish');
 		JToolBarHelper::unpublish('files.unpublish');
@@ -79,8 +60,14 @@ class menujlist {
 		JToolBarHelper::cancel('files.cancel');
 	}
     
+    function FILES_MOVE(){
+        JToolBarHelper::title( JText::_('JLIST_BACKEND_FILES_MOVE_TITLE'), 'jdlogo' );
+        JToolBarHelper::save('files.move.save');
+        JToolBarHelper::cancel('files.list');
+    }     
+    
     function FILES_COPY(){
-        JToolBarHelper::title( JText::_(''), 'jdlogo' ); 
+        JToolBarHelper::title( JText::_('JLIST_BACKEND_FILES_COPY_TITLE'), 'jdlogo' ); 
         JToolBarHelper::save('files.copy.save');
         JToolBarHelper::cancel('files.list'); 
     }

oss/joomla/trunk/administrator/components/com_jdownloads/toolbar.jdownloads.php

@@ -1,34 +1,13 @@
 <?php
 /**
- * Copyright (C) 2006-2010 YUCHENG HU
- *
- * ----------------------------------------------------------------------------------
- * HA WEBSYSTEMS
- * http://www.hawebs.net
- * http://www.tcivis.com
- *
- * Contact
- * [email protected] / [email protected]
- *
- * ----------------------------------------------------------------------------------
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- * GNU GENERAL PUBLIC LICENSE
- *
- * ----------------------------------------------------------------------------------
- */
-
+* @version 1.5
+* @package JDownloads
+* @copyright (C) 2009 www.jdownloads.com
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* 
+*
+*/
 defined( '_JEXEC' ) or die( 'Restricted access' );
 require_once( $mainframe->getPath( 'toolbar_html' ) );
 
@@ -60,6 +39,10 @@ switch ( $task ) {
         case "files.copy":
             menujlist::FILES_COPY();
         break;
+
+        case "files.move":
+            menujlist::FILES_MOVE();
+        break;
         
         case "license.list":
 			menujlist::LICENSE_LIST();

oss/joomla/trunk/administrator/components/com_jdownloads/uninstall.jdownloads.php

@@ -1,48 +1,25 @@
 <?php
 /**
- * Copyright (C) 2006-2010 YUCHENG HU
- *
- * ----------------------------------------------------------------------------------
- * HA WEBSYSTEMS
- * http://www.hawebs.net
- * http://www.tcivis.com
- *
- * Contact
- * [email protected] / [email protected]
- *
- * ----------------------------------------------------------------------------------
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- * GNU GENERAL PUBLIC LICENSE
- *
- * ----------------------------------------------------------------------------------
- */
+* @version 1.5
+* @package jDownloads
+* @copyright (C) 2009 www.joomlaaddons.de
+* @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
+*
+* 
+*
+*/
 
 defined( '_JEXEC' ) or die( 'Restricted access' );
 
-/**
- *
- * @return unknown_type
- */
-function com_uninstall() {
 
-	$msg = '';
-	$msg = '<p align="center"><b><span style="color:#00CC00">下载目录和子目录内容未被卸载！</b></p>'
-	.'<p align="center"><b><span style="color:#00CC00">文件夹 images/jdownloads/ 未被卸载！</b></p>'
-	.'<p align="center"><b><span style="color:#00CC00"所有jDownloads 创建的数据表未被删除。</b></p>'
-	.'<p align="center">如有必要，请手工删除JDownloads相关的数据表。</p>'
-	.'<p align="center">否则，你仅可安装更新版本。</p>';
-	echo $msg;
+function com_uninstall() {
+    
+    $msg = '';
+    $msg = '<p align="center"><b><span style="color:#00CC00">The download folder and all subfolders still exists!</b></p>' 
+           .'<p align="center"><b><span style="color:#00CC00">Folder images/jdownloads/ still exists! </b></p>'
+           .'<p align="center"><b><span style="color:#00CC00">All jDownloads database tables still exist!</b></p>'
+           .'<p align="center">Please delete it (them) manually, if you want.</p>'
+           .'<p align="center">Otherwise you can now also install a newer version, when it is available.</p>';
+    echo $msg;
 }
 ?>

oss/joomla/trunk/administrator/language/en-GB/_notes/dwsync.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<dwsync>
-<file name="en-GB.com_admin.ini" server="hawebs.net//www/hawebs.net/news/" local="129211079280000000" remote="129220045200000000" />
-<file name="en-GB.com_cache.ini" server="hawebs.net//www/hawebs.net/news/" local="129212798234531250" remote="129220045200000000" />
-<file name="en-GB.mod_feed.ini" server="hawebs.net//www/hawebs.net/news/" local="129212798251562500" remote="129220045200000000" />
-<file name="en-GB.plg_editors_tinymce.ini" server="hawebs.net//www/hawebs.net/news/" local="129211890526406250" remote="129220045200000000" />
-<file name="en-GB.plg_xmlrpc_blogger.ini" server="hawebs.net//www/hawebs.net/news/" local="129212798262656250" remote="129220045200000000" />
-</dwsync>

oss/joomla/trunk/administrator/language/en-GB/en-GB.com_jdownloads.ini

@@ -18,7 +18,7 @@ JLIST_VERSION_FOOTER=
 # Installation data
 JLIST_INSTALL_0=Install information:
 JLIST_INSTALL_1=All config data exist in the database!
-JLIST_INSTALL_2=Config files are added in the database!
+JLIST_INSTALL_2=Config option are added in the database!
 JLIST_INSTALL_3=All default layouts exist in the database!
 JLIST_INSTALL_4=Default layouts saved in the database!
 JLIST_INSTALL_5=All default licenses exist in the database!
@@ -216,12 +216,12 @@ JLIST_BACKEND_SETTINGS_TEMPLATES_CATS_INFO_TITLE=<b>Category layout information:
 JLIST_BACKEND_SETTINGS_TEMPLATES_CATS_INFO_TEXT=<p>This is a graphical example of frontend category description display. The dark red border indicates the area you can change the display for here. </p>
 
 JLIST_BACKEND_SETTINGS_TEMPLATES_FILES=Layout: Files
-JLIST_BACKEND_SETTINGS_TEMPLATES_FILES_DESC=This is how <b>files</b> are displayed in the frontend. <br />Available placeholders (variables):<br />{checkbox_list} {cat_id} {file_id} {file_title} {file_name} {release} {pic_is_new} {pic_is_hot} {pic_is_updated} {thumbnail} {description} {link_to_details} {file_pic} {price_title} {price_value} {license_title} {license_text} {language_title} {language_text} {filesize_title} {filesize_value} {system_title} {system_text} {author_title} {author_text} {author_url_title} {author_url_text} {created_date_title} {created_date_value} {hits_title} {hits_value} {created_by_title} {created_by_value} {modified_by_title} {modified_by_value} {modified_date_title} {modified_date_value} {mirror_1} {mirror_2} {mp3_player} {mp3_id3_tag} {google_adsense} {report_link} {sum_jcomments} {rating}
+JLIST_BACKEND_SETTINGS_TEMPLATES_FILES_DESC=This is how <b>files</b> are displayed in the frontend. <br />Available placeholders (variables):<br />{checkbox_list} {cat_id} {file_id} {file_title} {file_name} {release} {pic_is_new} {pic_is_hot} {pic_is_updated} {thumbnail} {description} {link_to_details} {file_pic} {price_title} {price_value} {license_title} {license_text} {language_title} {language_text} {filesize_title} {filesize_value} {system_title} {system_text} {author_title} {author_text} {author_url_title} {author_url_text} {created_date_title} {created_date_value} {hits_title} {hits_value} {created_by_title} {created_by_value} {modified_by_title} {modified_by_value} {modified_date_title} {modified_date_value} {mirror_1} {mirror_2} {mp3_player} {mp3_id3_tag} {google_adsense} {report_link} {sum_jcomments} {rating} {file_date_title} {file_date}
 JLIST_BACKEND_SETTINGS_TEMPLATES_FILES_INFO_TITLE=<b>Information about file layout:</b>
 JLIST_BACKEND_SETTINGS_TEMPLATES_FILES_INFO_TEXT=<p>Example for displaying the list in frontend. Inside the red box you can edit the displaying options.</p>
 
 JLIST_BACKEND_SETTINGS_TEMPLATES_FINAL=Layout: Summary / Start download
-JLIST_BACKEND_SETTINGS_TEMPLATES_FINAL_DESC=This is the frontend <b>summary</b> display. A list of selected files is presented to the user before downloading.<br />Here is where you can modify the display of this page. CSS classes, HTML code and arbitrary text may be included.<br /><br />The <font color=red>{download_liste} and {download_link}</font> variable should <font color=red>NOT</font> be removed from the code!<br /><br />Available placeholders:<br />{summary_pic} {title_text} {download_liste} {license_note} {download_link} {external_download_info} {google_adsense} 
+JLIST_BACKEND_SETTINGS_TEMPLATES_FINAL_DESC=This is the frontend <b>summary</b> display. A list of selected files is presented to the user before downloading.<br />Here is where you can modify the display of this page. CSS classes, HTML code and arbitrary text may be included.<br /><br />The <font color=red>{download_liste} and {download_link}</font> variable should <font color=red>NOT</font> be removed from the code!<br /><br />Available placeholders:<br />{summary_pic} {title_text} {download_liste} {license_note} {download_link} {external_download_info} {google_adsense} {aup_points_info}
 JLIST_BACKEND_SETTINGS_TEMPLATES_FINAL_INFO_TITLE=<b>Information about summary layout</b>
 JLIST_BACKEND_SETTINGS_TEMPLATES_FINAL_INFO_TEXT=<p>This is a graphical example of this page in the frontend. The dark red border indicates the area you can change the display from here. </p>
 
@@ -278,7 +278,7 @@ JLIST_BACKEND_FILESLIST_SEARCH_LIMIT=Limit
 JLIST_BACKEND_FILESLIST_CATS=All Categories
 JLIST_BACKEND_FILESLIST_NOCATS=No Category
 JLIST_BACKEND_FILESLIST_FILE=Downloads
-JLIST_BACKEND_FILESLIST_HITS=Number of Downloads
+JLIST_BACKEND_FILESLIST_HITS=Downloaded
 JLIST_BACKEND_FILESLIST_CAT=Category
 JLIST_BACKEND_FILESLIST_RELEASE=Version
 
@@ -337,7 +337,7 @@ JLIST_BACKEND_FILESEDIT_RELEASE=Version
 JLIST_BACKEND_FILESEDIT_SIZE=Size
 JLIST_BACKEND_FILESEDIT_SIZE_DESC=If no choice, the size will be set automatically if possible. 
 
-JLIST_BACKEND_FILESEDIT_DADDED=Date and time
+JLIST_BACKEND_FILESEDIT_DADDED=Added to the download archive (Date and time) 
 JLIST_BACKEND_FILESEDIT_DADDED_DESC=Define the date in the following format: <b>YYYY-MM-DD H:mm:ss</b> or use the calendar function. When omitted the current date-time is used automatically
 JLIST_BACKEND_FILESEDIT_FILE=Select file for upload
 JLIST_BACKEND_FILESEDIT_FILE_DESC=In this field you can assign a file name for the file transferred to the server. This file name will be used for downloading.<br /><b>Note:</b> Exists already a file, this are first deleted. 
@@ -599,7 +599,7 @@ JLIST_BACKEND_AUTOCHECK_REFRESH_MESSAGE=You must refresh the page to see the mod
 JLIST_BACKEND_RESTORE_LOG_TAB_TITLE=Results for last backup restoration 
 
 JLIST_BACKEND_PANEL_STATUS_DESC_OFFLINE=The maintenance mode is activated! Therefore the Download area is not available at the moment for normal visitors! This download area is nevertheless available for members belonging to the "Author" group.
-JLIST_BACKEND_PANEL_STATUS_DOWNLOADS_HEADER=Downloads Status
+JLIST_BACKEND_PANEL_STATUS_DOWNLOADS_HEADER=Status Monitoring
 JLIST_BACKEND_PANEL_STATUS_DOWNLOADS_OFF_DESC=The automatic monitoring of the Download directories is deactivated!
 JLIST_BACKEND_PANEL_STATUS_VERSION_HEADER=jDdownloads current version information
 
@@ -745,7 +745,7 @@ JLIST_BACKEND_TEMP_TYP5=Download-Details
 JLIST_BACKEND_CPANEL_TEMPLATES_DETAILS=Download-Details
 JLIST_BACKEND_TEMPLIST_DETAILSTITLE_HEAD=Download-Details Layouts
 JLIST_BACKEND_SETTINGS_TEMPLATES_DETAILS=Layout: Download-Details
-JLIST_BACKEND_SETTINGS_TEMPLATES_DETAILS_DESC=This is the layout of the Downloads <b>Details page</b> in the Frontend.<br /><br />Do not remove the placeholder variable <font color=red>{url_download}</font><br /><br />Available variables (placeholders):<br />{file_title} {release} {file_name} {thumbnail} {pic_is_new} {pic_is_hot} {pic_is_updated} {url_download} {mirror_1} {mirror_2} {description_long} {details_block_title} {license_title} {license_text} {price_title} {price_value} {language_title} {language_text} {filesize_title} {filesize_value} {system_title} {system_text} {author_title} {author_text} {author_url_title} {author_url_text} {created_date_title} {created_date_value} {hits_title} {hits_value} {created_by_title} {created_by_value} {modified_by_title} {modified_by_value} {modified_date_title} {modified_date_value} {mp3_player} {mp3_id3_tag} {google_adsense} {report_link} {rating} 
+JLIST_BACKEND_SETTINGS_TEMPLATES_DETAILS_DESC=This is the layout of the Downloads <b>Details page</b> in the Frontend.<br /><br />Do not remove the placeholder variable <font color=red>{url_download}</font><br /><br />Available variables (placeholders):<br />{file_title} {release} {file_name} {thumbnail} {pic_is_new} {pic_is_hot} {pic_is_updated} {url_download} {mirror_1} {mirror_2} {description_long} {details_block_title} {license_title} {license_text} {price_title} {price_value} {language_title} {language_text} {filesize_title} {filesize_value} {system_title} {system_text} {author_title} {author_text} {author_url_title} {author_url_text} {created_date_title} {created_date_value} {hits_title} {hits_value} {created_by_title} {created_by_value} {modified_by_title} {modified_by_value} {modified_date_title} {modified_date_value} {mp3_player} {mp3_id3_tag} {google_adsense} {report_link} {rating} {file_date_title} {file_date}
 JLIST_BACKEND_SETTINGS_TEMPLATES_DETAILS_INFO_TITLE=<b>Information about Download details layout:</b>
 JLIST_BACKEND_SETTINGS_TEMPLATES_DETAILS_INFO_TEXT=<p>Graphical example of this page in the frontend. The dark red border indicates the area you can change the display from here.</p>
 
@@ -877,7 +877,7 @@ JLIST_BACKEND_SETTINGS_FAUTO_HEADER_TITLE=Monitoring of the download folders
 
 # NEW OPTION AUTOPUBLISH NEW FOUNDED FILES
 JLIST_BACKEND_SETTINGS_DOWNLOADS_AUTOPUBLISH_TITLE=Automatically publish downloads?
-JLIST_BACKEND_SETTINGS_DOWNLOADS_AUTOPUBLISH_DESC=If Yes, newly found files are published immediately. It is assumed the above option is enabled.<br /><b>Default: No.</b>
+JLIST_BACKEND_SETTINGS_DOWNLOADS_AUTOPUBLISH_DESC=If Yes, newly found files (and folders) are published immediately. It is assumed the above option is enabled.<br /><b>Default: No.</b>
 
 # NEW OPTION  FOR AUTODETECT ALL FILES
 JLIST_BACKEND_SETTINGS_FAUTO_ALL_FILES_TITLE=Monitor all filetypes?
@@ -1157,7 +1157,7 @@ JLIST_INSTALL_WARNING_DEFAULT_LAYOUTS_ARE_ACTIVE=Due to the introduction of a ne
 # NEW IN 1.5
 # ***************************************************************
 
-JLIST_INSTALL_ABORT=ERROR! You can only make a update from jDownloads v. 1.4. So you must first update to this version!
+JLIST_INSTALL_ABORT=ERROR! You can only make a update from the last published version to the newest release. So you must first update step by step to this version!
 
 # Backend EDIT TEMPLATES TOOLBAR TITLES
 JLIST_BACKEND_TEMPEDIT_CATTITLE=Edit Category Layout
@@ -1426,4 +1426,126 @@ JLIST_BACKEND_SETTINGS_RATING_ONLY_REGGED_TITLE=Only registered user can rate?
 JLIST_BACKEND_SETTINGS_RATING_ONLY_REGGED_DESC=When yes, only registered visitors can rate downloads.
 # NOTE FOR TRANSLATORS:  
 # please add in your translated file in JLIST_BACKEND_SETTINGS_TEMPLATES_FILES_DESC at (ca.) line 219 at the end: {rating} 
-# please add in your translated file in JLIST_BACKEND_SETTINGS_TEMPLATES_DETAILS_DESC at (ca.) line 748 at the end: {rating} 
+# please add in your translated file in JLIST_BACKEND_SETTINGS_TEMPLATES_DETAILS_DESC at (ca.) line 748 at the end: {rating} 
+
+#*****************************
+# ADDED IN v.1.7 stable
+#*****************************
+# NEW FOR MOVE DOWNLOADS TO OTHER CATEGORY
+JLIST_BACKEND_FILES_MOVE_TITLE=Move downloads
+JLIST_BACKEND_FILES_MOVE_DESC=Select the target Category:
+JLIST_BACKEND_FILES_MOVE_TEXT_1=These downloads are marked to move:
+JLIST_BACKEND_FILES_MOVE_TEXT_2=Hint: When you move a download to a other category, then will also the file moved to the target category folder!
+JLIST_BACKEND_FILES_MOVE_SAVED=Downloads are moved!
+
+# NEW FOR LAYOUT PLACEHOLDER {file_date} 
+JLIST_FE_FILELIST_FILE_DATE_TITLE=File Date
+JLIST_FE_DETAILS_FILE_DATE_TITLE=File Date
+
+# NEW FOR FILE DATA FIELD FILE_DATE 
+JLIST_EDIT_FILE_FILE_DATE_TITLE=File Date
+JLIST_EDIT_FILE_FILE_DATE_DESC=The creation date from the file. It is not possible to set this date automaticly.<br />Define the date in the following format: <b>YYYY-MM-DD H:mm:ss</b> or use the calendar function. 
+
+# NEW OPTION FOR USE JOM COMMENT (AZRUL)
+JLIST_BACKEND_SETTINGS_JOM_COMMENT_TITLE=Support JomComment?
+JLIST_BACKEND_SETTINGS_JOM_COMMENT_EXISTS_DESC=Yes, shows the JomComment function in the download details pages<br /><b>JomComment is already installed!</b>
+JLIST_BACKEND_SETTINGS_JOM_COMMENT_DESC=Yes, activate the comments function from <b>JomComment</b> in the frontend.<br /><b>JomComment</b> is NOT included with jDownloads and must be installed and configured separately (see <a href="http://www.azrul.com">www.azrul.com</a>)
+JLIST_BACKEND_SETTINGS_JOM_COMMENT_NOTE=Note: You can only activate one from this both comment components! 
+
+# NEW OPTION FOR SHORT AUTOMATICLY SHORT DESCRIPTION
+JLIST_BACKEND_USE_CUT_DESCRIPTION_TITLE=Cut automaticly short description?
+JLIST_BACKEND_USE_CUT_DESCRIPTION_TITLE_DESC=When yes, the files short description is automaticly shortened to the below specified amount of characters. This is used for the download list view in the frontend.
+JLIST_BACKEND_USE_CUT_DESCRIPTION_LENGTH_TITLE=Amount of characters:
+JLIST_BACKEND_USE_CUT_DESCRIPTION_LENGTH_TITLE_DESC=
+
+# NEW OPTION FOR VIEW DOWNLOAD PIC AND TEXT
+JLIST_BACKEND_USE_PIC_AND_TEXT_FOR_DOWNLOAD_TITLE=View Download icon and text?
+JLIST_BACKEND_USE_PIC_AND_TEXT_FOR_DOWNLOAD_TITLE_DESC=When yes, is viewed for the download link a icon and below a text (as sample: Download). When no, only the Icon is viewed.
+
+# NEW DATA FIELD FOR START AND END DATE PUBLISHING FILE
+JLIST_EDIT_FILE_START_END_DATE_ACTIVATE_TITLE=Use publishing timeframe?
+JLIST_EDIT_FILE_START_END_DATE_ACTIVATE_DESC=When yes, the fields below will use for the publishing timeframe. Otherwise is the publishing timeframe not limitted.
+JLIST_EDIT_FILE_START_DATE_TITLE=Start date:
+JLIST_EDIT_FILE_END_DATE_TITLE=End date: 
+
+# NEW FOR MENU SELECTION
+JD_MENU_CATEGORIES_LIST_LAYOUT=Categories List Layout
+JD_MENU_CATEGORIES_LIST_LAYOUT_DESC=This Layout shows a list of all jDownloads Categories.
+JD_MENU_CATEGORIES_LIST_TITLE=All Categories
+JD_MENU_CATEGORY_LIST_LAYOUT=Category Layout
+JD_MENU_CATEGORY_LIST_LAYOUT_DESC=This Layout shows a list of all Downloads within a particular Category.
+JD_MENU_CATEGORY_LIST_TITLE=Single Category
+JD_MENU_CATEGORY_LIST_LABEL1=Select an Category
+JD_MENU_CATEGORY_LIST_LABEL1_DESC=Important: All listed Categories are published, but check that you not set a public menu link to a category with restricted access rights.<br />Data order: Title / ID.
+JD_MENU_UPLOAD_LAYOUT=Frontend Upload Layout
+JD_MENU_UPLOAD_LAYOUT_DESC=Allow Users to submit Downloads.
+JD_MENU_UPLOAD_LIST_TITLE=Upload Form
+JD_MENU_VIEWDOWNLOAD_LAYOUT=Single Download Layout
+JD_MENU_VIEWDOWNLOAD_LAYOUT_DESC=This Layout views a single Download.
+JD_MENU_VIEWDOWNLOAD_LIST_TITLE=Single Download
+JD_MENU_VIEWDOWNLOAD_LABEL2_DESC=Data order: Title / File-ID / Category-ID.<br />Important: You must also above select the Category from the choosed Download.
+JD_MENU_VIEWDOWNLOAD_LABEL2=Select an Download
+
+# NEW FOR LIGHTBOX OPTION FRONTEND
+JLIST_BACKEND_SETTINGS_USE_LIGHTBOX_TITLE=Use jDownloads Lighbox function?
+JLIST_BACKEND_SETTINGS_USE_LIGHTBOX_DESC=Sometimes you has always installed a lightbox plugin. Then you can here set off the included lightbox function from jDownloads. But test it previously.
+
+# ADDED FOR RUN NEW MONITORING FUNCTION
+JLIST_RUN_MONITORING_INFO2=Downloads area check started... Please wait! 
+JLIST_RUN_MONITORING_INFO3=First step: Search new jDownloads folders... 
+JLIST_RUN_MONITORING_INFO4=Second step: Check all published jDownloads categories (folders)...
+JLIST_RUN_MONITORING_INFO5=Third step: Search new jDownloads files...
+JLIST_RUN_MONITORING_INFO6=Last step: Check all published downloads (files)...
+JLIST_RUN_MONITORING_INFO7=Finished! You can now close this window.
+
+# ADDED FOR CP STATS
+JLIST_BACKEND_CP_STATS_TEXT=The download archive contains currently #1 downloads in #2 categories. To date, these have been downloaded #3 times. Current are #4 categories and #5 downloads not published.
+
+# NEW FOR ALPHAUSERPOINTS RULES
+JLIST_BACKEND_SET_AUP_HEADER=Settings for Alphauserpoints Support
+JLIST_BACKEND_SET_AUP_HEADER_TEXT=You can this options only use, when you has installed the Alphauserpoints component from www.alphaplug.com and additional, the Alphauserpoints Plugins for jDownloads. See FAQ for more informations.
+JLIST_BACKEND_SET_AUP_TITLE=Use Alphauserpoints rules?
+JLIST_BACKEND_SET_AUP_DESC=When yes, registered users can received points for special actions in the frontend.
+JLIST_BACKEND_SET_AUP_UPLOAD_TEXT=Upload (Title: %s) in our File area.
+JLIST_BACKEND_SET_AUP_DOWNLOAD_TEXT=Download file (Title: %s).
+JLIST_BACKEND_SET_AUP_DOWNLOAD_WHEN_ZERO_POINTS_TEXT=May user download when he has no points or too few?
+JLIST_BACKEND_SET_AUP_DOWNLOAD_WHEN_ZERO_POINTS_DESC=When yes, a user can always download a file. When no, he see the message below, when he has not enough points for the download.
+JLIST_BACKEND_SET_AUP_FE_MESSAGE_NO_DOWNLOAD_EDIT=This text is indicated the user
+JLIST_BACKEND_SET_AUP_FE_MESSAGE_NO_DOWNLOAD=Sorry, but you has not enough points to download this file. Please recharge first your point account. 
+JLIST_BACKEND_SET_AUP_USE_FILE_PRICE_TITLE=Use files price field as points?
+JLIST_BACKEND_SET_AUP_USE_FILE_PRICE_DESC=When yes, the value in the files price field is used when a user will download a file. So this value is deducted from his point account.
+JLIST_BACKEND_SET_AUP_FE_MESSAGE_NO_DOWNLOAD_POINTS=Your points:
+JLIST_BACKEND_SET_AUP_FE_MESSAGE_NO_DOWNLOAD_NEEDED=Needed points:
+
+# ADDED FOR SIMPLE DOWNLOADS LIMIT PER DAY (GLOBAL)
+JLIST_FE_MESSAGE_AMOUNT_FILES_LIMIT=You has your limit at downloads for today reached!<br />When this calender day is over (Server time 00:00:01), you can download the next files.<br /><br />Current server time:
+JLIST_BACKEND_SET_AMOUNTS_FILE_LIMIT_TITLE=How many files can users download in a day?
+JLIST_BACKEND_SET_AMOUNTS_FILE_LIMIT_DESC=Set here the amount of files, where users can download per day. Is the limit reached, the user see the message below. When you set it to 0 it is unlimited.<br /><b>Attention:</b> This option works not for mass downloads (Layouts with checkboxes)!
+
+# NOTE FOR TRANSLATORS:  
+# please add in your prior translated file in JLIST_BACKEND_SETTINGS_TEMPLATES_FILES_DESC at (ca.) line 219 at the end: {file_date_title} and {file_date} 
+# please add in your prior translated file in JLIST_BACKEND_SETTINGS_TEMPLATES_DETAILS_DESC at (ca.) line 748 at the end: {file_date_title} and {file_date}
+# changed text for JLIST_BACKEND_FILESEDIT_DADDED in line 340
+
+# ********************************
+# CHANGED / ADDED IN 1.7 BUILD 760
+# ********************************
+
+# NEW FOR SEARCH
+JLIST_FRONTEND_SEARCH_DESCRIPTION=Please break searched terms with blank and use not punctuation. It is searched by every search keyword. On the top from the results list is the the downloads with the most hits.
+
+# NEW FOR AUTO MONITORING
+JLIST_BACKEND_AUTOCHECK_SUM_FOLDERS=Checked Directories:
+JLIST_BACKEND_AUTOCHECK_SUM_FILES=Checked Files:
+
+# NEW FOR SUMMARY PAGE AUP POINTS VIEW
+JLIST_FE_VIEW_AUP_SUM_POINTS=This download cost %d points. You has current %d points.
+
+# ADDED FOR HEADER DESCRIPTION IN CONFIG
+JLIST_BACKEND_SETTINGS_FRONTEND_HEADER_DESC2=<b>Note: </b>This is only used as default title, when you has not set a page title in the menu parameters. 
+
+# NOTE FOR TRANSLATORS: 
+# please add in your prior translated file in JLIST_BACKEND_SETTINGS_TEMPLATES_FINAL_DESC at (ca.) line 224 at the end: {aup_points_info}
+# Changed text in line: 1160 for JLIST_INSTALL_ABORT
+# Changed text in line: 880 for JLIST_BACKEND_SETTINGS_DOWNLOADS_AUTOPUBLISH_DESC added: (and folders)
+# Changed text in line: 281 for JLIST_BACKEND_FILESLIST_HITS old: Number of Downloads  new: Downloaded

oss/joomla/trunk/administrator/language/zh-CN/_notes/dwsync.xml

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<dwsync>
-<file name="zh-CN.com_admin.ini" server="hawebs.net//www/hawebs.net/news/" local="129217149484218750" remote="129220045800000000" />
-<file name="zh-CN.com_apoll.ini" server="hawebs.net//www/hawebs.net/news/" local="129211078465781250" remote="129220045800000000" />
-<file name="zh-CN.com_apoll.menu.ini" server="hawebs.net//www/hawebs.net/news/" local="129211082339218750" remote="129220045800000000" />
-<file name="zh-CN.com_attachments.ini" server="hawebs.net//www/hawebs.net/news/" local="129211081889531250" remote="129220045800000000" />
-<file name="zh-CN.com_attachments.menu.ini" server="hawebs.net//www/hawebs.net/news/" local="129211082238437500" remote="129220045800000000" />
-<file name="zh-CN.com_cache.ini" server="hawebs.net//www/hawebs.net/news/" local="129211203049218750" remote="129220045800000000" />
-<file name="zh-CN.com_newsfeeds.ini" server="hawebs.net//www/hawebs.net/news/" local="129220079527656250" remote="129220045800000000" />
-<file name="zh-CN.com_newsfeeds.menu.ini" server="hawebs.net//www/hawebs.net/news/" local="129220083716406250" remote="129222201000000000" />
-<file name="zh-CN.ini" server="hawebs.net//www/hawebs.net/news/" local="129220026303906250" remote="129220045800000000" />
-<file name="zh-CN.mod_menu.ini" server="hawebs.net//www/hawebs.net/news/" local="129211202126093750" remote="129220045800000000" />
-<file name="zh-CN.mod_quickicon.ini" server="hawebs.net//www/hawebs.net/news/" local="129211914990625000" remote="129220045800000000" />
-<file name="zh-CN.mod_stats.ini" server="hawebs.net//www/hawebs.net/news/" local="129211914948281250" remote="129220045800000000" />
-<file name="zh-CN.mod_status.ini" server="hawebs.net//www/hawebs.net/news/" local="129211914895625000" remote="129220045800000000" />
-<file name="zh-CN.mod_submenu.ini" server="hawebs.net//www/hawebs.net/news/" local="129211914870625000" remote="129220045800000000" />
-<file name="zh-CN.mod_title.ini" server="hawebs.net//www/hawebs.net/news/" local="129211913854218750" remote="129220045800000000" />
-<file name="zh-CN.mod_toolbar.ini" server="hawebs.net//www/hawebs.net/news/" local="129211913812812500" remote="129220045800000000" />
-<file name="zh-CN.mod_unread.ini" server="hawebs.net//www/hawebs.net/news/" local="129211913780312500" remote="129220045800000000" />
-<file name="zh-CN.plg_authentication_example.ini" server="hawebs.net//www/hawebs.net/news/" local="129211913738750000" remote="129220045800000000" />
-<file name="zh-CN.plg_authentication_gmail.ini" server="hawebs.net//www/hawebs.net/news/" local="129211913662968750" remote="129220045800000000" />
-<file name="zh-CN.plg_authentication_joomla.ini" server="hawebs.net//www/hawebs.net/news/" local="129211913622968750" remote="129220045800000000" />
-<file name="zh-CN.plg_authentication_ldap.ini" server="hawebs.net//www/hawebs.net/news/" local="129211913551562500" remote="129220045800000000" />
-<file name="zh-CN.plg_authentication_openid.ini" server="hawebs.net//www/hawebs.net/news/" local="129211913510781250" remote="129220045800000000" />
-<file name="zh-CN.plg_content_code.ini" server="hawebs.net//www/hawebs.net/news/" local="129211912956250000" remote="129220045800000000" />
-<file name="zh-CN.plg_content_emailcloak.ini" server="hawebs.net//www/hawebs.net/news/" local="129211912912812500" remote="129220045800000000" />
-<file name="zh-CN.plg_content_geshi.ini" server="hawebs.net//www/hawebs.net/news/" local="129211912877031250" remote="129220045800000000" />
-<file name="zh-CN.plg_content_image.ini" server="hawebs.net//www/hawebs.net/news/" local="129211912838437500" remote="129220045800000000" />
-<file name="zh-CN.plg_content_loadmodule.ini" server="hawebs.net//www/hawebs.net/news/" local="129211912790468750" remote="129220045800000000" />
-<file name="zh-CN.plg_content_pagebreak.ini" server="hawebs.net//www/hawebs.net/news/" local="129211912742812500" remote="129220045800000000" />
-<file name="zh-CN.plg_content_pagenavigation.ini" server="hawebs.net//www/hawebs.net/news/" local="129211912700937500" remote="129220045800000000" />
-<file name="zh-CN.plg_content_vote.ini" server="hawebs.net//www/hawebs.net/news/" local="129211912654062500" remote="129220045800000000" />
-<file name="zh-CN.plg_editors-xtd_image.ini" server="hawebs.net//www/hawebs.net/news/" local="129211888982343750" remote="129220045800000000" />
-<file name="zh-CN.plg_editors-xtd_pagebreak.ini" server="hawebs.net//www/hawebs.net/news/" local="129211888320156250" remote="129220045800000000" />
-<file name="zh-CN.plg_editors-xtd_readmore.ini" server="hawebs.net//www/hawebs.net/news/" local="129211887965937500" remote="129220045800000000" />
-<file name="zh-CN.plg_editors_none.ini" server="hawebs.net//www/hawebs.net/news/" local="129211912618125000" remote="129220045800000000" />
-<file name="zh-CN.plg_editors_tinymce.ini" server="hawebs.net//www/hawebs.net/news/" local="129211911153437500" remote="129220045800000000" />
-<file name="zh-CN.plg_editors_xstandard.ini" server="hawebs.net//www/hawebs.net/news/" local="129211889195000000" remote="129220045800000000" />
-<file name="zh-CN.plg_search_categories.ini" server="hawebs.net//www/hawebs.net/news/" local="129211887495937500" remote="129220045800000000" />
-<file name="zh-CN.plg_search_contacts.ini" server="hawebs.net//www/hawebs.net/news/" local="129211887302500000" remote="129220045800000000" />
-<file name="zh-CN.plg_search_content.ini" server="hawebs.net//www/hawebs.net/news/" local="129211886892812500" remote="129220045800000000" />
-<file name="zh-CN.plg_search_newsfeeds.ini" server="hawebs.net//www/hawebs.net/news/" local="129211886764531250" remote="129220045800000000" />
-<file name="zh-CN.plg_search_sections.ini" server="hawebs.net//www/hawebs.net/news/" local="129211885976718750" remote="129220045800000000" />
-<file name="zh-CN.plg_search_weblinks.ini" server="hawebs.net//www/hawebs.net/news/" local="129211885545625000" remote="129220045800000000" />
-<file name="zh-CN.plg_system_backlink.ini" server="hawebs.net//www/hawebs.net/news/" local="129211799193906250" remote="129220045800000000" />
-<file name="zh-CN.plg_system_cache.ini" server="hawebs.net//www/hawebs.net/news/" local="129211796943906250" remote="129220045800000000" />
-<file name="zh-CN.plg_system_debug.ini" server="hawebs.net//www/hawebs.net/news/" local="129211796133906250" remote="129220045800000000" />
-<file name="zh-CN.plg_system_legacy.ini" server="hawebs.net//www/hawebs.net/news/" local="129211794988750000" remote="129220045800000000" />
-<file name="zh-CN.plg_system_sef.ini" server="hawebs.net//www/hawebs.net/news/" local="129211794435937500" remote="129220045800000000" />
-<file name="zh-CN.plg_user_joomla.ini" server="hawebs.net//www/hawebs.net/news/" local="129211793524062500" remote="129220045800000000" />
-<file name="zh-CN.plg_xmlrpc_blogger.ini" server="hawebs.net//www/hawebs.net/news/" local="129211792516406250" remote="129220045800000000" />
-<file name="zh-CN.plg_xmlrpc_joomla.ini" server="hawebs.net//www/hawebs.net/news/" local="129211792923125000" remote="129220045800000000" />
-<file name="zh-CN.xml" server="hawebs.net//www/hawebs.net/news/" local="129222236927187500" remote="129222201000000000" />
-</dwsync>

oss/joomla/trunk/administrator/language/zh-CN/zh-CN.com_jdownloads.ini

@@ -1451,4 +1451,126 @@ JLIST_BACKEND_SETTINGS_RATING_ONLY_REGGED_TITLE=Only registered user can rate?
 JLIST_BACKEND_SETTINGS_RATING_ONLY_REGGED_DESC=When yes, only registered visitors can rate downloads.
 # NOTE FOR TRANSLATORS:  
 # please add in your translated file in JLIST_BACKEND_SETTINGS_TEMPLATES_FILES_DESC at (ca.) line 219 at the end: {rating} 
-# please add in your translated file in JLIST_BACKEND_SETTINGS_TEMPLATES_DETAILS_DESC at (ca.) line 748 at the end: {rating} 
+# please add in your translated file in JLIST_BACKEND_SETTINGS_TEMPLATES_DETAILS_DESC at (ca.) line 748 at the end: {rating} 
+
+#*****************************
+# ADDED IN v.1.7 stable
+#*****************************
+# NEW FOR MOVE DOWNLOADS TO OTHER CATEGORY
+JLIST_BACKEND_FILES_MOVE_TITLE=Move downloads
+JLIST_BACKEND_FILES_MOVE_DESC=Select the target Category:
+JLIST_BACKEND_FILES_MOVE_TEXT_1=These downloads are marked to move:
+JLIST_BACKEND_FILES_MOVE_TEXT_2=Hint: When you move a download to a other category, then will also the file moved to the target category folder!
+JLIST_BACKEND_FILES_MOVE_SAVED=Downloads are moved!
+
+# NEW FOR LAYOUT PLACEHOLDER {file_date} 
+JLIST_FE_FILELIST_FILE_DATE_TITLE=File Date
+JLIST_FE_DETAILS_FILE_DATE_TITLE=File Date
+
+# NEW FOR FILE DATA FIELD FILE_DATE 
+JLIST_EDIT_FILE_FILE_DATE_TITLE=File Date
+JLIST_EDIT_FILE_FILE_DATE_DESC=The creation date from the file. It is not possible to set this date automaticly.<br />Define the date in the following format: <b>YYYY-MM-DD H:mm:ss</b> or use the calendar function. 
+
+# NEW OPTION FOR USE JOM COMMENT (AZRUL)
+JLIST_BACKEND_SETTINGS_JOM_COMMENT_TITLE=Support JomComment?
+JLIST_BACKEND_SETTINGS_JOM_COMMENT_EXISTS_DESC=Yes, shows the JomComment function in the download details pages<br /><b>JomComment is already installed!</b>
+JLIST_BACKEND_SETTINGS_JOM_COMMENT_DESC=Yes, activate the comments function from <b>JomComment</b> in the frontend.<br /><b>JomComment</b> is NOT included with jDownloads and must be installed and configured separately (see <a href="http://www.azrul.com">www.azrul.com</a>)
+JLIST_BACKEND_SETTINGS_JOM_COMMENT_NOTE=Note: You can only activate one from this both comment components! 
+
+# NEW OPTION FOR SHORT AUTOMATICLY SHORT DESCRIPTION
+JLIST_BACKEND_USE_CUT_DESCRIPTION_TITLE=Cut automaticly short description?
+JLIST_BACKEND_USE_CUT_DESCRIPTION_TITLE_DESC=When yes, the files short description is automaticly shortened to the below specified amount of characters. This is used for the download list view in the frontend.
+JLIST_BACKEND_USE_CUT_DESCRIPTION_LENGTH_TITLE=Amount of characters:
+JLIST_BACKEND_USE_CUT_DESCRIPTION_LENGTH_TITLE_DESC=
+
+# NEW OPTION FOR VIEW DOWNLOAD PIC AND TEXT
+JLIST_BACKEND_USE_PIC_AND_TEXT_FOR_DOWNLOAD_TITLE=View Download icon and text?
+JLIST_BACKEND_USE_PIC_AND_TEXT_FOR_DOWNLOAD_TITLE_DESC=When yes, is viewed for the download link a icon and below a text (as sample: Download). When no, only the Icon is viewed.
+
+# NEW DATA FIELD FOR START AND END DATE PUBLISHING FILE
+JLIST_EDIT_FILE_START_END_DATE_ACTIVATE_TITLE=Use publishing timeframe?
+JLIST_EDIT_FILE_START_END_DATE_ACTIVATE_DESC=When yes, the fields below will use for the publishing timeframe. Otherwise is the publishing timeframe not limitted.
+JLIST_EDIT_FILE_START_DATE_TITLE=Start date:
+JLIST_EDIT_FILE_END_DATE_TITLE=End date: 
+
+# NEW FOR MENU SELECTION
+JD_MENU_CATEGORIES_LIST_LAYOUT=Categories List Layout
+JD_MENU_CATEGORIES_LIST_LAYOUT_DESC=This Layout shows a list of all jDownloads Categories.
+JD_MENU_CATEGORIES_LIST_TITLE=All Categories
+JD_MENU_CATEGORY_LIST_LAYOUT=Category Layout
+JD_MENU_CATEGORY_LIST_LAYOUT_DESC=This Layout shows a list of all Downloads within a particular Category.
+JD_MENU_CATEGORY_LIST_TITLE=Single Category
+JD_MENU_CATEGORY_LIST_LABEL1=Select an Category
+JD_MENU_CATEGORY_LIST_LABEL1_DESC=Important: All listed Categories are published, but check that you not set a public menu link to a category with restricted access rights.<br />Data order: Title / ID.
+JD_MENU_UPLOAD_LAYOUT=Frontend Upload Layout
+JD_MENU_UPLOAD_LAYOUT_DESC=Allow Users to submit Downloads.
+JD_MENU_UPLOAD_LIST_TITLE=Upload Form
+JD_MENU_VIEWDOWNLOAD_LAYOUT=Single Download Layout
+JD_MENU_VIEWDOWNLOAD_LAYOUT_DESC=This Layout views a single Download.
+JD_MENU_VIEWDOWNLOAD_LIST_TITLE=Single Download
+JD_MENU_VIEWDOWNLOAD_LABEL2_DESC=Data order: Title / File-ID / Category-ID.<br />Important: You must also above select the Category from the choosed Download.
+JD_MENU_VIEWDOWNLOAD_LABEL2=Select an Download
+
+# NEW FOR LIGHTBOX OPTION FRONTEND
+JLIST_BACKEND_SETTINGS_USE_LIGHTBOX_TITLE=Use jDownloads Lighbox function?
+JLIST_BACKEND_SETTINGS_USE_LIGHTBOX_DESC=Sometimes you has always installed a lightbox plugin. Then you can here set off the included lightbox function from jDownloads. But test it previously.
+
+# ADDED FOR RUN NEW MONITORING FUNCTION
+JLIST_RUN_MONITORING_INFO2=Downloads area check started... Please wait! 
+JLIST_RUN_MONITORING_INFO3=First step: Search new jDownloads folders... 
+JLIST_RUN_MONITORING_INFO4=Second step: Check all published jDownloads categories (folders)...
+JLIST_RUN_MONITORING_INFO5=Third step: Search new jDownloads files...
+JLIST_RUN_MONITORING_INFO6=Last step: Check all published downloads (files)...
+JLIST_RUN_MONITORING_INFO7=Finished! You can now close this window.
+
+# ADDED FOR CP STATS
+JLIST_BACKEND_CP_STATS_TEXT=The download archive contains currently #1 downloads in #2 categories. To date, these have been downloaded #3 times. Current are #4 categories and #5 downloads not published.
+
+# NEW FOR ALPHAUSERPOINTS RULES
+JLIST_BACKEND_SET_AUP_HEADER=Settings for Alphauserpoints Support
+JLIST_BACKEND_SET_AUP_HEADER_TEXT=You can this options only use, when you has installed the Alphauserpoints component from www.alphaplug.com and additional, the Alphauserpoints Plugins for jDownloads. See FAQ for more informations.
+JLIST_BACKEND_SET_AUP_TITLE=Use Alphauserpoints rules?
+JLIST_BACKEND_SET_AUP_DESC=When yes, registered users can received points for special actions in the frontend.
+JLIST_BACKEND_SET_AUP_UPLOAD_TEXT=Upload (Title: %s) in our File area.
+JLIST_BACKEND_SET_AUP_DOWNLOAD_TEXT=Download file (Title: %s).
+JLIST_BACKEND_SET_AUP_DOWNLOAD_WHEN_ZERO_POINTS_TEXT=May user download when he has no points or too few?
+JLIST_BACKEND_SET_AUP_DOWNLOAD_WHEN_ZERO_POINTS_DESC=When yes, a user can always download a file. When no, he see the message below, when he has not enough points for the download.
+JLIST_BACKEND_SET_AUP_FE_MESSAGE_NO_DOWNLOAD_EDIT=This text is indicated the user
+JLIST_BACKEND_SET_AUP_FE_MESSAGE_NO_DOWNLOAD=Sorry, but you has not enough points to download this file. Please recharge first your point account. 
+JLIST_BACKEND_SET_AUP_USE_FILE_PRICE_TITLE=Use files price field as points?
+JLIST_BACKEND_SET_AUP_USE_FILE_PRICE_DESC=When yes, the value in the files price field is used when a user will download a file. So this value is deducted from his point account.
+JLIST_BACKEND_SET_AUP_FE_MESSAGE_NO_DOWNLOAD_POINTS=Your points:
+JLIST_BACKEND_SET_AUP_FE_MESSAGE_NO_DOWNLOAD_NEEDED=Needed points:
+
+# ADDED FOR SIMPLE DOWNLOADS LIMIT PER DAY (GLOBAL)
+JLIST_FE_MESSAGE_AMOUNT_FILES_LIMIT=You has your limit at downloads for today reached!<br />When this calender day is over (Server time 00:00:01), you can download the next files.<br /><br />Current server time:
+JLIST_BACKEND_SET_AMOUNTS_FILE_LIMIT_TITLE=How many files can users download in a day?
+JLIST_BACKEND_SET_AMOUNTS_FILE_LIMIT_DESC=Set here the amount of files, where users can download per day. Is the limit reached, the user see the message below. When you set it to 0 it is unlimited.<br /><b>Attention:</b> This option works not for mass downloads (Layouts with checkboxes)!
+
+# NOTE FOR TRANSLATORS:  
+# please add in your prior translated file in JLIST_BACKEND_SETTINGS_TEMPLATES_FILES_DESC at (ca.) line 219 at the end: {file_date_title} and {file_date} 
+# please add in your prior translated file in JLIST_BACKEND_SETTINGS_TEMPLATES_DETAILS_DESC at (ca.) line 748 at the end: {file_date_title} and {file_date}
+# changed text for JLIST_BACKEND_FILESEDIT_DADDED in line 340
+
+# ********************************
+# CHANGED / ADDED IN 1.7 BUILD 760
+# ********************************
+
+# NEW FOR SEARCH
+JLIST_FRONTEND_SEARCH_DESCRIPTION=Please break searched terms with blank and use not punctuation. It is searched by every search keyword. On the top from the results list is the the downloads with the most hits.
+
+# NEW FOR AUTO MONITORING
+JLIST_BACKEND_AUTOCHECK_SUM_FOLDERS=Checked Directories:
+JLIST_BACKEND_AUTOCHECK_SUM_FILES=Checked Files:
+
+# NEW FOR SUMMARY PAGE AUP POINTS VIEW
+JLIST_FE_VIEW_AUP_SUM_POINTS=This download cost %d points. You has current %d points.
+
+# ADDED FOR HEADER DESCRIPTION IN CONFIG
+JLIST_BACKEND_SETTINGS_FRONTEND_HEADER_DESC2=<b>Note: </b>This is only used as default title, when you has not set a page title in the menu parameters. 
+
+# NOTE FOR TRANSLATORS: 
+# please add in your prior translated file in JLIST_BACKEND_SETTINGS_TEMPLATES_FINAL_DESC at (ca.) line 224 at the end: {aup_points_info}
+# Changed text in line: 1160 for JLIST_INSTALL_ABORT
+# Changed text in line: 880 for JLIST_BACKEND_SETTINGS_DOWNLOADS_AUTOPUBLISH_DESC added: (and folders)
+# Changed text in line: 281 for JLIST_BACKEND_FILESLIST_HITS old: Number of Downloads  new: Downloaded

oss/joomla/trunk/administrator/language/zh-CN/zh-CN.com_languages.ini

@@ -1,12 +1,29 @@
-# version 1.5.0 2008-01-14 23:35:37 ~0
-# author Joomla! Chinese Translation Team
-# copyright (C) 2008 Open Source Matters. All rights reserved.
-# license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
-# Note : All ini files need to be saved as UTF-8
+#/**
+# * Copyright (C) 2006-2010 YUCHENG HU
+# *
+# * ---------------------------------------------
+# * HA WEBSYSTEMS
+# * http://www.hawebs.net
+# * https://www.hawebs.org/forums/computer/
+# *
+# * CONTACT
+# * [email protected] / [email protected]
+# * 
+# * ---------------------------------------------
+# * GNU GENERAL PUBLIC LICENSE GNU/LGPL
+# * http://www.gnu.org/licenses/lgpl.html
+# *
+# * ---------------------------------------------
+# * NOTE
+# * 1. 所有的 ini 文件必须采用 UTF-8 编码
+# * 2. 请不要在语言配置文件中使用单引号或双引号  (' 或 ") 
+# *
+# * ---------------------------------------------
+# */
 
 ADMINISTRATOR=管理后台
 DESCFTP=为了将设置的语言作为默认选项，Joomla!最有可能需要你们的FTP帐号细节.请在下面的表单域中输入这些信息.
-DESCFTPTITLE=FTP帐号详情
+DESCFTPTITLE=FTP 帐号详情
 IS=是
 JCLIENTHELPER::SETCREDENTIALSFROMREQUEST FAILED=无法用给定的安全证书连接到服务器。
 LANGUAGE EDITOR=语言编辑器
@@ -18,5 +35,5 @@ OPERATION FAILED: THE FILE IS NOT WRITABLE.=操作失败：文件不可写。
 SIZE=大小
 WARNOPENFILE=操作失败：文件写入失败。
 WRITABLE=可写
-YOU CAN NOT DELETE LANGUAGE IN USE.=您不能删除目前正在使用的语言。
+YOU CAN NOT DELETE LANGUAGE IN USE.=您不能删除当前正在使用的语言。
 

oss/joomla/trunk/administrator/language/zh-CN/zh-CN.com_login.ini

@@ -1,9 +1,24 @@
-# version 1.5.0 2008-01-14 23:35:49 ~0
-# author Joomla! Chinese Translation Team
-# copyright (C) 2005 Open Source Matters. All rights reserved.
-# license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
+#/**
+# * Copyright (C) 2006-2010 YUCHENG HU
+# *
+# * ---------------------------------------------
+# * HA WEBSYSTEMS
+# * http://www.hawebs.net
+# * https://www.hawebs.org/forums/computer/
+# *
+# * CONTACT
+# * [email protected] / [email protected]
+# * 
+# * ---------------------------------------------
+# * GNU GENERAL PUBLIC LICENSE GNU/LGPL
+# * http://www.gnu.org/licenses/lgpl.html
+# *
+# * ---------------------------------------------
+# * NOTE
+# * 1. 所有的 ini 文件必须采用 UTF-8 编码
+# * 2. 请不要在语言配置文件中使用单引号或双引号  (' 或 ") 
+# *
+# * ---------------------------------------------
+# */
 
-# Note : All ini files need to be saved as UTF-8
-
-
-DESCUSEVALIDLOGIN=请使用有效的用户名和密码进入管理后台。
+DESCUSEVALIDLOGIN=请使用有效的用户名和密码登录后进入管理控制台。

oss/joomla/trunk/administrator/language/zh-CN/zh-CN.com_massmail.ini

@@ -1,8 +1,25 @@
-# version 1.5.0 2008-01-14 17:00:17 ~0
-# author Joomla! Chinese Translation Team
-# copyright (C) 2005 Open Source Matters. All rights reserved.
-# license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
-# Note : All ini files need to be saved as UTF-8
+#/**
+# * Copyright (C) 2006-2010 YUCHENG HU
+# *
+# * ---------------------------------------------
+# * HA WEBSYSTEMS
+# * http://www.hawebs.net
+# * https://www.hawebs.org/forums/computer/
+# *
+# * CONTACT
+# * [email protected] / [email protected]
+# * 
+# * ---------------------------------------------
+# * GNU GENERAL PUBLIC LICENSE GNU/LGPL
+# * http://www.gnu.org/licenses/lgpl.html
+# *
+# * ---------------------------------------------
+# * NOTE
+# * 1. 所有的 ini 文件必须采用 UTF-8 编码
+# * 2. 请不要在语言配置文件中使用单引号或双引号  (' 或 ") 
+# *
+# * ---------------------------------------------
+# */
 
 ALL USER GROUPS=所有会员组
 BODYSUFFIXTIP=它将被加至邮件内容之后
@@ -22,8 +39,4 @@ SEND IN HTML MODE=以HTML格式发送
 SEND MAIL=发送邮件
 SUBJECT PREFIX=标题前缀
 SUBJECTPREFIXTIP=它将加至每份E-mail的标题之前
-USERS=会员
-#IMPORTANT: DON'T REMOVE ENTRIES FOLLOWING THIS LINE WHEN DOING SYNC !!
-EDITOR=主编
-MANAGER=初级管理员
-SUPER ADMINISTRATOR=超级管理员
+USERS=会员

oss/joomla/trunk/administrator/language/zh-CN/zh-CN.com_media.ini

@@ -1,8 +1,25 @@
-# version 1.5.0 2008-01-14 20:48:26 ~0
-# author Joomla! Chinese Translation Team
-# copyright (C) 2005 Open Source Matters. All rights reserved.
-# license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
-# Note : All ini files need to be saved as UTF-8
+#/**
+# * Copyright (C) 2006-2010 YUCHENG HU
+# *
+# * ---------------------------------------------
+# * HA WEBSYSTEMS
+# * http://www.hawebs.net
+# * https://www.hawebs.org/forums/computer/
+# *
+# * CONTACT
+# * [email protected] / [email protected]
+# * 
+# * ---------------------------------------------
+# * GNU GENERAL PUBLIC LICENSE GNU/LGPL
+# * http://www.gnu.org/licenses/lgpl.html
+# *
+# * ---------------------------------------------
+# * NOTE
+# * 1. 所有的 ini 文件必须采用 UTF-8 编码
+# * 2. 请不要在语言配置文件中使用单引号或双引号  (' 或 ") 
+# *
+# * ---------------------------------------------
+# */
 
 CLEAR COMPLETED=清除已上传图片
 *CLICK FOR IMAGE CODE*=*点击产生图片代码*
@@ -30,7 +47,8 @@ DIRECTORIES=目录
 DIRECTORY=目录
 DIRECTORY UP=返回上层目录
 DOES NOT EXIST.=不存在！
-ERROR. UNABLE TO UPLOAD FILE=错误。无法上传文件
+ERROR. FILE ALREADY EXISTS=【错误】-> 文件已存在
+ERROR. UNABLE TO UPLOAD FILE=【错误】-> 无法上传文件
 FILESIZE=文件大小
 FILES/FOLDERS IN=文件/文件夹位于
 FIRST.=第一位。
@@ -65,10 +83,12 @@ MAXIMUM SIZE DESC=上传一个文件的最大尺寸限制（单位：byte）。
 MEDIA MANAGER=媒体管理
 NAME=图片名称
 NO IMAGES FOUND=找不到图片
+NOT EMPTY!=目录不为空
 NOT SET=尚未设置
 NUMFILES=文件：%s
 NUMFOLDERS=文件夹：%s
 PLEASE DELETE ALL FILES/FOLDER IN=请删除位于该处的所有文件或文件
+PLEASE INPUT A FILE FOR UPLOAD=请输入一个文件后上传
 PX=像素
 REMOVE FROM QUEUE=从队列中删除
 SELECT FILE=选择文件

oss/joomla/trunk/administrator/language/zh-CN/zh-CN.com_menus.ini

@@ -1,8 +1,25 @@
-# $Id: zh-CN.com_menus.ini 126 2008-07-08 07:17:06Z protege $
-# author Joomla! Chinese Translation Team
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
-# License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
-# Note : All ini files need to be saved as UTF-8 - No BOM
+#/**
+# * Copyright (C) 2006-2010 YUCHENG HU
+# *
+# * ---------------------------------------------
+# * HA WEBSYSTEMS
+# * http://www.hawebs.net
+# * https://www.hawebs.org/forums/computer/
+# *
+# * CONTACT
+# * [email protected] / [email protected]
+# * 
+# * ---------------------------------------------
+# * GNU GENERAL PUBLIC LICENSE GNU/LGPL
+# * http://www.gnu.org/licenses/lgpl.html
+# *
+# * ---------------------------------------------
+# * NOTE
+# * 1. 所有的 ini 文件必须采用 UTF-8 编码
+# * 2. 请不要在语言配置文件中使用单引号或双引号  (' 或 ") 
+# *
+# * ---------------------------------------------
+# */
 
 A DESCRIPTION FOR THE MENU=菜单说明
 A PROPER TITLE FOR THE MENU=菜单标题名称
@@ -25,6 +42,7 @@ AUTO HEIGHT=自动调整高度
 ATOM=Atom
 BASIC PARAMETERS=基本设置
 BLOG=博客式排版
+CANNOT SAVE: EMPTY MENU TYPE=【不能保存】 -> 菜单类型为空
 CATEGORY DESCRIPTION=文章分类说明
 CATEGORY LIST - SECTION=文章单元里的文章分类列表
 CATEGORY NAME=文章分类名称
@@ -40,6 +58,7 @@ COMPLETE RESET LAYOUT=完成重设版面
 COMPLETE RESET LAYOUT DESC=创建一个完整的密码重设版面视图
 COMPONENT PARAMETERS=组件参数
 COMPONENTS=组件
+CONFIRM DELETE MENU TYPE=请确认删除菜单类型
 CONFIRM RESET LAYOUT=确认重设版面
 CONFIRM RESET LAYOUT DESC=创建一个已确认的密码重设版面视图
 CONTACT TO LINK=联系人链接
@@ -153,6 +172,14 @@ NUM ARTICLES COLUMN=文章栏
 NUM CATEGORY ITEMS=文章分类中的文章数
 NUM INTRO=引言
 NUM LEADING=头条文章
+NUMBER 5=5
+NUMBER 10=10
+NUMBER 15=15
+NUMBER 20=20
+NUMBER 25=25
+NUMBER 30=30
+NUMBER 50=50
+NUMBER 100=100
 NUMBER OF ITEMS TO DISPLAY AS LINKS.=在一个页面里显示的文章链接的数量
 OLDEST FIRST=旧文章在前
 ON CLICK, OPEN IN=鼠标点击时，打开
@@ -214,6 +241,7 @@ PLEASE ENTER A MODULE NAME FOR YOUR MENU=请填写菜单的模块名称
 PLEASE ENTER A NAME FOR THE COPY OF THE MENU=请填写复制的菜单的名称
 PLEASE ENTER A NAME FOR THE NEW MODULE=清输入新模块的名称
 PLEASE SELECT A CATEGORY=请选择一个分类
+PLEASE SELECT A MENU FROM THE LIST=请为列表选择一个菜单
 PLEASE SELECT AN ARTICLE=请选择一篇文章
 POLL=投票调查
 PRIMARY ORDER=默认排序
@@ -239,6 +267,7 @@ SHOW/HIDE EMPTY(NO ITEMS) CATEGORIES=显示或隐藏空的（没有文章）的
 SHOW/HIDE EMPTY(NO ITEMS) CATEGORIES IN SECTION VIEW=在文章单元浏览页显示或隐藏空的（没有文章）的文章分类
 SHOW/HIDE PAGINATION SUPPORT=显示或隐藏分页结果
 SHOW/HIDE THE CATEGORY DESCRIPTION=显示或隐藏分类说明
+SHOW/HIDE THE CATEGORY IMAGE=显示 / 隐藏 分类图片
 SHOW/HIDE THE DATE COLUMN=显示或隐藏日期栏
 SHOW/HIDE THE DESCRIPTION BELOW=显示或隐藏以下说明
 SHOW/HIDE THE DISPLAY SELECT DROPDOWN=显示或隐藏下拉选项
@@ -247,6 +276,7 @@ SHOW/HIDE THE FEED NAME COLUMN=显示或隐藏新闻联播源的名称栏
 SHOW/HIDE THE FILTER ABILITY=显示或隐藏筛选功能
 SHOW/HIDE THE IMAGE OF THE FEED=显示或隐藏新闻联播源的图片
 SHOW/HIDE THE ITEMS TITLE=显示或隐藏条目标题
+SHOW/HIDE THE TABLE HEADINGS=显示 / 隐藏 表头
 SSL ENABLED=允许SSL认证
 STEP=步骤
 SUBMIT=提交