Skip to content

Commit

Permalink
sync last 1.5.7 changes
Browse files Browse the repository at this point in the history
  • Loading branch information
webchills committed Aug 16, 2024
1 parent 9a5eaab commit ed474a4
Show file tree
Hide file tree
Showing 11 changed files with 54 additions and 32 deletions.
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php
/**
* Zen Cart German Specific (158 code in 157 / zencartpro adaptations)
* @copyright Copyright 2003-2023 Zen Cart Development Team
* @copyright Copyright 2003-2024 Zen Cart Development Team
* Zen Cart German Version - www.zen-cart-pro.at
* @copyright Portions Copyright 2003 osCommerce
* @license https://www.zen-cart-pro.at/license/3_0.txt GNU General Public License V3.0
* @version $Id: customers.php 2023-10-26 10:49:16Z webchills $
* @version $Id: customers.php 2024-02-16 17:49:16Z webchills $
*/

define('HEADING_TITLE', 'Kunden');
Expand All @@ -18,6 +18,8 @@
define('TABLE_HEADING_PRICING_GROUP', 'Preisgruppe');
define('TABLE_HEADING_AUTHORIZATION_APPROVAL', 'Autorisiert');
define('TABLE_HEADING_GV_AMOUNT', 'Gutschein Guthaben');
define('TEXT_PURCHASED', 'Bestelldatum:');
define('TEXT_ORDER_STATUS', 'Bestellstatus:');

define('TEXT_DATE_ACCOUNT_CREATED', 'Konto erstellt am:');
define('TEXT_DATE_ACCOUNT_LAST_MODIFIED', 'Letzte Änderung:');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
<?php
/**
* @copyright Copyright 2003-2022 Zen Cart Development Team
* @copyright Copyright 2003-2024 Zen Cart Development Team
* Zen Cart German Version - www.zen-cart-pro.at
* @copyright Portions Copyright 2003 osCommerce
* @license https://www.zen-cart-pro.at/license/3_0.txt GNU General Public License V3.0
* @version $Id: email_archive_manager.php 2022-04-17 16:50:16Z webchills $
* @version $Id: email_archive_manager.php 2024-04-08 09:50:16Z webchills $
*/
define('SUBJECT_SIZE_LIMIT', 25);
define('MESSAGE_SIZE_LIMIT', 550);
define('MESSAGE_LIMIT_BREAK', '...');
define('HEADING_TITLE', 'Email Archiv Manager');
define('HEADING_SEARCH_INSTRUCT', 'Sie können nach jeder Kombination der folgenden Kriterien suchen...');

define('HEADING_TEXT_INSTEAD', 'Zeige TEXT aus Sicherheitsgründen; HTML kann gefährlich sein.');
define('HEADING_MODULE_SELECT', 'Filter nach Modul');
define('HEADING_SEARCH_TEXT', 'Suche nach Text');
define('HEADING_SEARCH_TEXT_FILTER', 'Aktueller Suchfilter: ');
Expand Down Expand Up @@ -57,6 +58,7 @@
define('IMAGE_ICON_EMAIL', ' Email Empfänger ');
define('IMAGE_ICON_DELETE', ' Nachricht löschen ');

define('SEND_NEW_EMAIL', 'Neue Email senden');
define('BUTTON_SEARCH', 'Archiv durchsuchen');
define('BUTTON_TRIM_CONFIRM', 'Email löschen');
define('BUTTON_CANCEL', 'Abbrechen');
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?php
define('BOX_CONFIGURATION_ADMIN_LAYOUT', 'Admin Layout');
define('GERMAN_HELP_PAGE', 'Hilfe');
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?php
define( 'BOX_CUSTOMERS_UPLOADS', 'Von Kunden hochgeladene Dateien' );
Original file line number Diff line number Diff line change
@@ -1,22 +1,16 @@
<?php
/**
* @copyright Copyright 2003-2022 Zen Cart Development Team
* Zen Cart German Specific (158 code in 157)
* @copyright Copyright 2003-2023 Zen Cart Development Team
* Zen Cart German Version - www.zen-cart-pro.at
* @copyright Portions Copyright 2003 osCommerce
* @license https://www.zen-cart-pro.at/license/3_0.txt GNU General Public License V3.0
* @version $Id: newsletter.php 2010-08-30 15:05:14Z webchills $
* @version $Id: newsletter.php 2023-10-28 19:49:16Z webchills $
*/

define('TEXT_COUNT_CUSTOMERS', 'Kunden, die Newsletter erhalten: %s');
define('HEADING_TITLE', 'Newsletter Manager');

