merge recent changes into HEAD

1 files changed, 44 insertions, 0 deletions

diff --git a/templates/import_resolve.tpl b/templates/import_resolve.tpl
new file mode 100644
index 0000000..8b0f287
--- /dev/null
+++ b/templates/import_resolve.tpl
@@ -0,0 +1,44 @@
+{strip}
+<div class="floaticon">{bithelp}</div>
+
+<div class="admin languages">
+    <div class="header">
+        <h1>{tr}Resolve Language Import Conflicts{/tr}</h1>
+    </div>
+
+	{formfeedback hash=$impmsg}
+
+	<div class="body">
+		{form legend="Import languages"}
+			{foreach from=$impConflicts key=lang item=langConflicts}
+				<h2>{tr}Conflicts{/tr}: {$impLanguages.$lang.translated_name}</h2>
+				{foreach from=$langConflicts key=sourceHash item=conflict}
+				<div class="row">
+					{formlabel label="Master String"}
+					{forminput}
+							{$conflict.master}
+					{/forminput}
+				</div>
+				<div class="row">
+					{formlabel label="Existing"}
+					{forminput}
+							<input type="radio" name="conflict[{$lang}][{$sourceHash}]" value="" checked="checked" /> {$conflict.existing}
+					{/forminput}
+				</div>
+				<div class="row">
+					{formlabel label="Imported"}
+					{forminput}
+							<input type="radio" name="conflict[{$lang}][{$sourceHash}]" value="{$conflict.import}" /> {$conflict.import}
+					{/forminput}
+				</div>
+				<br/>
+				{/foreach}
+			{/foreach}
+
+			<div class="row submit">
+				<input type="submit" name="resolve" value="{tr}Import{/tr}" />
+			</div>
+		{/form}
+	</div><!-- end .body -->
+</div><!-- end .languages -->
+{/strip}