*
* @license http://nucleuscms.org/license.txt GNU General Public License
* @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: de_Latn_DE.ISO-8859-1.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
* @version $Id: de_Latn_DE.ISO-8859-1.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
*/
/********************************************
define('_ERROR_DELREQPLUGIN', 'Lö;schen des Plugins misslungen, benö;tigt von ');
//define('_ADD_ADDLATER', 'Add Later');
+<<<<<<< HEAD
+define('_ADD_ADDLATER', 'Add the dates specified');
+=======
define('_ADD_ADDLATER', 'Später hinzufügen');
+>>>>>>> skinnable-master
define('_LOGIN_NAME', 'Name:');
define('_LOGIN_PASSWORD', 'Password:');
// 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');
// ADMIN.php blog settings
define('_EBLOG_CURRENT_TEAM_MEMBER', 'Mitglieder im Team:');
+<<<<<<< HEAD
/********************************************
* End New for 3.40 *
define('_ERROR_COMMENTS_SPAM', 'Your comment was rejected because it did not pass the spam test');
// END changed/added after 3.22 END
+=======
+
+/********************************************
+ * End New for 3.40 *
+ ********************************************/
+
+// START changed/added after 3.3 START
+define('_AUTOSAVEDRAFT', 'Auto save draft');
+define('_AUTOSAVEDRAFT_LASTSAVED', 'Last saved: ');
+define('_AUTOSAVEDRAFT_NOTYETSAVED', 'No saves have been made yet');
+define('_AUTOSAVEDRAFT_NOW', 'Auto save now');
+define('_SKIN_PARTS_SPECIAL', 'Special skin parts');
+define('_ERROR_SKIN_PARTS_SPECIAL_FORMAT', 'You must enter a name that exists only out of lowercase letters and digits');
+define('_ERROR_SKIN_PARTS_SPECIAL_DELETE', 'Can\'t delete this skin part');
+define('_CONFIRMTXT_SKIN_PARTS_SPECIAL', 'Do you really want to delete this special skin part?');
+define('_ERROR_PLUGIN_LOAD', 'Plugin could not be loaded, or does not support certain features that are required for it to run on your Nucleus installation (you might want to check the <a href="?action=actionlog">actionlog</a> for more info)');
+// END changed/added after 3.3 END
+
+// START changed/added after 3.22 START
+define('_SEARCHFORM_QUERY', 'Keywords to search');
+define('_ERROR_EMAIL_REQUIRED', 'Email address is required');
+define('_COMMENTFORM_MAIL', 'eMail/HTTP');
+define('_COMMENTFORM_EMAIL', 'E-mail:');
+define('_EBLOG_REQUIREDEMAIL', 'E-Mail Addresse für Kommentare voraussetzen?');
+define('_ERROR_COMMENTS_SPAM', 'Your comment was rejected because it did not pass the spam test');
+// END changed/added after 3.22 END
+
+>>>>>>> skinnable-master
// START changed/added after 3.15 START
define('_LIST_PLUG_SUBS_NEEDUPDATE','Bitte benutzen Sie den \'Update Subscribtion list\'-Taste zum Update der Plugin-Abonnementliste.');
define('_MANAGE_SKINS', 'Skins und Vorlagen');
define('_MANAGE_EXTRA', 'Spezielle Einstellungen');
define('_BACKTOMANAGE', 'Zurück zur Nucleus Verwaltung');
+<<<<<<< HEAD
+
+define('_BACKTOMANAGE', 'Back to Nucleus management');
+
+
// END introduced after v1.1 END
+
+
+
+
+=======
+// END introduced after v1.1 END
+
+>>>>>>> skinnable-master
// global stuff
define('_LOGOUT', 'Abmelden');
define('_LOGIN', 'Anmelden');
define('_ADD_DISABLE_COMMENTS', 'Kommentare verbieten?');
define('_ADD_ADDITEM', 'Artikel hinzufügen');
define('_ADD_ADDNOW', 'Jetzt hinzufügen');
+<<<<<<< HEAD
+define('_ADD_ADDLATER', 'Später hinzufügen');
+=======
+>>>>>>> skinnable-master
define('_ADD_PLACE_ON', 'am');
define('_ADD_ADDDRAFT', 'Zu Entwürfen hinzufügen');
define('_ADD_DRAFTNFUTURE', 'Entwürfe & zukünftige Inhalte');