diff options
Diffstat (limited to 'core/l10n/en_GB.php')
| -rw-r--r-- | core/l10n/en_GB.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php index feeacd481a8..bb26f1469dd 100644 --- a/core/l10n/en_GB.php +++ b/core/l10n/en_GB.php @@ -58,8 +58,15 @@ $TRANSLATIONS = array( "No" => "No", "Ok" => "OK", "Error loading message template: {error}" => "Error loading message template: {error}", -"_{count} file conflict_::_{count} file conflicts_" => array("",""), +"_{count} file conflict_::_{count} file conflicts_" => array("{count} file conflict","{count} file conflicts"), +"One file conflict" => "One file conflict", +"Which files do you want to keep?" => "Which files do you wish to keep?", +"If you select both versions, the copied file will have a number added to its name." => "If you select both versions, the copied file will have a number added to its name.", "Cancel" => "Cancel", +"Continue" => "Continue", +"(all selected)" => "(all selected)", +"({count} selected)" => "({count} selected)", +"Error loading file exists template" => "Error loading file exists template", "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.", |