diff options
| author | Jenkins for ownCloud <thomas.mueller@tmit.eu> | 2013-09-20 10:50:14 -0400 |
|---|---|---|
| committer | Jenkins for ownCloud <thomas.mueller@tmit.eu> | 2013-09-20 10:50:14 -0400 |
| commit | 5b95e7aa0f0487d7ddb07588c71d25cd973c2bb6 (patch) | |
| tree | 690208feef82d3a258f9f8f2c5140bf14374449c /core/l10n/en_GB.php | |
| parent | 8e26f291a7912ccc3520ac53af0ddf1da714fdbc (diff) | |
| download | nextcloud-server-5b95e7aa0f0487d7ddb07588c71d25cd973c2bb6.tar.gz nextcloud-server-5b95e7aa0f0487d7ddb07588c71d25cd973c2bb6.zip | |
[tx-robot] updated from transifex
Diffstat (limited to 'core/l10n/en_GB.php')
| -rw-r--r-- | core/l10n/en_GB.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php index 2d588ab2431..05d945be6db 100644 --- a/core/l10n/en_GB.php +++ b/core/l10n/en_GB.php @@ -58,6 +58,7 @@ $TRANSLATIONS = array( "No" => "No", "Ok" => "OK", "Error loading message template: {error}" => "Error loading message template: {error}", +"_{count} file conflict_::_{count} file conflicts_" => array("",""), "The object type is not specified." => "The object type is not specified.", "Error" => "Error", "The app name is not specified." => "The app name is not specified.", @@ -100,7 +101,7 @@ $TRANSLATIONS = array( "Use the following link to reset your password: {link}" => "Use the following link to reset your password: {link}", "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator .", "Request failed!<br>Did you make sure your email/username was right?" => "Request failed!<br>Did you make sure your email/username was correct?", -"You will receive a link to reset your password via Email." => "You will receive a link to reset your password via Email.", +"You will receive a link to reset your password via Email." => "You will receive a link to reset your password via email.", "Username" => "Username", "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?", "Yes, I really want to reset my password now" => "Yes, I really want to reset my password now", |