Merge branch 'skinnable-master'

[nucleus-jp/nucleus-next.git] / nucleus / locales / id_Latn_ID.ISO-8859-1.php

diff --git a/nucleus/locales/id_Latn_ID.ISO-8859-1.php b/nucleus/locales/id_Latn_ID.ISO-8859-1.php
index 5882e1e..4e751bc 100644 (file)
--- a/nucleus/locales/id_Latn_ID.ISO-8859-1.php
+++ b/nucleus/locales/id_Latn_ID.ISO-8859-1.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');
@@ -427,6 +444,13 @@ define('_ARCHIVETYPE_MONTH',               'bulan');
 // 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');
 
@@ -829,6 +853,10 @@ define('_COMMENTFORM_YOUARE',              'Anda adalah');
 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
@@ -855,6 +883,10 @@ define('_ADD_DISABLE_COMMENTS',            'Tidak mengizinkan komentar?');
 define('_ADD_DRAFTNFUTURE',                    'Draft &amp; 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)');
@@ -1198,6 +1230,11 @@ define('_BAN_ADD_BTN',                           'Tambah daftar cekal');
 
 // 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?');
 
@@ -1329,6 +1366,8 @@ define('_EDITC_NONMEMBER',                        'bukan anggota');
 // move item
 define('_MOVE_TITLE',                          'Pindahkan ke blog mana?');
 define('_MOVE_BTN',                                    'Pindahkan Isi');
+<<<<<<< HEAD
+=======
 
 // ADMIN-template template types
 include_once('adminskinTypes.php');
@@ -1345,3 +1384,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