Merge branch 'skinnable-master'

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

diff --git a/nucleus/locales/ro_Latn_RO.UTF-8.php b/nucleus/locales/ro_Latn_RO.UTF-8.php
index 64efdf1..0e88985 100644 (file)
--- a/nucleus/locales/ro_Latn_RO.UTF-8.php
+++ b/nucleus/locales/ro_Latn_RO.UTF-8.php
@@ -20,6 +20,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');
 
@@ -105,6 +111,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                *
  ********************************************/
@@ -175,6 +182,12 @@ define('_ERROR_DELREQPLUGIN',              'Plugin deletion failed, required by %s');
 //define('_ADD_ADDLATER',                                                              'Add Later');
 define('_ADD_ADDLATER',                                                                'Add the dates specified');
 
+<<<<<<< HEAD
+define('_LOGIN_NAME',                          'Name:');
+define('_LOGIN_PASSWORD',                      'Password:');
+
+=======
+>>>>>>> skinnable-master
 // changed from _BOOKMARLET_BMARKLFOLLOW
 define('_BOOKMARKLET_BMARKFOLLOW',                                     ' (Works with nearly all browsers)');
 // END changed/added after 3.33 END
@@ -270,7 +283,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');
@@ -429,6 +452,13 @@ define('_ARCHIVETYPE_MONTH',               'luna');
 // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
 define('_ERROR_BADTICKET',                     'Tichetul nu este valid sau este expirat.');
 
+<<<<<<< HEAD
+// plugin dependency
+define('_ERROR_INSREQPLUGIN',          'Instalarea pluginului a esuat, necesita ');
+define('_ERROR_DELREQPLUGIN',          'Stergerea pluginului a esuat, folosit de ');
+
+=======
+>>>>>>> skinnable-master
 // cookie prefix
 define('_SETTINGS_COOKIEPREFIX',       'Prefixul Cookieului');
 
@@ -550,6 +580,12 @@ define('_ADD_ALIGNLEFT_TT',                'Aliniaza la stanga');
 define('_ADD_ALIGNRIGHT_TT',           'Aliniaza la dreapta');
 define('_ADD_ALIGNCENTER_TT',          'Centreaza');
 
+<<<<<<< HEAD
+// searchable blog setting (yes/no)
+define('_EBLOG_SEARCH',                        'Include in cautare');
+
+=======
+>>>>>>> skinnable-master
 // generic upload failure
 define('_ERROR_UPLOADFAILED',          'Descarcare esuata');
 
@@ -832,6 +868,10 @@ define('_COMMENTFORM_YOUARE',              'Sunteti');
 define('_COMMENTFORM_SUBMIT',          'Adaugati un comentariu');
 define('_COMMENTFORM_COMMENT',         'Comentariul Dvs');
 define('_COMMENTFORM_NAME',            'Nume');
+<<<<<<< HEAD
+define('_COMMENTFORM_MAIL',            'Email/HTTP');
+=======
+>>>>>>> skinnable-master
 define('_COMMENTFORM_REMEMBER',                'Tine minte numele');
 
 // loginform
@@ -858,6 +898,10 @@ define('_ADD_DISABLE_COMMENTS',            'Interziceti comentariile?');
 define('_ADD_DRAFTNFUTURE',            'Ciorne &amp; articole viitoare');
 define('_ADD_ADDITEM',                 'Adauga un articol');
 define('_ADD_ADDNOW',                  'Adauga acum');
+<<<<<<< HEAD
+define('_ADD_ADDLATER',                        'Adauga mai tarziu');
+=======
+>>>>>>> skinnable-master
 define('_ADD_PLACE_ON',                        'Datat: ');
 define('_ADD_ADDDRAFT',                        'Adaugati la ciorne');
 define('_ADD_NOPASTDATES',             '(Datele si orele nu sunt valide, deci va fi utilizata data de azi)');
@@ -1335,6 +1379,9 @@ define('_EDITC_NONMEMBER',                'vizitator');
 define('_MOVE_TITLE',                  'Deplasare in care blog?');
 define('_MOVE_BTN',                    'Deplasare articol');
 
+<<<<<<< HEAD
+?>
+=======
 // ADMIN-template template types
 include_once('adminskinTypes.php');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',          'navibar for item/comment list');
@@ -1350,3 +1397,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