/********************************************
* 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');
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 *
********************************************/
// 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');
// 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', 'پرێفیكسی كووكیزهكان');
define('_COMMENTFORM_SUBMIT', 'زیادكردنی بۆچوون');
define('_COMMENTFORM_COMMENT', 'بۆچوونهكهت');
define('_COMMENTFORM_NAME', 'ناو');
+<<<<<<< HEAD
+define('_COMMENTFORM_MAIL', 'پۆستی ئهلیكترۆنی یا وێبگه');
+=======
+>>>>>>> skinnable-master
define('_COMMENTFORM_REMEMBER', 'بهبیرم بهێنهوه');
// loginform
define('_ADD_DRAFTNFUTURE', 'ههڵگیراو & بابهتی داهاتوو');
define('_ADD_ADDITEM', 'زیادكردنی بابهت');
define('_ADD_ADDNOW', 'زیادكردن ئێستا');
+<<<<<<< HEAD
+define('_ADD_ADDLATER', 'پاشان زیادكردن');
+=======
+>>>>>>> skinnable-master
define('_ADD_PLACE_ON', 'ڕووبهر بۆ');
define('_ADD_ADDDRAFT', 'زیادكردن بۆ ههڵگیراوهكان');
define('_ADD_NOPASTDATES', '(dates and times in the past are NOT valid, the current time will be used in that case)');
// LOGIN screen
define('_LOGIN_MESSAGE', 'پهیام');
+<<<<<<< HEAD
+define('_LOGIN_NAME', 'ناو');
+define('_LOGIN_PASSWORD', 'وشهی تێپهڕبوون');
+=======
+>>>>>>> skinnable-master
define('_LOGIN_SHARED', _LOGINFORM_SHARED);
define('_LOGIN_FORGOT', 'وشهی تێپهڕبوونت لهبیركردوه؟');
define('_MOVE_TITLE', 'بۆ كوێ ئهیگوازنهوه؟');
define('_MOVE_BTN', 'گواستنهوهی بابهت');
+<<<<<<< HEAD
+?>
+=======
// ADMIN-template template types
include_once('adminskinTypes.php');
define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST', 'navibar for item/comment list');
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