/********************************************
* 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');
+
+/* labels for date and time measurement unit */
+define('_LABEL_YEAR_UNIT', 'year');
+define('_LABEL_MONTH_UNIT', 'month');
+define('_LABEL_DAY_UNIT', 'day');
+define('_LABEL_HOUR_UNIT', 'hour');
+define('_LABEL_MINUTE_UNIT', 'minute');
+
// SkinableAdminArea vars
define('_SKINABLEADMIN_DEL_UNINSTALL_DATA', 'Delete ADMIN skin data table on uninstall?');
define('_SKINABLEADMIN_DEFAULT_SKIN', 'Choose a skin of the management area of the default.');
define('_SKINABLEADMIN_NORMALSETTING_STR', ' normal');
define('_SKINABLEADMIN_HELPICONURL_STR', ' icon URL');
define('_SKINABLEADMIN_HELPFILEURL_STR', ' help file URL');
-define('_SKINABLEADMIN_ADMINSKINVAR_STR', ' ADMIN area skin skinvars');
+define('_SKINABLEADMIN_ADMINSKINVAR_STR', ' skinvars');
define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT', 'selectbox used in ADMIN area');
define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE', 'Table for list indication');
define('_SKINABLEADMIN_PLUGIN_QUICKMENU', 'Link to admin page of the plugin shown to the quick-menu');
define('_LOCALE_CA_LATN_ES', 'Catalan in Spain');
define('_LOCALE_CS_LATN_CZ', 'Czech in Czech Republic');
define('_LOCALE_DE_LATN_DE', 'German in Germany');
-define('_LOCALE_EL_GREK_GR', 'Greek in Greece (Greek script)');
+define('_LOCALE_EL_GREK_GR', 'Greek in Greece (Greek script) (Greek script)');
define('_LOCALE_EN_LATN_US', 'English in United States');
define('_LOCALE_ES_LATN_ES', 'Spanish in Spain');
define('_LOCALE_FA_ARAB_IR', 'Persian in Islamic Republic of Iran');
define('_SETTINGS_ADMINSKIN', 'default skin for admin area');
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 *
********************************************/
// 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_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', 'Tiket tidak sah atau kadaluarsa.');
+<<<<<<< HEAD
+// plugin dependency
+define('_ERROR_INSREQPLUGIN', 'Instalasi Plugingagal, harus ada ');
+define('_ERROR_DELREQPLUGIN', 'Menghapus Plugin gagal, dibutuhkan oleh ');
+
+=======
+>>>>>>> skinnable-master
// cookie prefix
define('_SETTINGS_COOKIEPREFIX', 'Awalan Cookie');
define('_COMMENTFORM_SUBMIT', 'Tambahkan komentar');
define('_COMMENTFORM_COMMENT', 'Komentar Anda');
define('_COMMENTFORM_NAME', 'Nama');
+<<<<<<< HEAD
+define('_COMMENTFORM_MAIL', 'E-mail/HTTP');
+=======
+>>>>>>> skinnable-master
define('_COMMENTFORM_REMEMBER', 'Ingat Saya');
// loginform
define('_ADD_DRAFTNFUTURE', 'Draft & Isi untuk nanti');
define('_ADD_ADDITEM', 'Tambahkan Isi');
define('_ADD_ADDNOW', 'Tambahkan Sekarang');
+<<<<<<< HEAD
+define('_ADD_ADDLATER', 'Tambahkan Nanti');
+=======
+>>>>>>> skinnable-master
define('_ADD_PLACE_ON', 'Taruh di');
define('_ADD_ADDDRAFT', 'Tambahkan ke draft');
define('_ADD_NOPASTDATES', '(tanggal dan waktu di masa lampau tidak sah, waktu yang sekarang yang akan dipakai)');
// LOGIN screen
define('_LOGIN_MESSAGE', 'Pesan');
+<<<<<<< HEAD
+define('_LOGIN_NAME', 'Nama');
+define('_LOGIN_PASSWORD', 'Password');
+=======
+>>>>>>> skinnable-master
define('_LOGIN_SHARED', _LOGINFORM_SHARED);
define('_LOGIN_FORGOT', 'Lupa password Anda?');
// move item
define('_MOVE_TITLE', 'Pindahkan ke blog mana?');
define('_MOVE_BTN', 'Pindahkan Isi');
+<<<<<<< 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_BLIST_BD_TADM', _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM', _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL', _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
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
OSDN Git Service
