Merge branch 'skinnable-master'

[nucleus-jp/nucleus-next.git] / nucleus / locales / sk_Latn_SK.ISO-8859-2.php

diff --git a/nucleus/locales/sk_Latn_SK.ISO-8859-2.php b/nucleus/locales/sk_Latn_SK.ISO-8859-2.php
index 8f4a93c..1b151a3 100644 (file)
--- a/nucleus/locales/sk_Latn_SK.ISO-8859-2.php
+++ b/nucleus/locales/sk_Latn_SK.ISO-8859-2.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: sk_Latn_SK.ISO-8859-2.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: sk_Latn_SK.ISO-8859-2.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
@@ -545,6 +549,12 @@ define('_MEDIA_COLLECTION_LABEL',  'Aktu
 define('_ADD_ALIGNLEFT_TT',                    'Zarovna» doµava');
 define('_ADD_ALIGNRIGHT_TT',           'Zarovna» doprava');
 define('_ADD_ALIGNCENTER_TT',          'Zarovna» na stred');
+<<<<<<< HEAD
+
+// searchable blog setting (yes/no)
+define('_EBLOG_SEARCH',                                'Zahrnú» do hµadania');
+=======
+>>>>>>> skinnable-master
 
 // generic upload failure
 define('_ERROR_UPLOADFAILED',          'Nahrávanie zlyhalo');
@@ -832,6 +842,10 @@ define('_COMMENTFORM_YOUARE',              'Ste');
 define('_COMMENTFORM_SUBMIT',          'Prida» komentár');
 define('_COMMENTFORM_COMMENT',         'Vá¹ komentár');
 define('_COMMENTFORM_NAME',                    'Meno');
+<<<<<<< HEAD
+define('_COMMENTFORM_MAIL',                    'E-mail/HTTP');
+=======
+>>>>>>> skinnable-master
 define('_COMMENTFORM_REMEMBER',                'Pamätaj si mna');
 
 // loginform
@@ -858,6 +872,10 @@ define('_ADD_DISABLE_COMMENTS',            'Zak
 define('_ADD_DRAFTNFUTURE',                    'Koncepty a èlánky pre neskor¹ie publikovanie');
 define('_ADD_ADDITEM',                         'Prida» èlánok');
 define('_ADD_ADDNOW',                          'Prida» teraz');
+<<<<<<< HEAD
+define('_ADD_ADDLATER',                                'Prida» neskôr');
+=======
+>>>>>>> skinnable-master
 define('_ADD_PLACE_ON',                                'Umiestni» na');
 define('_ADD_ADDDRAFT',                                'Prida» medzi koncepty');
 define('_ADD_NOPASTDATES',                     '(dátumy a èasy v minulosti NIE SÚ platné, v tom prípade bude pou¾itý aktuálny èas)');
@@ -1201,6 +1219,11 @@ define('_BAN_ADD_BTN',                           'Prida
 
 // LOGIN screen
 define('_LOGIN_MESSAGE',                       'Správa');
+<<<<<<< HEAD
+define('_LOGIN_NAME',                          'Meno');
+define('_LOGIN_PASSWORD',                      'Heslo');
+=======
+>>>>>>> skinnable-master
 define('_LOGIN_SHARED',                                _LOGINFORM_SHARED);
 define('_LOGIN_FORGOT',                                'Zabudli ste heslo?');
 
@@ -1332,6 +1355,8 @@ define('_EDITC_NONMEMBER',                        'nie je 
 // move item
 define('_MOVE_TITLE',                          'Presunú» do akého blogu?');
 define('_MOVE_BTN',                                    'Presunú» èlánok');
+<<<<<<< HEAD
+=======
 
 // ADMIN-template template types
 include_once('adminskinTypes.php');
@@ -1348,3 +1373,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