Index: openacs-4/packages/acs-lang/lib/change-locale-bar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/lib/change-locale-bar.adp,v
diff -u -r1.2.18.1 -r1.2.18.2
--- openacs-4/packages/acs-lang/lib/change-locale-bar.adp	22 Jun 2016 07:45:44 -0000	1.2.18.1
+++ openacs-4/packages/acs-lang/lib/change-locale-bar.adp	18 Jan 2017 08:18:37 -0000	1.2.18.2
@@ -11,6 +11,6 @@
 <if @change_locale_url@ not nil>
   <a href="@change_locale_url@">@change_locale_text@</a>
 </if>
-<if @lang_admin_p@>
+<if @lang_admin_p;literal@ true>
       <a class="button" href="@lang_admin_url@">@lang_admin_text@</a>
 </if>
\ No newline at end of file
Index: openacs-4/packages/acs-lang/lib/messages-to-translate.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/lib/messages-to-translate.adp,v
diff -u -r1.3 -r1.3.10.1
--- openacs-4/packages/acs-lang/lib/messages-to-translate.adp	29 Jul 2008 19:22:23 -0000	1.3
+++ openacs-4/packages/acs-lang/lib/messages-to-translate.adp	18 Jan 2017 08:18:37 -0000	1.3.10.1
@@ -1,4 +1,4 @@
-<if @display_p@>
+<if @display_p;literal@ true>
   <hr>
 
   <h3>#acs-lang.Translated_messages_on_this_page#</h3>
Index: openacs-4/packages/acs-lang/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/index.adp,v
diff -u -r1.12 -r1.12.2.1
--- openacs-4/packages/acs-lang/www/index.adp	14 Jul 2015 22:26:55 -0000	1.12
+++ openacs-4/packages/acs-lang/www/index.adp	18 Jan 2017 08:18:37 -0000	1.12.2.1
@@ -2,7 +2,7 @@
   <property name="doc(title)">@instance_name;literal@</property>
   <property name="context_bar">@context_bar;literal@</property>
 
-<if @admin_p@>
+<if @admin_p;literal@ true>
   <div style="float: right;">
     <a href="admin" class="button">#acs-kernel.common_Administration#</a>
   </div>
Index: openacs-4/packages/acs-lang/www/admin/batch-editor.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/batch-editor.adp,v
diff -u -r1.9.2.1 -r1.9.2.2
--- openacs-4/packages/acs-lang/www/admin/batch-editor.adp	22 Jun 2016 07:45:44 -0000	1.9.2.1
+++ openacs-4/packages/acs-lang/www/admin/batch-editor.adp	18 Jan 2017 08:18:37 -0000	1.9.2.2
@@ -14,7 +14,7 @@
   Show: 
   <multiple name="show_opts">
     <if @show_opts.rownum@ gt 1> | </if>
-    <if @show_opts.selected_p@><strong>@show_opts.label@ (@show_opts.count@)</strong> </if>
+    <if @show_opts.selected_p;literal@ true><strong>@show_opts.label@ (@show_opts.count@)</strong> </if>
     <else><a href="@show_opts.url@">@show_opts.label@ (@show_opts.count@)</a> </else>
   </multiple>
 </p>
Index: openacs-4/packages/acs-lang/www/admin/edit-localized-message.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/edit-localized-message.adp,v
diff -u -r1.17.2.1 -r1.17.2.2
--- openacs-4/packages/acs-lang/www/admin/edit-localized-message.adp	22 Jun 2016 07:45:44 -0000	1.17.2.1
+++ openacs-4/packages/acs-lang/www/admin/edit-localized-message.adp	18 Jan 2017 08:18:37 -0000	1.17.2.2
@@ -13,7 +13,7 @@
 <include src="audit-include" current_locale="@current_locale;literal@" message_key="@message_key;literal@" package_key="@package_key;literal@">
 
 <h2>Files that use this message</h2>
-<if @usage_p@ true>
+<if @usage_p;literal@ true>
   <p>
     <strong>Show</strong> | <a href="@usage_hide_url@">Hide</a> files that use this message.
   </p>
@@ -25,7 +25,7 @@
   </p>
 </else>
 
