From 7ada756fe35934cb1aee394b5274fc9203914f13 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Fri, 17 May 2013 23:19:29 +0200 Subject: [PATCH] Updated English translation --- wcfsetup/setup/lang/setup_de.xml | 3 +- wcfsetup/setup/lang/setup_en.xml | 74 ++++++++++++++++---------------- 2 files changed, 37 insertions(+), 40 deletions(-) diff --git a/wcfsetup/setup/lang/setup_de.xml b/wcfsetup/setup/lang/setup_de.xml index c96eb869d4..b4c81db838 100644 --- a/wcfsetup/setup/lang/setup_de.xml +++ b/wcfsetup/setup/lang/setup_de.xml @@ -47,7 +47,7 @@ WoltLab Community Framework im Verzeichnis „{$wcfDir}“.
Bitte definieren Sie ein anderes Installationsverzeichnis um die Installation fortzusetzen.]]> WoltLab Community Framework über diese Adresse (URL) erreichbar.]]> - + @@ -68,7 +68,6 @@ 1}n{/if} existier{if $conflictedTables|count > 1}en{else}t{/if} schon in der Datenbank „{$dbName}“:
{implode from=$conflictedTables item="table"}{$table}{/implode}.

Um dieses Problem zu beheben, können Sie:
1. diese Tabelle{if $conflictedTables|count > 1}n{/if} überschreiben, indem Sie die „Überschreiben“ Option aktivieren und die „Weiter“ Schaltfläche betätigen, oder
2. Sie geben die Daten einer anderen Datenbank ein und betätigen die „Weiter“ Schaltfläche, oder
3. Sie geben eine von „{$dbNumber}“ unterschiedliche Installationsnummer an und betätigen die „Weiter“ Schaltfläche.]]> 1}n{/if} überschreiben]]> - diff --git a/wcfsetup/setup/lang/setup_en.xml b/wcfsetup/setup/lang/setup_en.xml index e6cac48b27..ac99702ee8 100644 --- a/wcfsetup/setup/lang/setup_en.xml +++ b/wcfsetup/setup/lang/setup_en.xml @@ -3,34 +3,34 @@ - + - WoltLab Community Framework{if $setupPackageName != 'WoltLab Community Framework'} and {$setupPackageName}{/if}.]]> + WoltLab Community Framework{if $setupPackageName != 'WoltLab Community Framework'} and {$setupPackageName}{/if}.]]> - - - + + + - - + + - - + + - - + + @@ -39,54 +39,52 @@ WoltLab Community Framework will be extracted into the installation-folder.]]> - - - - WoltLab Community Framework in the “{$wcfDir}” folder.
Please enter an alternative installation folder to continue installation.]]> - - WoltLab Community Framework through this address (URL).]]> - + + + + WoltLab Community Framework in the “{$wcfDir}” directory.
Please enter an alternative installation directory to continue installation.]]> + + WoltLab Community Framework through this address (URL).]]> + - - - + + + - + - - 1.]]> + + 1.]]> {$exception->getMessage()}{if $exception|get_class == 'DatabaseException'}
{$exception->getErrorDesc()}{/if}]]> - 1}s{/if} already exist{if $conflictedTables|count == 1}s{/if} within your “{$dbName}” Database:
{implode from=$conflictedTables item="table"}{$table}{/implode}.

To solve this problem, please do one of the following:
1. Enable the “Overwrite” option below to overwrite {if $conflictedTables|count > 1}these tables{else}this table{/if} and continue the installation with the “Next” button or
2. You re-enter the database access information, but to a different database and continue the installation with the “Next” button or
3. Enter a new installation number, not forgetting to continue the installation with the “Next” Button.]]> - 1}s{/if}?]]> - - + 1}s{/if} already exist{if $conflictedTables|count == 1}s{/if} within your “{$dbName}” Database:
{implode from=$conflictedTables item="table"}{$table}{/implode}.

To solve this problem, please do one of the following:
1. Remove the table{if $conflictedTables|count > 1}s{/if} manually and continue the installation with the “Next” button or
2. You re-enter the database access information, but to a different database and continue the installation with the “Next” button or
3. Enter a new installation number, not forgetting to continue the installation with the “Next” Button.]]> + - - + + - - + + - - + + - - + + {$exception->getMessage()}
Please make sure that the destination folder exists and can be written to.]]> - - + + -- 2.20.1