[pLog-svn] r4228 - in plugins/branches/lifetype-1.1/jupload: . jupload locale templates

[reto at devel.lifetype.net]

Author: reto
Date: 2006-11-01 22:30:28 +0000 (Wed, 01 Nov 2006)
New Revision: 4228

Added:
   plugins/branches/lifetype-1.1/jupload/jupload/jupload.jar
   plugins/branches/lifetype-1.1/jupload/jupload/jupload_uncompressed.jar
   plugins/branches/lifetype-1.1/jupload/jupload/readme.txt
Removed:
   plugins/branches/lifetype-1.1/jupload/jupload/jupload.jar
   plugins/branches/lifetype-1.1/jupload/jupload/jupload_uncompressed.jar
Modified:
   plugins/branches/lifetype-1.1/jupload/locale/locale_en_UK.php
   plugins/branches/lifetype-1.1/jupload/readme.txt
   plugins/branches/lifetype-1.1/jupload/templates/juploadnewresource.template
Log:
merged from revision 4226 - thanks for explaining, oscar.

Deleted: plugins/branches/lifetype-1.1/jupload/jupload/jupload.jar
===================================================================
(Binary files differ)

Copied: plugins/branches/lifetype-1.1/jupload/jupload/jupload.jar (from rev 4226, plugins/trunk/jupload/jupload/jupload.jar)


Property changes on: plugins/branches/lifetype-1.1/jupload/jupload/jupload.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: plugins/branches/lifetype-1.1/jupload/jupload/jupload_uncompressed.jar
===================================================================
(Binary files differ)

Copied: plugins/branches/lifetype-1.1/jupload/jupload/jupload_uncompressed.jar (from rev 4226, plugins/trunk/jupload/jupload/jupload_uncompressed.jar)


Property changes on: plugins/branches/lifetype-1.1/jupload/jupload/jupload_uncompressed.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Copied: plugins/branches/lifetype-1.1/jupload/jupload/readme.txt (from rev 4226, plugins/trunk/jupload/jupload/readme.txt)

Modified: plugins/branches/lifetype-1.1/jupload/locale/locale_en_UK.php
===================================================================
--- plugins/branches/lifetype-1.1/jupload/locale/locale_en_UK.php	2006-11-01 22:21:39 UTC (rev 4227)
+++ plugins/branches/lifetype-1.1/jupload/locale/locale_en_UK.php	2006-11-01 22:30:28 UTC (rev 4228)
@@ -3,7 +3,9 @@
 $messages["juploadConfig"] = "JUpload";
 $messages["juploadNewResource"] = "New JUpload Resource";
 $messages["jupload_plugin_enabled"] = "Enable JUpload";
+$messages["jupload_settings_saved_ok"] = "JUpload settings saved successfully";
 
 $messages["label_maxfilesperrequest"] = "Maximum number of files";
 $messages["jupload_maxfilesperrequest"] = "Maximum number of files allowed per upload request";
+$messages["jupload_fileupload_help"] = 'Use the "Add" Button on the left to add files. Please note that restarting a stopped upload process may result in duplicated files. No files will be overriden.';
 ?>
\ No newline at end of file

Modified: plugins/branches/lifetype-1.1/jupload/readme.txt
===================================================================
--- plugins/branches/lifetype-1.1/jupload/readme.txt	2006-11-01 22:21:39 UTC (rev 4227)
+++ plugins/branches/lifetype-1.1/jupload/readme.txt	2006-11-01 22:30:28 UTC (rev 4228)
@@ -1,7 +1,7 @@
 Plugin: JUpload
 Author: Mark Wu
 Release Date: 2005/03/16
-Version: 1.0
+Version: 1.0.1
 
 This plugin offers you to integrate JUpload into resource center.
 
@@ -10,5 +10,13 @@
 Enable it before use it.
 
 Notice:
-Thanks the auhtor of JUpload - Mike. He grant us the permission to boundle the JUpload 
-binary file in pLog/pLog Plugins release.
\ No newline at end of file
+Thanks the auhtor of JUpload - Mike. He grant us the permission to bundle the JUpload 
+binary with this LifeType plugin.
+
+Changelog:
+Version 1.0.1
+- updated jupload binaries
+- changed help text
+
+Version 1.0
+Initial release
\ No newline at end of file

Modified: plugins/branches/lifetype-1.1/jupload/templates/juploadnewresource.template
===================================================================
--- plugins/branches/lifetype-1.1/jupload/templates/juploadnewresource.template	2006-11-01 22:21:39 UTC (rev 4227)
+++ plugins/branches/lifetype-1.1/jupload/templates/juploadnewresource.template	2006-11-01 22:30:28 UTC (rev 4228)
@@ -44,7 +44,7 @@
 
  <strong style="font-size: 1em; font-weight: bold;"><label for="resourceFile_1">{$locale->tr("file")}</label>
  <span class="required">*</span></strong>
- <div class="formHelp">{$locale->tr("resource_file_help")}</div>
+ <div class="formHelp">{$locale->tr("jupload_fileupload_help")}</div>
  <applet 
   code="JUpload.startup"
   archive="plugins/jupload/jupload/jupload.jar,plugins/jupload/jupload/lib/skinlf.jar"