Fixes rebase issue in #557

This commit is contained in:
Sam Georges 2014-08-19 12:40:18 +10:00
parent d7f22dc797
commit 3f8d3d8eea
2 changed files with 9 additions and 4 deletions

View File

@ -32,11 +32,12 @@ class BackendPreferences extends Model
'ru' => [Lang::get('system::lang.locale.ru'), 'flag-ru'],
'nl' => [Lang::get('system::lang.locale.nl'), 'flag-nl'],
'ja' => [Lang::get('system::lang.locale.ja'), 'flag-jp'],
'sv' => [Lang::get('system::lang.locale.sv'), 'flag-sv'],
'se' => [Lang::get('system::lang.locale.se'), 'flag-se'],
'tr' => [Lang::get('system::lang.locale.tr'), 'flag-tr'],
'br' => [Lang::get('system::lang.locale.br'), 'flag-br'],
'de' => [Lang::get('system::lang.locale.de'), 'flag-de'],
'fr' => [Lang::get('system::lang.locale.fr'), 'flag-fr'],
'it' => [Lang::get('system::lang.locale.it'), 'flag-it'],
'ro' => [Lang::get('system::lang.locale.ro'), 'flag-ro'],
];
@ -49,4 +50,4 @@ class BackendPreferences extends Model
{
Session::put('locale', $this->locale);
}
}
}

View File

@ -9,13 +9,14 @@ return [
'en' => 'English',
'nl' => 'Dutch',
'ja' => 'Japanese',
'sv' => 'Swedish',
'se' => 'Swedish',
'tr' => 'Turkish',
'br' => 'Brazilian Portuguese',
'de' => 'German',
'ru' => 'Russian',
'fr' => 'French',
'ro' => 'Romana'
'it' => 'Italian',
'ro' => 'Romana',
],
'directory' => [
'create_fail' => "Cannot create directory: :name",
@ -57,8 +58,11 @@ return [
'disabled_label' => 'Disabled',
'disabled_help' => 'Plugins that are disabled are ignored by the application.',
'selected_amount' => 'Plugins selected: :amount',
'remove_confirm' => 'Are you sure?',
'remove_success' => "Successfully removed those plugins from the system.",
'refresh_confirm' => 'Are you sure?',
'refresh_success' => "Successfully refreshed those plugins in the system.",
'disable_confirm' => 'Are you sure?',
'disable_success' => "Successfully disabled those plugins.",
'enable_success' => "Successfully enabled those plugins.",
'unknown_plugin' => "Plugin has been removed from the file system.",