Merge branch 'skinnable-master'

[nucleus-jp/nucleus-next.git] / nucleus / locales / ru_Cyrl_RU.WINDOWS-1251.php

diff --git a/nucleus/locales/ru_Cyrl_RU.WINDOWS-1251.php b/nucleus/locales/ru_Cyrl_RU.WINDOWS-1251.php
index fac5681..cbd5b1f 100644 (file)
--- a/nucleus/locales/ru_Cyrl_RU.WINDOWS-1251.php
+++ b/nucleus/locales/ru_Cyrl_RU.WINDOWS-1251.php
@@ -12,7 +12,11 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: ru_Cyrl_RU.WINDOWS-1251.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: ru_Cyrl_RU.WINDOWS-1251.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
@@ -430,6 +434,13 @@ define('_ARCHIVETYPE_MONTH',               '
 
 // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
 define('_ERROR_BADTICKET',                     'Íåïðàâèëüíàÿ èëè èñïîëüçóåìàÿ ïîâòîðíî ññûëêà.');
+<<<<<<< HEAD
+
+// plugin dependency
+define('_ERROR_INSREQPLUGIN',          'Îøèáêà ïðè óñòàíîâêå ïëàãèíà, òðåáóåòñÿ ');
+define('_ERROR_DELREQPLUGIN',          'Íå óäàëîñü âûïîëíèòü óäàëåíèå ïëàãèíà, òðåáóåòñÿ ');
+=======
+>>>>>>> skinnable-master
 
 // cookie prefix
 define('_SETTINGS_COOKIEPREFIX',       'Ïðåôèêñ Cookie');
@@ -837,6 +848,10 @@ define('_COMMENTFORM_YOUARE',              '
 define('_COMMENTFORM_SUBMIT',          'Êîììåíòèðîâàòü!');
 define('_COMMENTFORM_COMMENT',         'Âàø êîììåíòàðèé');
 define('_COMMENTFORM_NAME',                    'Èìÿ');
+<<<<<<< HEAD
+define('_COMMENTFORM_MAIL',                    'E-mail/HTTP');
+=======
+>>>>>>> skinnable-master
 define('_COMMENTFORM_REMEMBER',                'Çàïîìíèòü ìåíÿ');
 
 // loginform
@@ -863,6 +878,10 @@ define('_ADD_DISABLE_COMMENTS',            '
 define('_ADD_DRAFTNFUTURE',                    '×åðíîâèêè &amp; Áóäóùèå ñîîáøåíèÿ');
 define('_ADD_ADDITEM',                         'Äîáàâèòü ñîîáùåíèå');
 define('_ADD_ADDNOW',                          'Äîáàâèòü ñåé÷àñ');
+<<<<<<< HEAD
+define('_ADD_ADDLATER',                                'Äîáàâèòü ïîçæå');
+=======
+>>>>>>> skinnable-master
 define('_ADD_PLACE_ON',                                'Âûáåðèòå äàòó');
 define('_ADD_ADDDRAFT',                                'Äîáàâèòü â ÷åðíîâèêè');
 define('_ADD_NOPASTDATES',                     '(äàòà è âðåìÿ â ïðîøëîì íåäåéñòâèòåëüíû, áóäóò èñïîëüçîâàíî òåêóùåå âðåìÿ)');
@@ -1206,6 +1225,11 @@ define('_BAN_ADD_BTN',                           '
 
 // LOGIN screen
 define('_LOGIN_MESSAGE',                       'Ñîîáùåíèå');
+<<<<<<< HEAD
+define('_LOGIN_NAME',                          'Èìÿ');
+define('_LOGIN_PASSWORD',                      'Ïàðîëü');
+=======
+>>>>>>> skinnable-master
 define('_LOGIN_SHARED',                                _LOGINFORM_SHARED);
 define('_LOGIN_FORGOT',                                'Âñïîìíèòü ïàðîëü');
 
@@ -1337,6 +1361,8 @@ define('_EDITC_NONMEMBER',                        '
 // move item
 define('_MOVE_TITLE',                          'Âûáåðèòå ðàçäåë äëÿ ïåðåìåùåíèÿ');
 define('_MOVE_BTN',                                    'Ïåðåìåñòèòü ñîîáùåíèå');
+<<<<<<< HEAD
+=======
 
 // ADMIN-template template types
 include_once('adminskinTypes.php');
@@ -1353,3 +1379,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