Index: openacs-4/packages/acs-automated-testing/www/admin/init-file-resource.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/init-file-resource.tcl,v
diff -u -N -r1.1.26.1 -r1.1.26.2
--- openacs-4/packages/acs-automated-testing/www/admin/init-file-resource.tcl	10 Sep 2015 08:21:15 -0000	1.1.26.1
+++ openacs-4/packages/acs-automated-testing/www/admin/init-file-resource.tcl	20 May 2016 18:33:05 -0000	1.1.26.2
@@ -7,7 +7,7 @@
   @cvs-id $Id$
 } {
     absolute_file_path
-    return_url
+    return_url:return_url
 }
 
 ns_log Notice "Sourcing test definition file $absolute_file_path"
Index: openacs-4/packages/acs-automated-testing/www/admin/record-test.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/record-test.tcl,v
diff -u -N -r1.2.12.1 -r1.2.12.2
--- openacs-4/packages/acs-automated-testing/www/admin/record-test.tcl	10 Sep 2015 08:21:15 -0000	1.2.12.1
+++ openacs-4/packages/acs-automated-testing/www/admin/record-test.tcl	20 May 2016 18:33:05 -0000	1.2.12.2
@@ -9,7 +9,7 @@
     @cvs-id $Id$
 } {
     package_key
-    {return_url ""}
+    {return_url:return_url ""}
 } -properties {
 } -validate {
 } -errors {
Index: openacs-4/packages/acs-developer-support/www/css-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/css-edit.tcl,v
diff -u -N -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/acs-developer-support/www/css-edit.tcl	10 Sep 2015 08:21:23 -0000	1.4.2.2
+++ openacs-4/packages/acs-developer-support/www/css-edit.tcl	20 May 2016 18:37:36 -0000	1.4.2.3
@@ -8,7 +8,7 @@
 } {
     {file_location}
     {css_location}
-    {return_url "/"}
+    {return_url:return_url "/"}
 } -properties {
 } -validate {
 } -errors {
Index: openacs-4/packages/acs-developer-support/www/css-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/css-list.tcl,v
diff -u -N -r1.2.4.1 -r1.2.4.2
--- openacs-4/packages/acs-developer-support/www/css-list.tcl	10 Sep 2015 08:21:23 -0000	1.2.4.1
+++ openacs-4/packages/acs-developer-support/www/css-list.tcl	20 May 2016 18:37:36 -0000	1.2.4.2
@@ -8,7 +8,7 @@
     @creation-date 2007-09-29
     @cvs-id $Id$
 } {
-    {return_url ""}
+    {return_url:return_url ""}
     {css_list}
 } -properties {
 } -validate {
Index: openacs-4/packages/acs-developer-support/www/set-user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/set-user.tcl,v
diff -u -N -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/acs-developer-support/www/set-user.tcl	10 Sep 2015 08:21:24 -0000	1.2.2.1
+++ openacs-4/packages/acs-developer-support/www/set-user.tcl	20 May 2016 18:37:36 -0000	1.2.2.2
@@ -2,7 +2,7 @@
     A hack that will allow us to simulate being a different user
 } {
     user_id:naturalnum,notnull
-    return_url
+    return_url:return_url
 }
 
 ##NOTE THIS DOESN'T REQUIRE ADMIN SO THAT WE CAN DO USER SWITCHING
Index: openacs-4/packages/acs-developer-support/www/set.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/set.tcl,v
diff -u -N -r1.3.2.2 -r1.3.2.3
--- openacs-4/packages/acs-developer-support/www/set.tcl	27 Nov 2015 10:26:59 -0000	1.3.2.2
+++ openacs-4/packages/acs-developer-support/www/set.tcl	20 May 2016 18:37:36 -0000	1.3.2.3
@@ -8,7 +8,7 @@
 } {
     field 
     enabled_p:boolean
-    {return_url "."}
+    {return_url:return_url "."}
 }
 
 ds_require_permission [ad_conn package_id] "admin"
