merge recent changes to HEAD

1 files changed, 23 insertions, 3 deletions

diff --git a/templates/import_languages.tpl b/templates/import_languages.tpl
index 838b87f..82d5b07 100644
--- a/templates/import_languages.tpl
+++ b/templates/import_languages.tpl
@@ -11,10 +11,11 @@
 	<div class="body">
 		{jstabs}
 			{jstab title="Import Languages"}
-				{form legend="Import languages"}
+				{form legend="Import languages" enctype="multipart/form-data"}
 					<div class="row">
 						{formlabel label="Select the languages to Import"}
 						{forminput}
+							{formhelp note="Languages that are checked below will be imported from the language string files in the bitweaver distribution. If you have your own language file, please choose it below."}
 							{foreach from=$impLanguages key=langCode item=lang}
 								<label><input type="checkbox" name="imp_languages[]" value="{$langCode}" /> {$lang.full_name}</label><br/>
 							{/foreach}
@@ -28,13 +29,32 @@
 					</div>
 
 					<div class="row">
+						{formlabel label="Upload Language File"}
+						{forminput}
+							{formhelp note="Choose a language file to upload..."}
+								<input type="file" name="upload_file" size="40" /><br/>
+						{/forminput}
+						{forminput}
+							{formhelp note="Upload File Language..."}
+							<select name="upload_lang_code" id="upload_lang_code">
+								{foreach from=$impLanguages key=langCode item=lang}
+									<option value="{$langCode}" >{$lang.full_name}</option>
+								{/foreach}
+							</select>
+						{/forminput}
+					</div>
+
+					<div class="row">
 						{formlabel label="Options"}
 						{forminput}
-							<label><input type="radio" name="overwrite" value="0" checked="checked" />
+							<label><input type="radio" name="overwrite" value="n" />
 								{tr}Do not import string if it has been changed in the local database{/tr}</label>
 							<br/>
-							<label><input type="radio" name="overwrite" value="1" />
+							<label><input type="radio" name="overwrite" value="y" />
 								{tr}Overwrite changes in the local database{/tr}</label>
+       <br/>
+							<label><input type="radio" name="overwrite" value="r" checked="checked" />
+								{tr}Manually resolve conflicts between database and import file{/tr}</label>
 						{/forminput}
 					</div>