1
0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-09 22:56:55 +02:00

Hot Fixes

This commit is contained in:
Awilum
2013-04-07 00:14:29 +03:00
parent e439fc04f4
commit 783a1160ea
2 changed files with 3 additions and 16 deletions

View File

@@ -7,11 +7,7 @@
'Sitemap created' => 'نقشه سایت ایجاد شد',
'Create Sitemap' => 'ایجاد نقشه سایت',
'on' => 'روشن',
<<<<<<< HEAD
'off'=> 'خاموش',
=======
'off'=> 'خاموش',
>>>>>>> refs/remotes/origin/master
'Site Url' => 'آدرس سایت',
'Maintenance Mode' => 'حالت تعمیر و نگهداری',
'Maintenance Mode On' => 'حالت تعمیر و نگهداری روشن',
@@ -25,13 +21,8 @@
'Default Page' => 'صفحه پیشفرض',
'Time zone' => 'منطقه زمانی',
'Language' => 'زبان',
'Email' => 'Email',
'Save' => 'ذخیره',
<<<<<<< HEAD
'Site' => 'سایت',
=======
'Site' => 'سایت',
>>>>>>> refs/remotes/origin/master
'System version' => 'نسخه سیستم',
'System version ID' => 'شناسه نسخه سیستم',
'GZIP' => 'GZIP',

View File

@@ -5,9 +5,5 @@
<?php echo Form::hidden('csrf', Security::token()); ?>
<label><?php echo __('Username', 'users'); ?></label><input name="username" type="text" class="input-large" />
<label><?php echo __('Password', 'users'); ?></label><input name="password" type="password" class="input-large" />
<<<<<<< HEAD
<br /><input name="login_submit" class="btn" type="submit" value="<?php echo __('Log In', 'users'); ?>" /> <a class="small-grey-text reset-password-btn" href="<?php echo Option::get('siteurl').'users/password-reset'; ?>"><?php echo __('Forgot your password?', 'users');?></a></td></tr>
=======
<br /><input name="login_submit" class="btn" type="submit" value="<?php echo __('Login', 'users'); ?>" /> <a class="small-grey-text reset-password-btn" href="<?php echo Option::get('siteurl').'users/password-reset'; ?>"><?php echo __('Forgot your password?', 'users');?></a></td></tr>
>>>>>>> refs/remotes/origin/master
</form>