Merge branch 'skinnable-master'

[nucleus-jp/nucleus-next.git] / nucleus / locales / sr_Cyrl_RS.UTF-8.php

diff --git a/nucleus/locales/sr_Cyrl_RS.UTF-8.php b/nucleus/locales/sr_Cyrl_RS.UTF-8.php
index 229ccb8..7ad8355 100644 (file)
--- a/nucleus/locales/sr_Cyrl_RS.UTF-8.php
+++ b/nucleus/locales/sr_Cyrl_RS.UTF-8.php
@@ -14,6 +14,12 @@
 /********************************************
  *        Start New for 4.0                 *
  ********************************************/
+<<<<<<< HEAD
+define('_SKINIE_INVALID_NAMES_DETECTED', 'Invalid skin or templates names detected. Valid names consist of only a-z, A-Z, 0-9, -, and _'); 
+define('_LISTS_AUTHOR', 'Author');
+define('_OVERVIEW_OTHER_DRAFTS', 'Other Drafts');
+ 
+=======
 /* argument value for setlocale() in Microsoft's windows operating system */
 define('_LOCALE_IN_WINDOWS',   'C');
 
@@ -99,6 +105,7 @@ define('_SETTINGS_BKMKLTSKIN',                               'default skin for bookmarklet');
 define('_MEMBERS_BKMKLTSKIN',                          "bookmarklet skin");
 define('_ADMIN_SYSTEMOVERVIEW_VERSION_LATEST',         'The version which is being used is latest.');
 
+>>>>>>> skinnable-master
 /********************************************
  *        Start New for 3.6x                *
  ********************************************/
@@ -267,7 +274,17 @@ define('_PLUGIN_OPTIONS_TITLE',                                                    'Options for %s');
 // Plugin file loda error
 define('_PLUGINFILE_COULDNT_BELOADED',                         'Error: plugin file <strong>%s.php</strong> could not be loaded, or it has been set inactive because it does not support some features (check the <a href="?action=actionlog">actionlog</a> for more info)');
 
+<<<<<<< HEAD
+//ITEM add/edit template (for japanese only)
+define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+define('_ITEM_ADDEDITTEMPLATE_YEAR',                           'Year');
+define('_ITEM_ADDEDITTEMPLATE_MONTH',                          'Month');
+define('_ITEM_ADDEDITTEMPLATE_DAY',                                    'Day');
+define('_ITEM_ADDEDITTEMPLATE_HOUR',                           'Hour');
+define('_ITEM_ADDEDITTEMPLATE_MINUTE',                         'Minute');
+=======
 define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+>>>>>>> skinnable-master
 
 // Errors
 define('_ERRORS_INSTALLSQL',                                           'install.sql should be deleted');
@@ -425,6 +442,13 @@ define('_ARCHIVETYPE_MONTH',                       'mesec');
 // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
 define('_ERROR_BADTICKET',                             'Neodgovarajući ili već iskorišćeni kupon.');
 
+<<<<<<< HEAD
+// plugin dependency
+define('_ERROR_INSREQPLUGIN',                  'Instalacija plugina nije uspela, potrebno je ');
+define('_ERROR_DELREQPLUGIN',                  'Nije uspelo brisanje plugina, potrebno je ');
+
+=======
+>>>>>>> skinnable-master
 // cookie prefix
 define('_SETTINGS_COOKIEPREFIX',               'Cookie prefiks');
 
@@ -827,6 +851,10 @@ define('_COMMENTFORM_YOUARE',                      'Vi ste');
 define('_COMMENTFORM_SUBMIT',                  'Dodajte komentar');
 define('_COMMENTFORM_COMMENT',         'Vaš komentar');
 define('_COMMENTFORM_NAME',                            'Ime');
+<<<<<<< HEAD
+define('_COMMENTFORM_MAIL',                            'E-mail/http');
+=======
+>>>>>>> skinnable-master
 define('_COMMENTFORM_REMEMBER',                'Zapamti me');
 
 // loginform
@@ -853,6 +881,10 @@ define('_ADD_DISABLE_COMMENTS',            'Isključiti komentare?');
 define('_ADD_DRAFTNFUTURE',                    'Skica &amp; za kasnije postove');
 define('_ADD_ADDITEM',                                 'Dodaj post');
 define('_ADD_ADDNOW',                                  'Dodaj sada');
+<<<<<<< HEAD
+define('_ADD_ADDLATER',                                        'Dodaj kasnije');
+=======
+>>>>>>> skinnable-master
 define('_ADD_PLACE_ON',                                        'Postavi na');
 define('_ADD_ADDDRAFT',                                        'Dodaj u skice');
 define('_ADD_NOPASTDATES',                             '(raniji datumi i vreme NISU važeći, u slučaju njihovog odabira bit će unešeni trenutni datum i vreme.)');
@@ -1197,6 +1229,11 @@ define('_BAN_ADD_BTN',                                   'Postavi blokadu');
 
 // LOGIN screen
 define('_LOGIN_MESSAGE',                               'Poruka');
+<<<<<<< HEAD
+define('_LOGIN_NAME',                                  'Korisničko ime');
+define('_LOGIN_PASSWORD',                              'Lozinka');
+=======
+>>>>>>> skinnable-master
 define('_LOGIN_SHARED',                                        _LOGINFORM_SHARED);
 define('_LOGIN_FORGOT',                                        'Zaboravili ste lozinku?');
 
@@ -1328,6 +1365,9 @@ define('_EDITC_NONMEMBER',                                'posetilac');
 define('_MOVE_TITLE',                                  'U koji blog preneti ovaj post?');
 define('_MOVE_BTN',                                            'Prenesi post');
 
+<<<<<<< HEAD
+?>
+=======
 // ADMIN-template template types
 include_once('adminskinTypes.php');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',          'navibar for item/comment list');
@@ -1343,3 +1383,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