define('TABLE_HEADING_NEWSLETTERS', 'Newsletter');
define('TABLE_HEADING_SIZE', 'Größe');
define('TABLE_HEADING_MODULE', 'Modul');
define('TABLE_HEADING_SENT', 'Gesendet');
define('TABLE_HEADING_STATUS', 'Status');
define('TABLE_HEADING_ACTION', 'Aktion');

define('TEXT_NEWSLETTER_MODULE', 'Modul:');
define('TEXT_NEWSLETTER_TITLE', 'Betreff:');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
<?php
/**
* @copyright Copyright 2003-2022 Zen Cart Development Team
* Zen Cart German Specific (158 code in 157)
* @copyright Copyright 2003-2023 Zen Cart Development Team
* Zen Cart German Version - www.zen-cart-pro.at
* @copyright Portions Copyright 2003 osCommerce
* @license https://www.zen-cart-pro.at/license/3_0.txt GNU General Public License V3.0
* @version $Id: product_notification.php 2015-12-22 16:39:16Z webchills $
* @version $Id: product_notification.php 2023-10-28 19:49:16Z webchills $
*/

define('TEXT_COUNT_CUSTOMERS','Kunden, die Artikelbenachrichtigungen erhalten: %s');
define('TEXT_NOTIFICATION_INFO_GLOBAL' , '<p><b>GLOBAL</b> Schaltfläche: Die Benachrichtigung %s wird so programmiert, dass sie an Kunden gesendet wird, die <strong>globale</strong> Produktbenachrichtigungen erhalten möchten.</p>');
define('TEXT_NOTIFICATION_INFO_PRODUCTS' , '<p>Optional, durch Auswahl von Produkten und <b>SENDEN</b>, wird die Benachrichtigung <b>auch</b> an Kunden gesendet, die bestimmte Produktbenachrichtigungen erhalten möchten.</p>');
define('TEXT_PRODUCTS','Artikel');
define('TEXT_SELECTED_PRODUCTS','Ausgewählte Artikel');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
<?php
/**
* Zen Cart German Specific (158 code in 157)
* @copyright Copyright 2003-2023 Zen Cart Development Team
* @copyright Copyright 2003-2024 Zen Cart Development Team
* Zen Cart German Version - www.zen-cart-pro.at
* @copyright Portions Copyright 2003 osCommerce
* @license https://www.zen-cart-pro.at/license/3_0.txt GNU General Public License V3.0
* @version $Id: option_values.php 2023-10-28 16:49:16Z webchills $
* @version $Id: option_values.php 2024-02-20 20:49:16Z webchills $
*/

define('HEADING_TITLE','Standard Sortierung der Attributmerkmale');
define('HEADING_TITLE','Sortierung der Attributmerkmale');
define('TABLE_HEADING_OPTION_VALUE_ID','Attributmerkmal ID');
define('TABLE_HEADING_OPTION_VALUE_NAME','Option Value Name');
define('TEXT_UPDATE_OPTION_VALUES','Standard Sortierung für Attributmerkmale aktualisieren');
define('TEXT_SELECT_OPTION','Attributnamen wählen:');
define('TEXT_SELECT_OPTION','Attributname:');
define('TEXT_EDIT_OPTION_NAME','Attributnamen bearbeiten:');
define('TEXT_NO_OPTION_VALUE','Für den Attributnamen wurde keine Merkmale angelegt<br>Attributname:');
define('TEXT_NO_OPTION_VALUE','Es wurden keine Attributmerkmale angelegt für Attributname:');
define('TEXT_UPDATE_SUBMIT','Sortierung aktualisieren');

define('TEXT_UPDATE_SORT_LANGUAGE_CURRENT','<b>nur</b> für aktuelle Sprache der Adminsitration aktualisieren');
define('TEXT_UPDATE_SORT_LANGUAGE_ALL','für <b>alle</b> Sprachen aktualisieren');
define('TEXT_UPDATE_SORT_ORDERS_OPTIONS_PRODUCTS','<strong>Für einen Artikel:</strong>');
define('TEXT_UPDATE_SORT_ORDERS_OPTIONS_CATEGORIES','<strong>Für eine Kategorie:</strong>');

