9 files changed, 21 insertions, 21 deletions
diff --git a/core/views/admin_block_platform.html.php b/core/views/admin_block_platform.html.php
index 2f13d5d9..09fc0515 100644
--- a/core/views/admin_block_platform.html.php
+++ b/core/views/admin_block_platform.html.php
@@ -1,15 +1,15 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <ul>
   <li>
-    <?= t("Operating System: {{operating_system}}", array("operating_system" => PHP_OS)) ?>
+    <?= t("Operating System: %operating_system", array("operating_system" => PHP_OS)) ?>
   </li>
   <li>
-    <?= t("Apache: {{apache_version}}", array("apache_version" => function_exists("apache_get_version") ? apache_get_version() : t("Unknown"))) ?>
+    <?= t("Apache: %apache_version", array("apache_version" => function_exists("apache_get_version") ? apache_get_version() : t("Unknown"))) ?>
   </li>
   <li>
-    <?= t("PHP: {{php_version}}", array("php_version" => phpversion())) ?>
+    <?= t("PHP: %php_version", array("php_version" => phpversion())) ?>
   </li>
   <li>
-    <?= t("MySQL: {{mysql_version}}", array("mysql_version" => mysql_get_server_info())) ?>
+    <?= t("MySQL: %mysql_version", array("mysql_version" => mysql_get_server_info())) ?>
   </li>
 </ul>
diff --git a/core/views/admin_block_stats.html.php b/core/views/admin_block_stats.html.php
index 42f34aa4..2d975073 100644
--- a/core/views/admin_block_stats.html.php
+++ b/core/views/admin_block_stats.html.php
@@ -1,12 +1,12 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <ul>
   <li>
-    <?= t("Version: {{version}}", array("version" => module::get_var("core", "version"))) ?>
+    <?= t("Version: %version", array("version" => module::get_var("core", "version"))) ?>
   </li>
   <li>
-    <?= t("Albums: {{count}}", array("count" => $album_count)) ?>
+    <?= t("Albums: %count", array("count" => $album_count)) ?>
   </li>
   <li>
-    <?= t("Photos: {{count}}", array("count" => $photo_count)) ?>
+    <?= t("Photos: %count", array("count" => $photo_count)) ?>
   </li>
 </ul>
diff --git a/core/views/admin_block_welcome.html.php b/core/views/admin_block_welcome.html.php
index 35501ffc..89914fb3 100644
--- a/core/views/admin_block_welcome.html.php
+++ b/core/views/admin_block_welcome.html.php
@@ -4,15 +4,15 @@
 </p>
 <ul>
   <li>
