Merge branch 'skinnable-master'

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

diff --git a/nucleus/locales/de_Latn_DE.UTF-8.php b/nucleus/locales/de_Latn_DE.UTF-8.php
index 30b2164..7a56157 100644 (file)
--- a/nucleus/locales/de_Latn_DE.UTF-8.php
+++ b/nucleus/locales/de_Latn_DE.UTF-8.php
@@ -10,7 +10,11 @@
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: de_Latn_DE.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: de_Latn_DE.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
@@ -169,7 +173,11 @@ define('_ERROR_INSREQPLUGIN',                                              'Plugin-Installation misslungen, erfordert ')
 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:');
@@ -269,7 +277,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');
@@ -795,8 +813,21 @@ define('_MANAGE_GENERAL',                  'Verschiedene Einstellungen');
 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');
@@ -851,6 +882,10 @@ define('_ADD_PREVIEW',                             'Vorschau');
 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 &amp; zukünftige Inhalte');