Index: openacs-4/packages/photo-album/www/album-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/album-edit.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/photo-album/www/album-edit.tcl	18 Nov 2003 18:27:52 -0000	1.3
+++ openacs-4/packages/photo-album/www/album-edit.tcl	18 Nov 2003 22:59:03 -0000	1.4
@@ -42,7 +42,7 @@
   -label "[_ photo-album._Album_2]" -datatype text
 
 template::element create edit_album photographer -html { size 50} \
-  -label "<#_ Photographer#>"  -datatype text -optional
+  -label "[_ photo-album.Photographer]"  -datatype text -optional
 
 template::element create edit_album description -html { size 50} \
   -label "[_ photo-album._Album]"  -datatype text -optional
Index: openacs-4/packages/photo-album/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/photo-album/www/index.adp	18 Nov 2003 18:27:53 -0000	1.4
+++ openacs-4/packages/photo-album/www/index.adp	18 Nov 2003 22:59:03 -0000	1.5
@@ -23,7 +23,7 @@
 </if>
 <if @admin_p@ eq 1>
   <li><a href="/permissions/one?object_id=@folder_id@">#photo-album.lt_Modify_this_folders_p#</a></li>
-  <li><a href="/shared/parameters?@parameter_url_vars@">Modify this package's parameters</a> </li>
+  <li><a href="/shared/parameters?@parameter_url_vars@">#photo-album.Modify_this_pack#</a> </li>
 </if>
 </ul>
 </div>
Index: openacs-4/packages/photo-album/www/photo-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo-add-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/photo-album/www/photo-add-2.tcl	18 Nov 2003 18:27:53 -0000	1.3
+++ openacs-4/packages/photo-album/www/photo-add-2.tcl	18 Nov 2003 22:59:03 -0000	1.4
@@ -37,8 +37,8 @@
 	    }   
  
 	    if ![regexp  $base_mime [parameter::get -parameter AcceptableUploadMIMETypes -package_id [ad_conn package_id]]] { 
-            ad_complain "The parameter AcceptableUploadMIMETypes is not satisfied" 
-            ad_complain "The parameter ConverttoJpgorPng is not in automatic mode" 
+            ad_complain "[_ photo-album._The_5]" 
+            ad_complain "[_ photo-album._The_6]" 
 	    } 
 	} 
     }
Index: openacs-4/packages/photo-album/www/photo.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/photo-album/www/photo.adp	18 Nov 2003 18:27:53 -0000	1.3
+++ openacs-4/packages/photo-album/www/photo.adp	18 Nov 2003 22:59:03 -0000	1.4
@@ -37,7 +37,7 @@
           <li><a href="photo-iconic?photo_id=@photo_id@">#photo-album.lt_Make_this_photo_the_i#</a>
             <li><a href="photo-edit?photo_id=@photo_id@">#photo-album.lt_Edit_photo_attributes#</a>
         </if>
-        <if @move_p@ eq 1>
+        <if @move_p@ eq 1 and @albums_list@ ne "">
           <li>
 	    <formtemplate id="move_photo">
 	      #photo-album._Move_photo_to_album#
Index: openacs-4/packages/photo-album/www/photo.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/photo-album/www/photo.tcl	18 Nov 2003 18:27:53 -0000	1.3
+++ openacs-4/packages/photo-album/www/photo.tcl	18 Nov 2003 22:59:03 -0000	1.4
@@ -72,10 +72,10 @@
 
 # query all the photo and permission info with a single trip to database
 if {![db_0or1row get_photo_info { *SQL* }]} { 
-    ad_return_complaint 1 "<li><#_This photo couldn't be showed because : #>
-                             <ul><li><#_Photo not found or photo is hidden #></li>
-                                 <li><#_For show this foto <a href=photo-edit?photo_id=$photo_id>edit the attributes</a> an uncheck the option hide#></li>
-                                 <li><#_Your can click <a href=album?album_id=$old_album_id> here </a> to view all photos of the album #></li>
+    ad_return_complaint 1 "<li>[_ photo-album._This]
+                             <ul><li>[_ photo-album._Photo_2]</li>
+                                 <li>[_ photo-album._For]</li>
+                                 <li>[_ photo-album._Your]</li>
                              </ul>"
 }
 
@@ -84,7 +84,6 @@
 
 # to move a photo need write on photo and write on parent album
 set move_p [expr $write_p && $album_write_p]
