Merge branch 'skinnable-master'

[nucleus-jp/nucleus-next.git] / nucleus / locales / lv_Latn_LV.ISO-8859-13.php

diff --git a/nucleus/locales/lv_Latn_LV.ISO-8859-13.php b/nucleus/locales/lv_Latn_LV.ISO-8859-13.php
index a3d3974..6e54fff 100644 (file)
--- a/nucleus/locales/lv_Latn_LV.ISO-8859-13.php
+++ b/nucleus/locales/lv_Latn_LV.ISO-8859-13.php
@@ -8,7 +8,11 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: lv_Latn_LV.ISO-8859-13.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: lv_Latn_LV.ISO-8859-13.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
@@ -545,6 +549,12 @@ define('_MEDIA_COLLECTION_LABEL',  'Pa
 define('_ADD_ALIGNLEFT_TT',                    'Kreisajâ pusç');
 define('_ADD_ALIGNRIGHT_TT',           'Labajâ pusç');
 define('_ADD_ALIGNCENTER_TT',          'Iecentrçts');
+<<<<<<< HEAD
+
+// searchable blog setting (yes/no)
+define('_EBLOG_SEARCH',                                'Pievienot meklçðanas indeksam');
+=======
+>>>>>>> skinnable-master
 
 // generic upload failure
 define('_ERROR_UPLOADFAILED',          'Kïûdas rezultâtâ fails netika pievienots.');
@@ -844,6 +854,10 @@ define('_COMMENTFORM_YOUARE',        'Tu esi');
 define('_COMMENTFORM_SUBMIT',        'Komentçt');
 define('_COMMENTFORM_COMMENT',        'Tavs komentârs');
 define('_COMMENTFORM_NAME',            'Vârds');
+<<<<<<< HEAD
+define('_COMMENTFORM_MAIL',            'Epasts/HTTP');
+=======
+>>>>>>> skinnable-master
 define('_COMMENTFORM_REMEMBER',        'Atcerçties mani turpmâk');
 
 // loginform
@@ -870,6 +884,10 @@ define('_ADD_DISABLE_COMMENTS',        'Atsl
 define('_ADD_DRAFTNFUTURE',            'Sagataves nâkotnei');
 define('_ADD_ADDITEM',                'Pievienot');
 define('_ADD_ADDNOW',                'Pievienot tagad');
+<<<<<<< HEAD
+define('_ADD_ADDLATER',                'Pievienot vçlâk');
+=======
+>>>>>>> skinnable-master
 define('_ADD_PLACE_ON',                'Vieta');
 define('_ADD_ADDDRAFT',                'Pievienot sagatavçm');
 define('_ADD_NOPASTDATES',            '(pagâtnes datumi un laiki nav iespçjami, ðajâ gadîjumâ tiks lietots ðâbrîþa laiks)');
@@ -1217,6 +1235,11 @@ define('_BAN_ADD_BTN',                'Pievienot aizliegumu');
 
 // LOGIN screen
 define('_LOGIN_MESSAGE',            'Ziòojums');
+<<<<<<< HEAD
+define('_LOGIN_NAME',                'Vârds/nosaukums');
+define('_LOGIN_PASSWORD',            'Parole');
+=======
+>>>>>>> skinnable-master
 define('_LOGIN_SHARED',                _LOGINFORM_SHARED);
 define('_LOGIN_FORGOT',                'Aizmirsâs parole?');
 
@@ -1348,6 +1371,8 @@ define('_EDITC_NONMEMBER',            'ciemi
 // move item
 define('_MOVE_TITLE',                'Uz kuru blogu?');
 define('_MOVE_BTN',                    'Pârvietot...');
+<<<<<<< HEAD
+=======
 
 // ADMIN-template template types
 include_once('adminskinTypes.php');
@@ -1364,3 +1389,4 @@ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin admin link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin help link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin option setting link');
+>>>>>>> skinnable-master