Index: openacs-4/packages/acs-lang/www/change-locale.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/change-locale.tcl,v
diff -u -N -r1.3.10.1 -r1.3.10.2
--- openacs-4/packages/acs-lang/www/change-locale.tcl	10 Sep 2015 08:21:27 -0000	1.3.10.1
+++ openacs-4/packages/acs-lang/www/change-locale.tcl	20 May 2016 18:41:40 -0000	1.3.10.2
@@ -2,7 +2,7 @@
 
 } {
     user_locale
-    return_url
+    return_url:return_url
 }
 
 if { [catch {lang::user::set_locale $user_locale} errmsg] } {
Index: openacs-4/packages/acs-lang/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/index.tcl,v
diff -u -N -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/acs-lang/www/index.tcl	10 Sep 2015 08:21:27 -0000	1.6.2.1
+++ openacs-4/packages/acs-lang/www/index.tcl	20 May 2016 18:41:40 -0000	1.6.2.2
@@ -1,7 +1,7 @@
 ad_page_contract {
     Localization home
 } {
-    {return_url ""}
+    {return_url:return_url ""}
     {return_p:boolean "f"}
 }
 
Index: openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl,v
diff -u -N -r1.20.2.1 -r1.20.2.2
--- openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl	10 Sep 2015 08:21:27 -0000	1.20.2.1
+++ openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl	20 May 2016 18:41:40 -0000	1.20.2.2
@@ -14,7 +14,7 @@
     message_key
     show:optional
     {usage_p:boolean "f"}
-    {return_url {}}
+    {return_url:return_url {}}
 }
 
 if { [string length $locale] == 2 } {
Index: openacs-4/packages/acs-lang/www/admin/export-messages.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/export-messages.tcl,v
diff -u -N -r1.2.22.1 -r1.2.22.2
--- openacs-4/packages/acs-lang/www/admin/export-messages.tcl	10 Sep 2015 08:21:27 -0000	1.2.22.1
+++ openacs-4/packages/acs-lang/www/admin/export-messages.tcl	20 May 2016 18:41:40 -0000	1.2.22.2
@@ -5,7 +5,7 @@
 } {
     {locale:multiple ""}
     {package_key ""}
-    {return_url "/acs-lang/admin"}
+    {return_url:return_url "/acs-lang/admin"}
 }
 
 set page_title "Export messages"
Index: openacs-4/packages/acs-lang/www/admin/import-messages.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/import-messages.tcl,v
diff -u -N -r1.7.10.1 -r1.7.10.2
--- openacs-4/packages/acs-lang/www/admin/import-messages.tcl	10 Sep 2015 08:21:28 -0000	1.7.10.1
+++ openacs-4/packages/acs-lang/www/admin/import-messages.tcl	20 May 2016 18:41:40 -0000	1.7.10.2
@@ -5,7 +5,7 @@
 } {
     {locale ""}
     {package_key ""}
-    {return_url "/acs-lang/admin"}
+    {return_url:return_url "/acs-lang/admin"}
 }
 
 set page_title "Import messages"
Index: openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl,v
diff -u -N -r1.12.2.1 -r1.12.2.2
--- openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl	10 Sep 2015 08:21:28 -0000	1.12.2.1
+++ openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl	20 May 2016 18:41:40 -0000	1.12.2.2
@@ -12,7 +12,7 @@
     locale
     package_key
     {message_key ""}
-    {return_url {[export_vars -base message-list { locale package_key }]}}
+    {return_url:return_url {[export_vars -base message-list { locale package_key }]}}
 }
 
 
Index: openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl,v
diff -u -N -r1.2.22.1 -r1.2.22.2
--- openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl	10 Sep 2015 08:21:29 -0000	1.2.22.1
+++ openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl	20 May 2016 18:41:40 -0000	1.2.22.2
@@ -7,7 +7,7 @@
     package_key
     message_key
     locale
-    {return_url {[export_vars -base "message-conflicts" { package_key locale }]}}
+    {return_url:return_url {[export_vars -base "message-conflicts" { package_key locale }]}}
 }
 
 lang::message::edit $package_key $message_key $locale [list conflict_p f]
Index: openacs-4/packages/acs-lang/www/admin/message-conflict-revert.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-conflict-revert.tcl,v
diff -u -N -r1.2.22.1 -r1.2.22.2
--- openacs-4/packages/acs-lang/www/admin/message-conflict-revert.tcl	10 Sep 2015 08:21:29 -0000	1.2.22.1
+++ openacs-4/packages/acs-lang/www/admin/message-conflict-revert.tcl	20 May 2016 18:41:40 -0000	1.2.22.2
@@ -8,7 +8,7 @@
     package_key
     message_key
     locale
-    {return_url {[export_vars -base "message-conflicts" { package_key locale }]}}
+    {return_url:return_url {[export_vars -base "message-conflicts" { package_key locale }]}}
 }
 
 db_transaction {
Index: openacs-4/packages/acs-lang/www/admin/translator-mode-toggle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/translator-mode-toggle.tcl,v
diff -u -N -r1.2.12.1 -r1.2.12.2
--- openacs-4/packages/acs-lang/www/admin/translator-mode-toggle.tcl	10 Sep 2015 08:21:30 -0000	1.2.12.1
+++ openacs-4/packages/acs-lang/www/admin/translator-mode-toggle.tcl	20 May 2016 18:41:40 -0000	1.2.12.2
@@ -5,7 +5,7 @@
     @creation-date October 24, 2002
     @cvs-id $Id$
 } {
-    {return_url "."}
+    {return_url:return_url "."}
 }
 
 lang::util::translator_mode_set [expr {![lang::util::translator_mode_p]}]