define('SUCCESS_PRODUCT_UPDATE_SORT_ALL','Attribut Sortierung aktualisiert für ALLE Artikel');
define('SUCCESS_OPTION_VALUES_SORT_ORDER','Sortierung für die Attributmerkmale wurde aktualisiert:');
define('SUCCESS_CATEGORIES_UPDATE_SORT','AttributeSortierung aktualisiert für Kategorie ID ');
define('SUCCESS_PRODUCT_UPDATE_SORT_ALL','Attribut Sortierung erfolgreich aktualisiert für ALLE Artikel');
define('SUCCESS_OPTION_VALUES_SORT_ORDER_NAME','Attributname "%1$s" (#%2$s): Attributmerkmal "%3$s" (#%4$s), Sortierung = %5$s ');
define('SUCCESS_CATEGORIES_UPDATE_SORT','Attribute Sortierung erfolgreich aktualisiert für Kategorie ID ');
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
<?php
/**
* Zen Cart German Specific (158 code in 157)
* @copyright Copyright 2003-2023 Zen Cart Development Team
* @copyright Copyright 2003-2024 Zen Cart Development Team
* Zen Cart German Version - www.zen-cart-pro.at
* @copyright Portions Copyright 2003 osCommerce
* @license https://www.zen-cart-pro.at/license/3_0.txt GNU General Public License V3.0
* @version $Id: orders_status.php 2023-10-28 18:49:16Z webchills $
* @version $Id: orders_status.php 2024-04-18 13:23:16Z webchills $
*/

define('HEADING_TITLE','Bestellstatus');
define('TABLE_HEADING_ORDERS_STATUS','Bestellstatus');

define('TABLE_HEADING_ORDERS_STATUS_ID', 'Bestellstatus ID');


define('TEXT_INFO_SORT_ORDER', 'Sortierungr: ');
define('TEXT_INFO_SORT_ORDER', 'Sortierreihenfolge:');

define('TEXT_INFO_ORDERS_STATUS_NAME','Bestellstatus:');
define('TEXT_INFO_INSERT_INTRO','Tragen Sie bitte den neuen Bestellstatus mit den dazu notwendigen Daten ein');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
<?php
/**
* Zen Cart German Specific (158 code in 157)
* @copyright Copyright 2003-2023 Zen Cart Development Team
* Zen Cart German Specific (158 code in 157 / zencartpro adaptations)
* @copyright Copyright 2003-2024 Zen Cart Development Team
* Zen Cart German Version - www.zen-cart-pro.at
* @copyright Portions Copyright 2003 osCommerce
* @license https://www.zen-cart-pro.at/license/3_0.txt GNU General Public License V3.0
* @version $Id: server_info.php 2023-10-28 21:14:16Z webchills $
* @version $Id: server_info.php 2024-02-08 18:14:16Z webchills $
*/

define('HEADING_TITLE','Serverinformationen');
define('TITLE_SERVER_HOST','Server Host:');
define('TITLE_SERVER_OS','Server Betriebssystem:');
define('TITLE_SERVER_DATE','Server Datum:');
define('TITLE_SERVER_HOME','Shopverzeichnis:');
define('TITLE_SERVER_UP_TIME','Server Up Time:');
define('TITLE_HTTP_SERVER','HTTP Server:');
define('TITLE_PHP_VERSION','PHP Version:');
Expand Down
12 changes: 12 additions & 0 deletions NEUE DATEIEN/DEINADMIN/includes/languages/spanish/uploads.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?php
define('HEADING_TITLE', 'von Kunden bei einer Bestellung hochgeladene Dateien');
define('TEXT_DISPLAY_NUMBER_OF_UPLOADS', 'Zeige <b>%d</b> von <b>%d</b> (of <b>%d</b> Dateien)' );
define('TABLE_HEADING_ID', ' ID# ' );
define('TABLE_HEADING_NAME', ' Kunde ');
define('TABLE_HEADING_ORDER_ID', ' Bestellnummer ');
define('TABLE_HEADING_FILE', ' Datei ');
define('TABLE_HEADING_DOWNLOAD', ' Aktion ');
define('TABLE_DOWNLOAD', 'download');
// This is the Product Option Type Name (POTN) for uploaded files.
// 'File' is the default Zen Cart POTN in English.
define( 'PRODUCTS_OPTIONS_TYPES_NAME', 'File');
2 changes: 2 additions & 0 deletions SQL/spanish.sql
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
##### add spanish definitions for multilanguage countries_names

DELETE FROM `countries_name` WHERE `language_id` = 34;

INSERT IGNORE INTO `countries_name` (`countries_id`, `language_id`, `countries_name`) VALUES
(1, 34, 'Afganistán'),
(2, 34, 'Albania'),
Expand Down

0 comments on commit ed474a4

Please sign in to comment.