-    <?= t("{{link_start}}General Settings{{link_end}} - General configuation options for your Gallery.",
+    <?= t("%link_startGeneral Settings%link_end - General configuation options for your Gallery.",
           array("link_start" => "<a href=\"#\">", "link_end" => "</a>")) ?>
   </li>
   <li>
-    <?= t("{{link_start}}Modules{{link_end}} - Manage available and installed modules.",
+    <?= t("%link_startModules%link_end - Manage available and installed modules.",
           array("link_start" => "<a href=\"" . url::site("admin/modules") . "\">", "link_end" => "</a>")) ?>
   </li>
   <li>
-    <?= t("{{link_start}}Presentation{{link_end}} - Choose a theme, set image sizes.",
+    <?= t("%link_startPresentation%link_end - Choose a theme, set image sizes.",
           array("link_start" => "<a href=\"#\">", "link_end" => "</a>")) ?>
   </li>
 </ul>
diff --git a/core/views/admin_graphics_gd.html.php b/core/views/admin_graphics_gd.html.php
index b238401f..8c645f4f 100644
--- a/core/views/admin_graphics_gd.html.php
+++ b/core/views/admin_graphics_gd.html.php
@@ -3,16 +3,16 @@
   <img class="logo" width="170" height="110" src="<?= url::file("core/images/gd.png"); ?>" alt="<? t("Visit the GD lib project site") ?>" />
   <h3> <?= t("GD") ?> </h3>
   <p>
-    <?= t("The GD graphics library is an extension to PHP commonly installed most webservers.  Please refer to the <a href=\"{{url}}\">GD website</a> for more information.",
+    <?= t("The GD graphics library is an extension to PHP commonly installed most webservers.  Please refer to the <a href=\"%url\">GD website</a> for more information.",
         array("url" => "http://www.boutell.com/gd")) ?>
   </p>
   <? if ($tk->gd["GD Version"] && function_exists('imagerotate')): ?>
   <p class="gSuccess">
-    <?= t("You have GD version {{version}}.", array("version" => $tk->gd["GD Version"])) ?>
+    <?= t("You have GD version %version.", array("version" => $tk->gd["GD Version"])) ?>
   </p>
   <? elseif ($tk->gd["GD Version"]): ?>
   <p class="gWarning">
-    <?= t("You have GD version {{version}}, but it lacks image rotation.",
+    <?= t("You have GD version %version, but it lacks image rotation.",
         array("version" => $tk->gd["GD Version"])) ?>
   </p>
   <? else: ?>
diff --git a/core/views/admin_graphics_graphicsmagick.html.php b/core/views/admin_graphics_graphicsmagick.html.php
index 8dc1d714..bb4f906d 100644
--- a/core/views/admin_graphics_graphicsmagick.html.php
+++ b/core/views/admin_graphics_graphicsmagick.html.php
@@ -3,12 +3,12 @@
   <h3> <?= t("GraphicsMagick") ?> </h3>
   <img class="logo" width="107" height="76" src="<?= url::file("core/images/graphicsmagick.png"); ?>" alt="<? t("Visit the GraphicsMagick project site") ?>" />
   <p>
-    <?= t("GraphicsMagick is a standalone graphics program available on most Linux systems.  Please refer to the <a href=\"{{url}}\">GraphicsMagick website</a> for more information.",
+    <?= t("GraphicsMagick is a standalone graphics program available on most Linux systems.  Please refer to the <a href=\"%url\">GraphicsMagick website</a> for more information.",
         array("url" => "http://www.graphicsmagick.org")) ?>
   </p>
   <? if ($tk->graphicsmagick): ?>
   <p class="gSuccess">
-    <?= t("GraphicsMagick is available in {{path}}", array("path" => $tk->graphicsmagick)) ?>
+    <?= t("GraphicsMagick is available in %path", array("path" => $tk->graphicsmagick)) ?>
   </p>
   <? else: ?>
   <p class="gInfo">
diff --git a/core/views/admin_graphics_imagemagick.html.php b/core/views/admin_graphics_imagemagick.html.php
index 02a18ac8..7898a8d1 100644
--- a/core/views/admin_graphics_imagemagick.html.php
+++ b/core/views/admin_graphics_imagemagick.html.php
@@ -3,12 +3,12 @@
   <h3> <?= t("ImageMagick") ?> </h3>
   <img class="logo" width="114" height="118" src="<?= url::file("core/images/imagemagick.jpg"); ?>" alt="<? t("Visit the ImageMagick project site") ?>" />
   <p>
-    <?= t("ImageMagick is a standalone graphics program available on most Linux systems.  Please refer to the <a href=\"{{url}}\">ImageMagick website</a> for more information.",
+    <?= t("ImageMagick is a standalone graphics program available on most Linux systems.  Please refer to the <a href=\"%url\">ImageMagick website</a> for more information.",
         array("url" => "http://www.imagemagick.org")) ?>
   </p>
   <? if ($tk->imagemagick): ?>
   <p class="gSuccess">
-    <?= t("ImageMagick is available in {{path}}", array("path" => $tk->imagemagick)) ?>
+    <?= t("ImageMagick is available in %path", array("path" => $tk->imagemagick)) ?>
   </p>
   <? else: ?>
   <p class="gInfo">
diff --git a/core/views/admin_maintenance.html.php b/core/views/admin_maintenance.html.php
index 1da87788..fd5f7a58 100644
--- a/core/views/admin_maintenance.html.php
+++ b/core/views/admin_maintenance.html.php
@@ -75,7 +75,7 @@
           <? elseif ($task->state == "stalled"): ?>
           <?= t("Stalled") ?>
           <? else: ?>
-          <?= t("{{percent_complete}}% Complete", array("percent_complete" => $task->percent_complete)) ?>
+          <?= t("%percent_complete% Complete", array("percent_complete" => $task->percent_complete)) ?>
           <? endif ?>
         </td>
         <td>
diff --git a/core/views/admin_themes.html.php b/core/views/admin_themes.html.php
index b0b4215d..43328b3a 100644
--- a/core/views/admin_themes.html.php
+++ b/core/views/admin_themes.html.php
@@ -31,7 +31,7 @@
       <? if (!$info->site) continue ?>
       <? if ($id == $site) continue ?>
       <div class="gBlock">
-        <a href="<?= url::site("admin/themes/preview/site/$id") ?>" class="gDialogLink" title="<?= t("Theme Preview: {{theme_name}}", array("theme_name" => $info->name)) ?>">
+        <a href="<?= url::site("admin/themes/preview/site/$id") ?>" class="gDialogLink" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name)) ?>">
           <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
                alt="<?= $info->name ?>" />
           <h3> <?= $info->name ?> </h3>
@@ -69,7 +69,7 @@
       <? if (!$info->admin) continue ?>
       <? if ($id == $admin) continue ?>
       <div class="gBlock">
-        <a href="<?= url::site("admin/themes/preview/admin/$id") ?>" class="gDialogLink" title="<?= t("Theme Preview: {{theme_name}}", array("theme_name" => $info->name)) ?>">
+        <a href="<?= url::site("admin/themes/preview/admin/$id") ?>" class="gDialogLink" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name)) ?>">
           <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
                alt="<?= $info->name ?>" />
           <h3> <?= $info->name ?> </h3>
diff --git a/core/views/admin_themes_preview.html.php b/core/views/admin_themes_preview.html.php
index acd1ba3c..d4fa617d 100644
--- a/core/views/admin_themes_preview.html.php
+++ b/core/views/admin_themes_preview.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <p>
   <a href="<?= url::site("admin/themes/choose/$type/$theme_name?csrf=" . access::csrf_token()) ?>">
-    <?= t("Activate <strong>{{theme_name}}</strong>", array("theme_name" => $info->name)) ?>
+    <?= t("Activate <strong>%theme_name</strong>", array("theme_name" => $info->name)) ?>
   </a>
 </p>
 <iframe src="<?= $url ?>" style="width: 900px; height: 450px"></iframe>