-<if @create_p@ true>
+<if @create_p;literal@ true>
   <ul class="action-links">
     <li> <a href="@delete_url@">Delete this message</a></li>
   </ul>
Index: openacs-4/packages/acs-lang/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/index.adp,v
diff -u -r1.20.2.1 -r1.20.2.2
--- openacs-4/packages/acs-lang/www/admin/index.adp	1 Oct 2016 11:04:31 -0000	1.20.2.1
+++ openacs-4/packages/acs-lang/www/admin/index.adp	18 Jan 2017 08:18:37 -0000	1.20.2.2
@@ -9,19 +9,19 @@
 <h2>#acs-lang.Actions#</h2>
 <ul class="action-links">
   <li>#acs-lang.Toggle_translator_mode#: 
-    <if @translator_mode_p@ true><strong>#acs-lang.On#</strong> | <a href="translator-mode-toggle">#acs-lang.Off#</a></if>
+    <if @translator_mode_p;literal@ true><strong>#acs-lang.On#</strong> | <a href="translator-mode-toggle">#acs-lang.Off#</a></if>
     <else><a href="translator-mode-toggle">#acs-lang.On#</a> | <strong>#acs-lang.Off#</strong></else>
   </li>
 
   <li><a href="@parameter_url@">#acs-lang.Change_system_locale#</a>: #acs-lang.Current_system_locale_is#</li>
 
-<if @timezone_p@>
+<if @timezone_p;literal@ true>
   <li><a href="set-system-timezone">#acs-lang.Change_system_timezone#</a>: #acs-lang.Current_system_timezone_is#</li>
 </if>
 
 <li><a href="lookup">#acs-lang.Look_up_message#</a></li>
 
-<if @site_wide_admin_p@>
+<if @site_wide_admin_p;literal@ true>
   <li><a href="@import_url@" title="#acs-lang.Imports_messages_system-wide_from_catalog_files#" id="action-import">#acs-lang.Import_all_messages#</a></li>
   <li><a href="@export_url@" title="#acs-lang.Export_messages_system-wide_to_catalog_files#" id="action-export">#acs-lang.Export_all_messages#</a></li>
 </if>
@@ -54,15 +54,15 @@
       <td align="right"><if @locales.num_translated_pretty@ ne 0>@locales.num_translated_pretty@</if></td>
       <td align="right"><if @locales.enabled_p@ true or @locales.num_translated@ gt 0><if @locales.num_untranslated_pretty@ ne 0>@locales.num_untranslated_pretty@</if></if></td>
       <td align="center">
-        <if @locales.enabled_p@ true>
+        <if @locales.enabled_p;literal@ true>
           <a href="@locales.locale_enabled_p_url@" title="#acs-lang.Disable_this_locale#"><img src="/resources/acs-subsite/checkboxchecked.gif" height="13" width="13" style="border:0; background-color: white;" alt="#acs-lang.Disable_this_locale#"></a>
         </if>
         <else>
           <a href="@locales.locale_enabled_p_url@" title="#acs-lang.Enable_this_locale#"><img src="/resources/acs-subsite/checkbox.gif" height="13" width="13" style="border:0; background-color: white;" alt="#acs-lang.Enable_this_locale#"></a>
         </else>
       </td>
       <td align="center">
-          <if @locales.default_p@ eq "t">
+          <if @locales.default_p;literal@ true>
             <if @locales.num_locales_for_language@ eq 1>
               <span style="font-style: italic; color: gray;" title="#acs-lang.This_is_the_only_locale_for_this_language#"></span>
             </if>
Index: openacs-4/packages/acs-lang/www/admin/lookup.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/lookup.adp,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/acs-lang/www/admin/lookup.adp	3 Jul 2015 10:25:43 -0000	1.5
+++ openacs-4/packages/acs-lang/www/admin/lookup.adp	18 Jan 2017 08:18:37 -0000	1.5.2.1
@@ -7,7 +7,7 @@
 
 <formtemplate id="lookup"></formtemplate>
 
-<if @message_p@ true>
+<if @message_p;literal@ true>
   <h2>#acs-lang.Translated_Message#</h2>
   <p>@message@</p>
 </if>
