Skip to content

Commit

Permalink
optimize translation
Browse files Browse the repository at this point in the history
  • Loading branch information
mariolorenz committed Dec 13, 2024
1 parent d0bee2c commit 6b823a5
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- [0007744](https://bugs.oxid-esales.com/view.php?id=7744): When using vouchers shop jumps back to payment selection
- [0007745](https://bugs.oxid-esales.com/view.php?id=7745): Paypal checkout jumps back to step 2 with an error when an discount in relation to item value is used
- [0007742](https://bugs.oxid-esales.com/view.php?id=7742): You get stuck in the checkout if the "Save payment method" option is activated for credit card payment
- [0007695](https://bugs.oxid-esales.com/view.php?id=7695): Explain better Pseudo delivery costs

### NEW

Expand Down
4 changes: 2 additions & 2 deletions views/admin/de/admin_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,8 @@
eine höhere Checkout-Conversion bedeuten.',
'OSC_PAYPAL_GOOGLEPAY_TITLE' => 'Google Pay Adresse',
'OSC_PAYPAL_EXPRESS_SHIPPING_TITLE' => 'Pseudoversandkosten für PayPal Express',
'OSC_PAYPAL_EXPRESS_SHIPPING_DESC' => 'Die hier eingegebenen Pseudeversandkosten werden verwendet, wenn die Shopoption “Versandkosten auch dann berechnen, wenn der Kunde noch nicht eingeloggt istnicht aktiviert ist.',
'OSC_PAYPAL_EXPRESS_SHIPPING_DESC_EXTENDED' => 'Wenn Sie anstelle der Pseudo-Versandkosten für noch nicht angemeldete Benutzer mit PayPal Express die standardmäßige Versandkostenberechnung verwenden möchten, aktivieren Sie die Option `Standardversandkosten berechnen, wenn Benutzer noch nicht angemeldet sind` in den Mastereinstellungen | Einstellungen-Tab | Abschnitt Sonstige Einstellungen.',
'OSC_PAYPAL_EXPRESS_SHIPPING_DESC' => 'PayPal Express benötigt für die Autorisierung des Warenkorbbetrages Versandkosten. Wenn ein Kunde sich im Shop weder eingeloggt noch seine Versandadresse angegeben hat, kann der Shop standardmäßig noch keine Versandkosten berechen. In den Shopeinstellungen (Stammdaten > Grundeinstellungen > Reiter Einstellungen > Abschnitt weitere Einstellungen) gibt es eine Option "Versandkosten auch dann berechnen, wenn der Kunde noch nicht eingeloggt ist". Damit kann OXID versuchen die Versandkosten für die Standardfälle zu ermitteln. Wenn man diese Option nicht nutzen möchte, besteht hier als letzte Möglichkeit Pseudoversandkosten zu hinterlegen. Die sollten Ihren meißt genutzten Versandkosten am nächsten kommen. Sobald sich der Kunde im Checkout befindet und seine Lieferadresse sowie seine gewünschte Versandart dem Shop bekannt sind, werden die tatsächlichen Versandkosten berechnet. Diese überschreiben alle vorher genutzten "Hilfs-"Versandkosten.',

'OSC_PAYPAL_GOOGLEPAY_ADDRESS_ACTIVATE' => 'Speicherung der Adresse aktivieren',
'HELP_OSC_OSC_PAYPAL_GOOGLEPAY_ADRESS_ACTIVATE' => 'Übernahme der Lieferadresse von GooglePay',

Expand Down
3 changes: 1 addition & 2 deletions views/admin/en/admin_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,7 @@
Enable purchase processing. With their saved payment details, customers can make repeat purchases with just a few clicks. This can be for you
mean higher checkout conversion.',
'OSC_PAYPAL_EXPRESS_SHIPPING_TITLE' => 'Pseudo shipping costs for PayPal Express',
'OSC_PAYPAL_EXPRESS_SHIPPING_DESC' => 'The shipping costs entered here are used if the store option "Calculate default Shipping costs when User is not logged in yet” in not activated.',
'OSC_PAYPAL_EXPRESS_SHIPPING_DESC_EXTENDED' => 'If You want to use standard shipping cost calculation instead of pseudo shipping cost for not yet logged in users with PayPal Express please check `Calculate default Shipping costs when User is not logged in yet` option in Master settings | Settings tab | Other settings section.',
'OSC_PAYPAL_EXPRESS_SHIPPING_DESC' => 'PayPal Express requires shipping costs to authorize the shopping cart amount. If a customer has neither logged in to the shop nor provided their shipping address, the shop cannot calculate shipping costs by default. In the shop settings (Master Settings > Core Settings > Tab Settings > Section Other Settings ) there is an option "Calculate default Shipping costs when User is not logged in yet". This allows OXID to try to calculate the shipping costs for standard cases. If you do not want to use this option, the last option is to enter pseudo shipping costs. These should be as close to the shipping costs you use most often. As soon as the customer is in the checkout and their delivery address and desired shipping method are known to the shop, the actual shipping costs are calculated. These overwrite all previously used "auxiliary" shipping costs.',
'OSC_PAYPAL_GOOGLEPAY_TITLE' => 'Google Pay address',
'OSC_PAYPAL_GOOGLEPAY_ADDRESS_ACTIVATE' => 'Google Pay address active',
'HELP_OSC_OSC_PAYPAL_GOOGLEPAY_ADRESS_ACTIVATE' => 'Takeover delivery address from googlepay',
Expand Down
3 changes: 0 additions & 3 deletions views/admin/tpl/oscpaypalconfig.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -539,9 +539,6 @@
<div class="controls">
<input type="text" id="shippingExpress" class="form-control" name="conf[oscPayPalDefaultShippingPriceExpress]" value="[{$config->getDefaultShippingPriceForExpress()|string_format:"%.2f"}]" />
<span class="help-block">[{oxmultilang ident="OSC_PAYPAL_EXPRESS_SHIPPING_DESC"}]</span>
<br>
<br>
<span class="help-block">[{oxmultilang ident="OSC_PAYPAL_EXPRESS_SHIPPING_DESC_EXTENDED"}]</span>
</div>
</div>
</div>
Expand Down

0 comments on commit 6b823a5

Please sign in to comment.