Index: openacs-4/packages/photo-album/catalog/photo-album.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/catalog/photo-album.en_US.ISO-8859-1.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/photo-album/catalog/photo-album.en_US.ISO-8859-1.xml	19 Nov 2003 22:10:57 -0000	1.2
+++ openacs-4/packages/photo-album/catalog/photo-album.en_US.ISO-8859-1.xml	21 Nov 2003 00:01:01 -0000	1.3
@@ -32,7 +32,7 @@
   <msg key="_Either_4">there is already a photo in the specified albumr with the name \&quot;$filename\&quot; or you clicked on the button more than once.  You can &lt;a href=\&quot;album?album_id=$new_album_id\&quot;&gt;return to the new album&lt;/a&gt; to see if your photo is there. </msg>
   <msg key="_Folder">Name</msg>
   <msg key="_Folder_1">Description</msg>
-  <msg key="_For">show this foto &lt;a href=photo-edit?photo_id=$photo_id&gt;edit the attributes&lt;/a&gt; an uncheck the option hide</msg>
+  <msg key="_For">show this photo &lt;a href=photo-edit?photo_id=$photo_id&gt;edit the attributes&lt;/a&gt; an uncheck the option hide</msg>
   <msg key="_Full">Size Image</msg>
   <msg key="_Hide">the image html source</msg>
   <msg key="_Modify">this package's parameters</msg>
@@ -45,7 +45,7 @@
   <msg key="_photo">not found</msg>
   <msg key="_Photo_1">Story</msg>
   <msg key="_Photo_2">not found or photo is hidden </msg>
-  <msg key="_Please">select albu</msg>
+  <msg key="_Please">select album</msg>
   <msg key="_Save">Save </msg>
   <msg key="_Show">the image html source for copy&amp;amp;paste</msg>
   <msg key="_The">specified parent folder is not valid.</msg>
Index: openacs-4/packages/photo-album/tcl/photo-album-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/tcl/photo-album-procs.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/photo-album/tcl/photo-album-procs.tcl	18 Nov 2003 18:55:29 -0000	1.7
+++ openacs-4/packages/photo-album/tcl/photo-album-procs.tcl	21 Nov 2003 00:01:01 -0000	1.8
@@ -642,18 +642,22 @@
         set type "Unknown type"
     }
 
+    # DRB: on Mac OS X the "verify" option to tar appears to return the file
+    # list on stderr rather than stdout, causing the catch to trigger.  Non-GNU
+    # versions of tar don't understand fancy options (those starting with --)
+
     switch $type { 
         tar {
-            set errp [ catch { exec tar --directory $tmp_dir -xvf $tmpfile } errMsg]
+            set errp [ catch { exec tar -xf $tmpfile -C $tmp_dir } errMsg]
         }
         tgZ { 
-            set errp [ catch { exec tar --directory $tmp_dir -xZvf $tmpfile } errMsg]
+            set errp [ catch { exec tar -xZf $tmpfile -C $tmp_dir } errMsg]
         }
         tgz { 
-            set errp [ catch { exec tar --directory $tmp_dir -xzvf $tmpfile } errMsg]
+            set errp [ catch { exec tar -xzf $tmpfile -C $tmp_dir } errMsg]
         }
         tbz2 { 
-            set errp [ catch { exec tar --directory $tmp_dir -xjvf $tmpfile } errMsg]
+            set errp [ catch { exec tar -xjf $tmpfile -C $tmp_dir } errMsg]
         }
         zip { 
             set errp [ catch { exec unzip -d $tmp_dir $tmpfile } errMsg]