-
 # build form to move the photo if move_p is 1
 if $move_p {
 
@@ -93,9 +92,12 @@
     template::element create move_photo photo_id -label "photo ID" \
 	-datatype integer -widget hidden
 
+
+    set albums_list [db_list_of_lists get_albums { *SQL* }]
+    
     template::element create move_photo new_album_id -label "[_ photo-album._Please]" \
 	-datatype integer -widget select \
-	-options [db_list_of_lists get_albums {}]
+	-options $albums_list
 
 
     if { [template::form is_request move_photo] } {
@@ -106,7 +108,6 @@
 
     if { [template::form is_valid move_photo] } {
 	set new_album_id [template::element::get_value move_photo new_album_id]
-
 	ad_require_permission $new_album_id "pa_create_photo"
 
 	if [string equal [pa_is_album_p $new_album_id] "f"] {
@@ -120,7 +121,7 @@
 
 	    # not using content_item move because is only accepts 
 	    # a folder_id as target not another content_item
-
+7
 	    set rel_id [db_string photo_rel_id {}]
 
 	    db_dml photo_move {}
@@ -146,6 +147,7 @@
 	}
 	pa_flush_photo_in_album_cache $old_album_id
 	pa_flush_photo_in_album_cache $new_album_id
+ 
 
 
 	#page used to redirect user to the page of new album containing moved photos
Index: openacs-4/packages/photo-album/www/photos-edit-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photos-edit-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/photo-album/www/photos-edit-2.adp	30 Jun 2003 07:53:56 -0000	1.2
+++ openacs-4/packages/photo-album/www/photos-edit-2.adp	18 Nov 2003 22:59:03 -0000	1.3
@@ -2,7 +2,7 @@
 <property name="title">@title@</property>
 <property name="context">@context_list@</property>
 
-Your text updates have been made and any rotations are
-currently being processed...
+#photo-album.lt_Your_text_updates_hav#
 <p>
 @page_nav@
+
Index: openacs-4/packages/photo-album/www/photos-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photos-edit-2.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/photo-album/www/photos-edit-2.tcl	18 Nov 2003 18:31:58 -0000	1.4
+++ openacs-4/packages/photo-album/www/photos-edit-2.tcl	18 Nov 2003 22:59:03 -0000	1.5
@@ -45,7 +45,7 @@
     set apeeraddr [ad_conn peeraddr]
     
 
-    db_dml update_photo_attributes { update cr_revisions set description = :aphoto_description, title = :aphoto_title where revision_id = :arevision_id }
+    db_dml update_photo_attributes { *SQL* }
 
     db_dml update_photo { 
         update pa_photos
Index: openacs-4/packages/photo-album/www/photos-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photos-edit.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/photo-album/www/photos-edit.adp	18 Nov 2003 18:27:53 -0000	1.4
+++ openacs-4/packages/photo-album/www/photos-edit.adp	18 Nov 2003 22:59:03 -0000	1.5
@@ -2,7 +2,7 @@
 <property name="title">@title@</property>
 <property name="context">@context_list@</property>
 
-<p>Name: @title@ 
+<p>#photo-album.Name#: @title@ 
 <if @description@ not nil>
 <p>Description: @description@
 </if>
@@ -11,22 +11,22 @@
 </if>
 <ul>
 <if @photo_p@ eq 1>
-  <li><a href="photo-add?album_id=@album_id@">Add a single photo to this album</a>
+  <li><a href="photo-add?album_id=@album_id@">#photo-album.lt_Add_a_single_photo_to#</a>
 </if>
 <if @photo_p@ eq 1>
-  <li><a href="photos-add?album_id=@album_id@">Add a collection of photos to this album</a>
+  <li><a href="photos-add?album_id=@album_id@">#photo-album.lt_Add_a_collection_of_p#</a>
 </if>
 <if @write_p@ eq 1>
-  <li><a href="album-edit?album_id=@album_id@">Edit album attributes</a>
+  <li><a href="album-edit?album_id=@album_id@">#photo-album.lt_Edit_album_attributes#</a>
 </if>
 <if @move_p@ eq 1>
-  <li><a href="album-move?album_id=@album_id@">Move album to another folder</a>
+  <li><a href="album-move?album_id=@album_id@">#photo-album.lt_Move_album_to_another#</a>
 </if>
 <if @delete_p@ eq 1>
-  <li><a href="album-delete?album_id=@album_id@">Delete this album</a>
+  <li><a href="album-delete?album_id=@album_id@">#photo-album.Delete_this_album#</a>
 </if>
 <if @admin_p@ eq 1>
-  <li><a href="/permissions/one?object_id=@album_id@">Modify album permissions</a>
+  <li><a href="/permissions/one?object_id=@album_id@">#photo-album.lt_Modify_album_permissi#</a>
 </if>
 </ul>
 <if @child_photo:rowcount@ gt 0>
@@ -43,13 +43,13 @@
               <td>&nbsp;</td>
               <td rowspan=3>
                     <table>
-                      <tr><td>Hide:</td><td><if @child_photo.hide_p@ ne 0><input type=checkbox name="hide.@child_photo.photo_id@" value=1></if><else><input checked type=checkbox name="hide.@child_photo.photo_id@" value=0></else></td></tr>
-                      <tr><td>Caption:</td><td><input type=text name="caption.@child_photo.photo_id@" value="@child_photo.caption@" size=60></td></tr>
-                      <tr><td>Title:</td><td><input type=text name="photo_title.@child_photo.photo_id@" value="@child_photo.photo_title@" size=60></td></tr>
-                      <tr><td>Story:</td><td><textarea name="photo_story.@child_photo.photo_id@" cols="60" wrap="soft" rows="3">@child_photo.photo_story@</textarea></td></tr>
-                      <tr><td>Description:</td><td><textarea name="photo_description.@child_photo.photo_id@" cols="60" wrap="soft" rows="3">@child_photo.photo_description@</textarea></td></tr>
+                      <tr><td>#photo-album.Hide_1#</td><td><if @child_photo.hide_p@ ne 0><input type=checkbox name="hide.@child_photo.photo_id@" value=1></if><else><input checked type=checkbox name="hide.@child_photo.photo_id@" value=0></else></td></tr>
+                      <tr><td>#photo-album.Caption_1#</td><td><input type=text name="caption.@child_photo.photo_id@" value="@child_photo.caption@" size=60></td></tr>
+                      <tr><td>#photo-album.Title_1#</td><td><input type=text name="photo_title.@child_photo.photo_id@" value="@child_photo.photo_title@" size=60></td></tr>
+                      <tr><td>#photo-album.Story_1#</td><td><textarea name="photo_story.@child_photo.photo_id@" cols="60" wrap="soft" rows="3">@child_photo.photo_story@</textarea></td></tr>
+                      <tr><td>#photo-album.Description_1#</td><td><textarea name="photo_description.@child_photo.photo_id@" cols="60" wrap="soft" rows="3">@child_photo.photo_description@</textarea></td></tr>
 	
-                    <if @child_photo.datetaken@ not nil><tr><td colspan="2">Taken: @child_photo.datetaken@ @child_photo.camera_model@ @child_photo.focal_length@mm @child_photo.aperture@ <if @child_photo.flash@>Flash</if></td></tr></if>
+                    <if @child_photo.datetaken@ not nil><tr><td colspan="2">Taken: @child_photo.datetaken@ @child_photo.camera_model@ @child_photo.focal_length@mm @child_photo.aperture@ <if @child_photo.flash@>#photo-album.Flash#</if></td></tr></if>
                     </table>
               </td>
             </tr>
@@ -69,7 +69,7 @@
         <input type=submit value=Submit>
     </form>
 </if><else>
-<p>This album does not contain anything.
+<p>#photo-album.lt_This_album_does_not_c#
 </else>
 <p>
-@page_nav;noquote@
\ No newline at end of file
+@page_nav;noquote@
Index: openacs-4/packages/photo-album/www/photos-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photos-edit.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/photo-album/www/photos-edit.tcl	18 Nov 2003 18:27:53 -0000	1.3
+++ openacs-4/packages/photo-album/www/photos-edit.tcl	18 Nov 2003 22:59:03 -0000	1.4
@@ -12,7 +12,7 @@
 } -validate {
     valid_album -requires {album_id:integer} {
 	if [string equal [pa_is_album_p $album_id] "f"] {
-	    ad_complain "The specified album is not valid."
+	    ad_complain "[_ photo-album._The_1]"
 	}
     }
 } -properties {
@@ -41,7 +41,7 @@
 # check for read permission on album
 ad_require_permission $album_id read
 
-set context_list [pa_context_bar_list -final "Edit page $page" $album_id]
+set context_list [pa_context_bar_list -final "[_ photo-album.Edit_page] $page" $album_id]
 
 
 db_1row get_album_info {