From 8dec212ba243f30af35d82274228817a72566da8 Mon Sep 17 00:00:00 2001 From: spiderr Date: Mon, 1 Apr 2013 12:19:57 -0400 Subject: bootstrap-conversion --- templates/import_resolve.tpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'templates/import_resolve.tpl') diff --git a/templates/import_resolve.tpl b/templates/import_resolve.tpl index e6de574..2d1f9f4 100644 --- a/templates/import_resolve.tpl +++ b/templates/import_resolve.tpl @@ -13,21 +13,21 @@ {foreach from=$impConflicts key=lang item=langConflicts}

{tr}Conflicts{/tr}: {$impLanguages.$lang.translated_name}

{foreach from=$langConflicts key=sourceHash item=conflict} -
+
{formlabel label="Master String"} {forminput} {$conflict.master|escape|nl2br} {/forminput}
-
+
{formlabel label="Existing"} {forminput} {/forminput}
-
+
{formlabel label="Imported"} {forminput} @@ -37,7 +37,7 @@ {/foreach} {/foreach} -
+
{/form} -- cgit v1.3