Index: openacs-4/packages/acs-lang/www/admin/message-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-list.adp,v
diff -u -r1.16.2.1 -r1.16.2.2
--- openacs-4/packages/acs-lang/www/admin/message-list.adp	22 Jun 2016 07:45:44 -0000	1.16.2.1
+++ openacs-4/packages/acs-lang/www/admin/message-list.adp	18 Jan 2017 08:18:37 -0000	1.16.2.2
@@ -17,15 +17,15 @@
   Show: 
   <multiple name="show_opts">
     <if @show_opts.rownum@ gt 1> | </if>
-    <if @show_opts.selected_p@><strong>@show_opts.label@ (@show_opts.count@)</strong> </if>
+    <if @show_opts.selected_p;literal@ true><strong>@show_opts.label@ (@show_opts.count@)</strong> </if>
     <else><a href="@show_opts.url@">@show_opts.label@ (@show_opts.count@)</a> </else>
   </multiple>
 </p>
 
 <include src="/packages/acs-lang/lib/conflict-link" locale="@current_locale;literal@" package_key="@package_key;literal@"/>
 
 <ul class="action-links">
-  <if @create_p@ true>
+  <if @create_p;literal@ true>
     <li><a href="@new_message_url@">Create new message</a></li>
   </if>
 
@@ -34,7 +34,7 @@
   </if>
   <else>
     <li><a href="@batch_edit_url@">Batch edit these messages</a></li>
-    <if @site_wide_admin_p@>
+    <if @site_wide_admin_p;literal@ true>
       <li><a href="@import_messages_url@">Import messages for this package and locale from catalog files</a></li>
       <li><a href="@export_messages_url@">Export messages for this package and locale to catalog files</a></li>
     </if>
@@ -53,7 +53,7 @@
             <if @default_locale@ ne @current_locale@>
               <th>@locale_label@ Message</th>
             </if>
-            <if @create_p@ true>
+            <if @create_p;literal@ true>
               <th></th>
             </if>
           </tr>
@@ -68,7 +68,7 @@
               <td>@messages.default_message@</td>
               <if @default_locale@ ne @current_locale@>
                 <td>                  
-                  <if @messages.deleted_p@>
+                  <if @messages.deleted_p;literal@ true>
                     <span style="color: red; font-style: italic;">DELETED</span> (@messages.translated_message@)
                   </if>
                   <else>
Index: openacs-4/packages/acs-lang/www/admin/message-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-search.adp,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/acs-lang/www/admin/message-search.adp	22 Jun 2016 07:45:44 -0000	1.6.2.1
+++ openacs-4/packages/acs-lang/www/admin/message-search.adp	18 Jan 2017 08:18:37 -0000	1.6.2.2
@@ -7,7 +7,7 @@
 Search <formwidget id="search_locale"> for <formwidget id="q"> <input type="submit" value="Search">
 </formtemplate>
 
-<if @submit_p@ true>
+<if @submit_p;literal@ true>
   <h2>Search Results</h2>
 
   <if @other_search_url@ not nil>
Index: openacs-4/packages/acs-lang/www/admin/set-system-timezone.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/set-system-timezone.adp,v
diff -u -r1.8.2.1 -r1.8.2.2
--- openacs-4/packages/acs-lang/www/admin/set-system-timezone.adp	22 Jun 2016 07:45:44 -0000	1.8.2.1
+++ openacs-4/packages/acs-lang/www/admin/set-system-timezone.adp	18 Jan 2017 08:18:37 -0000	1.8.2.2
@@ -66,15 +66,15 @@
   </if>
 
   <if @correct_p@ not nil>
-    <tr style=<if @correct_p@ true>"background: #00bb00"</if><else>"background: red"</else>>
+    <tr style=<if @correct_p;literal@ true>"background: #00bb00"</if><else>"background: red"</else>>
       <td>
         <span style="color: white">
           Does it look like the OpenACS timezone setting above is correct:
         </span>
       </td>
       <td>
         <span style="color: white">
-          <if @correct_p@ true>
+          <if @correct_p;literal@ true>
             <strong>YES!</strong> (Congratulations)
           </if>
           <else>