diff --git a/app/Console/Commands/FixPermissionsCommand.php b/app/Console/Commands/FixPermissionsCommand.php index 1d4987d3..ae97ab02 100644 --- a/app/Console/Commands/FixPermissionsCommand.php +++ b/app/Console/Commands/FixPermissionsCommand.php @@ -65,8 +65,6 @@ class FixPermissionsCommand extends Command * @param string $databaseDirectory * @param string $databasePath * @param string $databaseDefault - * - * @return void */ public function __construct($storageDirectory, $databaseDirectory, $databasePath, $databaseDefault) { diff --git a/app/Events/CustomerHasSubscribedEvent.php b/app/Events/CustomerHasSubscribedEvent.php index 69cd8c71..d527ba97 100644 --- a/app/Events/CustomerHasSubscribedEvent.php +++ b/app/Events/CustomerHasSubscribedEvent.php @@ -24,8 +24,6 @@ class CustomerHasSubscribedEvent /** * Create a new customer has subscribed event instance. - * - * @return void */ public function __construct(Subscriber $subscriber) { diff --git a/app/Events/IncidentHasReportedEvent.php b/app/Events/IncidentHasReportedEvent.php index 01756a6c..9824493b 100644 --- a/app/Events/IncidentHasReportedEvent.php +++ b/app/Events/IncidentHasReportedEvent.php @@ -24,8 +24,6 @@ class IncidentHasReportedEvent /** * Create a new incident has reported event instance. - * - * @return void */ public function __construct(Incident $incident) { diff --git a/app/Events/MaintenanceHasScheduledEvent.php b/app/Events/MaintenanceHasScheduledEvent.php index a40fc247..55a98890 100644 --- a/app/Events/MaintenanceHasScheduledEvent.php +++ b/app/Events/MaintenanceHasScheduledEvent.php @@ -24,8 +24,6 @@ class MaintenanceHasScheduledEvent /** * Create a new maintenance has scheduled event instance. - * - * @return void */ public function __construct(Incident $incident) { diff --git a/app/Handlers/Events/SendIncidentEmailNotificationHandler.php b/app/Handlers/Events/SendIncidentEmailNotificationHandler.php index 8c23de4e..c2b821ec 100644 --- a/app/Handlers/Events/SendIncidentEmailNotificationHandler.php +++ b/app/Handlers/Events/SendIncidentEmailNotificationHandler.php @@ -46,8 +46,6 @@ class SendIncidentEmailNotificationHandler * @param \Illuminate\Contracts\Mail\Mailer $mailer * @param \CachetHQ\Cachet\Models\Subscriber $subscriber * @param \McCool\LaravelAutoPresenter\PresenterDecorator $presenter - * - * @return void */ public function __construct(MailQueue $mailer, Subscriber $subscriber, PresenterDecorator $presenter) { @@ -60,8 +58,6 @@ class SendIncidentEmailNotificationHandler * Handle the event. * * @param \CachetHQ\Cachet\Events\IncidentHasReportedEvent $event - * - * @return void */ public function handle(IncidentHasReportedEvent $event) { diff --git a/app/Handlers/Events/SendMaintenanceEmailNotificationHandler.php b/app/Handlers/Events/SendMaintenanceEmailNotificationHandler.php index 9222e850..bbc8503f 100644 --- a/app/Handlers/Events/SendMaintenanceEmailNotificationHandler.php +++ b/app/Handlers/Events/SendMaintenanceEmailNotificationHandler.php @@ -46,8 +46,6 @@ class SendMaintenanceEmailNotificationHandler * @param \Illuminate\Contracts\Mail\Mailer $mailer * @param \CachetHQ\Cachet\Models\Subscriber $subscriber * @param \McCool\LaravelAutoPresenter\PresenterDecorator $presenter - * - * @return void */ public function __construct(MailQueue $mailer, Subscriber $subscriber, PresenterDecorator $presenter) { @@ -60,8 +58,6 @@ class SendMaintenanceEmailNotificationHandler * Handle the event. * * @param \CachetHQ\Cachet\Events\MaintenanceHasScheduledEvent $event - * - * @return void */ public function handle(MaintenanceHasScheduledEvent $event) { diff --git a/app/Handlers/Events/SendSubscriberVerificationEmailHandler.php b/app/Handlers/Events/SendSubscriberVerificationEmailHandler.php index 1cc006c3..39ffab20 100644 --- a/app/Handlers/Events/SendSubscriberVerificationEmailHandler.php +++ b/app/Handlers/Events/SendSubscriberVerificationEmailHandler.php @@ -28,8 +28,6 @@ class SendSubscriberVerificationEmailHandler * Create a new send subscriber verification email handler. * * @param \Illuminate\Contracts\Mail\Mailer $mailer - * - * @return void */ public function __construct(MailQueue $mailer) { @@ -40,8 +38,6 @@ class SendSubscriberVerificationEmailHandler * Handle the event. * * @param \CachetHQ\Cachet\Events\CustomerHasSubscribedEvent $event - * - * @return void */ public function handle(CustomerHasSubscribedEvent $event) { diff --git a/app/Http/Controllers/Admin/IncidentController.php b/app/Http/Controllers/Admin/IncidentController.php index 0442235c..29eb40cb 100644 --- a/app/Http/Controllers/Admin/IncidentController.php +++ b/app/Http/Controllers/Admin/IncidentController.php @@ -47,7 +47,7 @@ class IncidentController extends AbstractController 'icon' => 'ion-android-checkmark-circle', 'active' => true, ], - 'schedule' => [ + 'schedule' => [ 'title' => trans('dashboard.schedule.schedule'), 'url' => route('dashboard.schedule'), 'icon' => 'ion-android-calendar', diff --git a/app/Http/Controllers/Admin/MetricController.php b/app/Http/Controllers/Admin/MetricController.php index ee25fd3d..316d8416 100644 --- a/app/Http/Controllers/Admin/MetricController.php +++ b/app/Http/Controllers/Admin/MetricController.php @@ -43,8 +43,8 @@ class MetricController extends AbstractController public function showAddMetric() { return View::make('dashboard.metrics.add')->with([ - 'pageTitle' => trans('dashboard.metrics.add.title').' - '.trans('dashboard.dashboard'), - 'metricMetricPoints' => MetricPoint::all(), + 'pageTitle' => trans('dashboard.metrics.add.title').' - '.trans('dashboard.dashboard'), + 'metricMetricPoints' => MetricPoint::all(), ]); } @@ -165,8 +165,8 @@ class MetricController extends AbstractController public function showEditMetricAction(Metric $metric) { return View::make('dashboard.metrics.edit')->with([ - 'pageTitle' => trans('dashboard.metrics.edit.title').' - '.trans('dashboard.dashboard'), - 'metric' => $metric, + 'pageTitle' => trans('dashboard.metrics.edit.title').' - '.trans('dashboard.dashboard'), + 'metric' => $metric, ]); } diff --git a/app/Http/Controllers/Admin/ScheduleController.php b/app/Http/Controllers/Admin/ScheduleController.php index 746c283e..b10e2553 100644 --- a/app/Http/Controllers/Admin/ScheduleController.php +++ b/app/Http/Controllers/Admin/ScheduleController.php @@ -47,7 +47,7 @@ class ScheduleController extends AbstractController 'icon' => 'ion-android-checkmark-circle', 'active' => false, ], - 'schedule' => [ + 'schedule' => [ 'title' => trans('dashboard.schedule.schedule'), 'url' => route('dashboard.schedule'), 'icon' => 'ion-android-calendar', diff --git a/app/Http/Controllers/Api/AbstractApiController.php b/app/Http/Controllers/Api/AbstractApiController.php index e30d0c9a..29db8c1c 100644 --- a/app/Http/Controllers/Api/AbstractApiController.php +++ b/app/Http/Controllers/Api/AbstractApiController.php @@ -147,12 +147,12 @@ abstract class AbstractApiController extends BaseController $pagination = [ 'pagination' => [ - 'total' => $paginator->total(), - 'count' => count($paginator->items()), - 'per_page' => $paginator->perPage(), - 'current_page' => $paginator->currentPage(), - 'total_pages' => $paginator->lastPage(), - 'links' => [ + 'total' => $paginator->total(), + 'count' => count($paginator->items()), + 'per_page' => $paginator->perPage(), + 'current_page' => $paginator->currentPage(), + 'total_pages' => $paginator->lastPage(), + 'links' => [ 'next_page' => $paginator->nextPageUrl(), 'previous_page' => $paginator->previousPageUrl(), ], diff --git a/app/Http/Controllers/AtomController.php b/app/Http/Controllers/AtomController.php index fff6d530..33e63669 100644 --- a/app/Http/Controllers/AtomController.php +++ b/app/Http/Controllers/AtomController.php @@ -56,8 +56,6 @@ class AtomController extends AbstractController * * @param \Roumen\Feed\Facades\Feed $feed * @param \CachetHQ\Cachet\Models\Incident $incident - * - * @return void */ private function feedAddItem(&$feed, $incident) { diff --git a/app/Http/Controllers/RssController.php b/app/Http/Controllers/RssController.php index 1c9ec683..1911961f 100644 --- a/app/Http/Controllers/RssController.php +++ b/app/Http/Controllers/RssController.php @@ -56,8 +56,6 @@ class RssController extends AbstractController * * @param \Roumen\Feed\Facades\Feed $feed * @param \CachetHQ\Cachet\Models\Incident $incident - * - * @return void */ private function feedAddItem(&$feed, $incident) { diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php index 4dcc28d1..58a27e66 100644 --- a/app/Http/Controllers/SetupController.php +++ b/app/Http/Controllers/SetupController.php @@ -219,8 +219,6 @@ class SetupController extends AbstractController * * @param string $key * @param mixed $value - * - * @return void */ protected function writeEnv($key, $value) { @@ -236,8 +234,6 @@ class SetupController extends AbstractController /** * Generate the app.key value. - * - * @return void */ protected function keyGenerate() { diff --git a/app/Http/Middleware/Admin.php b/app/Http/Middleware/Admin.php index 801d15ce..0f664aaa 100644 --- a/app/Http/Middleware/Admin.php +++ b/app/Http/Middleware/Admin.php @@ -28,8 +28,6 @@ class Admin * Create a new admin middleware instance. * * @param \Illuminate\Contracts\Auth\Guard $auth - * - * @return void */ public function __construct(Guard $auth) { diff --git a/app/Http/Middleware/ApiAuthenticate.php b/app/Http/Middleware/ApiAuthenticate.php index 456398d0..bb1eb95e 100644 --- a/app/Http/Middleware/ApiAuthenticate.php +++ b/app/Http/Middleware/ApiAuthenticate.php @@ -29,8 +29,6 @@ class ApiAuthenticate * Create a new api authenticate middleware instance. * * @param \Illuminate\Contracts\Auth\Guard $auth - * - * @return void */ public function __construct(Guard $auth) { diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index 7adbc125..2bfc642f 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -27,8 +27,6 @@ class Authenticate * Create a new authenticate middleware instance. * * @param \Illuminate\Contracts\Auth\Guard $auth - * - * @return void */ public function __construct(Guard $auth) { diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index e6a19744..9e887c39 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -28,8 +28,6 @@ class RedirectIfAuthenticated * Create a new redirect if authenticated middleware instance. * * @param \Illuminate\Contracts\Auth\Guard $auth - * - * @return void */ public function __construct(Guard $auth) { diff --git a/app/Http/Routes/ApiRoutes.php b/app/Http/Routes/ApiRoutes.php index 7fd6bcb2..a374755a 100644 --- a/app/Http/Routes/ApiRoutes.php +++ b/app/Http/Routes/ApiRoutes.php @@ -23,8 +23,8 @@ class ApiRoutes public function map(Registrar $router) { $router->group([ - 'namespace' => 'Api', - 'prefix' => 'api/v1', + 'namespace' => 'Api', + 'prefix' => 'api/v1', ], function ($router) { // General $router->get('ping', 'GeneralController@ping'); diff --git a/app/Models/Component.php b/app/Models/Component.php index 7d41391b..60ff1efb 100644 --- a/app/Models/Component.php +++ b/app/Models/Component.php @@ -27,9 +27,9 @@ class Component extends Model implements HasPresenter * @var string[] */ protected $rules = [ - 'name' => 'required|string', - 'status' => 'integer|required', - 'link' => 'url', + 'name' => 'required|string', + 'status' => 'integer|required', + 'link' => 'url', ]; /** diff --git a/app/Models/Subscriber.php b/app/Models/Subscriber.php index 4230a36a..9b92b3fc 100644 --- a/app/Models/Subscriber.php +++ b/app/Models/Subscriber.php @@ -44,8 +44,6 @@ class Subscriber extends Model /** * Overrides the models boot method. - * - * @return void */ public static function boot() { diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 9fd4fb59..8269bcbe 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -21,8 +21,6 @@ class AppServiceProvider extends ServiceProvider * Boot the service provider. * * @param \Illuminate\Bus\Dispatcher $dispatcher - * - * @return void */ public function boot(Dispatcher $dispatcher) { @@ -37,8 +35,6 @@ class AppServiceProvider extends ServiceProvider /** * Register the service provider. - * - * @return void */ public function register() { diff --git a/app/Providers/ComposerServiceProvider.php b/app/Providers/ComposerServiceProvider.php index c2390d70..55d3a4b9 100644 --- a/app/Providers/ComposerServiceProvider.php +++ b/app/Providers/ComposerServiceProvider.php @@ -26,8 +26,6 @@ class ComposerServiceProvider extends ServiceProvider * Boot the service provider. * * @param \Illuminate\Contracts\View\Factory $factory - * - * @return void */ public function boot(Factory $factory) { @@ -41,8 +39,6 @@ class ComposerServiceProvider extends ServiceProvider /** * Register the service provider. - * - * @return void */ public function register() { diff --git a/app/Providers/ConfigServiceProvider.php b/app/Providers/ConfigServiceProvider.php index adc7f467..345f4fca 100644 --- a/app/Providers/ConfigServiceProvider.php +++ b/app/Providers/ConfigServiceProvider.php @@ -21,8 +21,6 @@ class ConfigServiceProvider extends ServiceProvider { /** * Boot the service provider. - * - * @return void */ public function boot() { @@ -68,8 +66,6 @@ class ConfigServiceProvider extends ServiceProvider /** * Register the service provider. - * - * @return void */ public function register() { diff --git a/app/Providers/ConsoleServiceProvider.php b/app/Providers/ConsoleServiceProvider.php index 56a48214..bfefd978 100644 --- a/app/Providers/ConsoleServiceProvider.php +++ b/app/Providers/ConsoleServiceProvider.php @@ -18,8 +18,6 @@ class ConsoleServiceProvider extends ServiceProvider { /** * Register the service provider. - * - * @return void */ public function register() { diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 4c161470..7ac073b9 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -29,8 +29,6 @@ class RouteServiceProvider extends ServiceProvider * Define the route model bindings, pattern filters, etc. * * @param \Illuminate\Routing\Router $router - * - * @return void */ public function boot(Router $router) { @@ -41,8 +39,6 @@ class RouteServiceProvider extends ServiceProvider /** * Register model bindings. - * - * @return void */ protected function registerBindings() { @@ -60,8 +56,6 @@ class RouteServiceProvider extends ServiceProvider * Define the routes for the application. * * @param \Illuminate\Routing\Router $router - * - * @return void */ public function map(Router $router) { diff --git a/app/Providers/SegmentServiceProvider.php b/app/Providers/SegmentServiceProvider.php index 40280b28..ee105275 100644 --- a/app/Providers/SegmentServiceProvider.php +++ b/app/Providers/SegmentServiceProvider.php @@ -20,8 +20,6 @@ class SegmentServiceProvider extends ServiceProvider { /** * Register the service provider. - * - * @return void */ public function register() { diff --git a/app/Segment/CacheRepository.php b/app/Segment/CacheRepository.php index a59f5525..ce7f914a 100644 --- a/app/Segment/CacheRepository.php +++ b/app/Segment/CacheRepository.php @@ -29,8 +29,6 @@ class CacheRepository implements RepositoryInterface * Create a new segment cache repository instance. * * @param \CachetHQ\Cachet\Segment\RepositoryInterface $repository - * - * @return void */ public function __construct(RepositoryInterface $repository) { diff --git a/config/app.php b/config/app.php index 1600d14f..8d093336 100644 --- a/config/app.php +++ b/config/app.php @@ -221,8 +221,8 @@ return [ 'Validator' => 'Illuminate\Support\Facades\Validator', 'View' => 'Illuminate\Support\Facades\View', - 'Setting' => 'CachetHQ\Cachet\Facades\Setting', - 'Str' => 'Illuminate\Support\Str', + 'Setting' => 'CachetHQ\Cachet\Facades\Setting', + 'Str' => 'Illuminate\Support\Str', ], diff --git a/config/langs.php b/config/langs.php index 230c2335..e10792bf 100755 --- a/config/langs.php +++ b/config/langs.php @@ -11,15 +11,15 @@ return [ // Enabled langs - 'en-UD' => 'CrowdIn - InContext Localization', - 'de' => 'Deutsch', - 'en' => 'English', - 'pl' => 'Polski', - 'es' => 'Español', - 'fr' => 'Français', - 'id' => 'Indonesian', - 'nl' => 'Nederlands', - 'pt-BR' => 'Portuguese, Brazilian', - 'zh-CN' => '简体中文', - 'zh-TW' => '繁體中文', + 'en-UD' => 'CrowdIn - InContext Localization', + 'de' => 'Deutsch', + 'en' => 'English', + 'pl' => 'Polski', + 'es' => 'Español', + 'fr' => 'Français', + 'id' => 'Indonesian', + 'nl' => 'Nederlands', + 'pt-BR' => 'Portuguese, Brazilian', + 'zh-CN' => '简体中文', + 'zh-TW' => '繁體中文', ]; diff --git a/database/migrations/2015_05_19_214534_AlterTableComponentGroupsAddOrder.php b/database/migrations/2015_05_19_214534_AlterTableComponentGroupsAddOrder.php index 862c4b8f..4e9ab7e4 100644 --- a/database/migrations/2015_05_19_214534_AlterTableComponentGroupsAddOrder.php +++ b/database/migrations/2015_05_19_214534_AlterTableComponentGroupsAddOrder.php @@ -17,8 +17,6 @@ class AlterTableComponentGroupsAddOrder extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -30,8 +28,6 @@ class AlterTableComponentGroupsAddOrder extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2015_05_20_073041_AlterTableIncidentsAddVisibileColumn.php b/database/migrations/2015_05_20_073041_AlterTableIncidentsAddVisibileColumn.php index eed70699..43f7fe52 100644 --- a/database/migrations/2015_05_20_073041_AlterTableIncidentsAddVisibileColumn.php +++ b/database/migrations/2015_05_20_073041_AlterTableIncidentsAddVisibileColumn.php @@ -3,9 +3,7 @@ /* * This file is part of Cachet. * - * (c) James Brooks - * (c) Joseph Cohen - * (c) Graham Campbell + * (c) Cachet HQ * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. @@ -19,8 +17,6 @@ class AlterTableIncidentsAddVisibileColumn extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -33,8 +29,6 @@ class AlterTableIncidentsAddVisibileColumn extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2015_05_24_210939_create_jobs_table.php b/database/migrations/2015_05_24_210939_create_jobs_table.php index 4fac3dee..1efeeb5d 100644 --- a/database/migrations/2015_05_24_210939_create_jobs_table.php +++ b/database/migrations/2015_05_24_210939_create_jobs_table.php @@ -16,8 +16,6 @@ class CreateJobsTable extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -35,8 +33,6 @@ class CreateJobsTable extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2015_05_24_210948_create_failed_jobs_table.php b/database/migrations/2015_05_24_210948_create_failed_jobs_table.php index 950c88e2..15447f83 100644 --- a/database/migrations/2015_05_24_210948_create_failed_jobs_table.php +++ b/database/migrations/2015_05_24_210948_create_failed_jobs_table.php @@ -16,8 +16,6 @@ class CreateFailedJobsTable extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -32,8 +30,6 @@ class CreateFailedJobsTable extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2015_06_10_122216_AlterTableComponentsDropUserIdColumn.php b/database/migrations/2015_06_10_122216_AlterTableComponentsDropUserIdColumn.php index 3f6a72c9..06dab264 100644 --- a/database/migrations/2015_06_10_122216_AlterTableComponentsDropUserIdColumn.php +++ b/database/migrations/2015_06_10_122216_AlterTableComponentsDropUserIdColumn.php @@ -17,8 +17,6 @@ class AlterTableComponentsDropUserIdColumn extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -29,8 +27,6 @@ class AlterTableComponentsDropUserIdColumn extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2015_06_10_122229_AlterTableIncidentsDropUserIdColumn.php b/database/migrations/2015_06_10_122229_AlterTableIncidentsDropUserIdColumn.php index e2255221..31d2312a 100644 --- a/database/migrations/2015_06_10_122229_AlterTableIncidentsDropUserIdColumn.php +++ b/database/migrations/2015_06_10_122229_AlterTableIncidentsDropUserIdColumn.php @@ -17,8 +17,6 @@ class AlterTableIncidentsDropUserIdColumn extends Migration { /** * Run the migrations. - * - * @return void */ public function up() { @@ -29,8 +27,6 @@ class AlterTableIncidentsDropUserIdColumn extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/resources/lang/de/cachet.php b/resources/lang/de/cachet.php index cd7ba16b..18153dda 100755 --- a/resources/lang/de/cachet.php +++ b/resources/lang/de/cachet.php @@ -72,12 +72,12 @@ return [ 'html-preheader' => 'Please confirm your email subscription to :app_name status updates.', 'html' => '

Please confirm your email subscription to :app_name status updates.

:link

Thank you, :app_name

', ], - 'maintenance' => [ + 'maintenance' => [ 'text' => "New maintenance has been scheduled on :app_name.\nThank you, :app_name", 'html-preheader' => 'New maintenance has been scheduled on :app_name.', 'html' => '

New maintenance has been scheduled on :app_name.

Thank you, :app_name

', ], - 'incident' => [ + 'incident' => [ 'text' => "New incident has been reported on :app_name.\nThank you, :app_name", 'html-preheader' => 'New incident has been reported on :app_name.', 'html' => '

New incident has been reported on :app_name.

Thank you, :app_name

', diff --git a/resources/lang/de/dashboard.php b/resources/lang/de/dashboard.php index 37e7b7c4..550f48f1 100755 --- a/resources/lang/de/dashboard.php +++ b/resources/lang/de/dashboard.php @@ -98,7 +98,7 @@ return [ 'success' => 'Team-Mitglied hinzugefügt.', 'failure' => 'Es ist ein Fehler bei der Erstellung eines neuen Team-Mitglieds aufgetreten.', ], - 'edit' => [ + 'edit' => [ 'title' => 'Profil aktualisieren', 'success' => 'Profile aktualisiert.', 'failure' => 'Es ist ein Fehler bei der Aktualisierung des Profils aufgetreten.', @@ -142,7 +142,7 @@ return [ 'logout' => 'Logout', // Notifications - 'notifications' => [ + 'notifications' => [ 'notifications' => 'Benachrichtigungen', 'awesome' => 'Großartig.', 'whoops' => 'Oops.', diff --git a/resources/lang/de/validation.php b/resources/lang/de/validation.php index 04b9fff8..d17f5c2b 100755 --- a/resources/lang/de/validation.php +++ b/resources/lang/de/validation.php @@ -22,41 +22,41 @@ return [ | */ - 'accepted' => ':attribute muss akzeptiert werden.', - 'active_url' => ':attribute ist keine valide URL.', - 'after' => ':attribute muss nach :date liegen.', - 'alpha' => ':attribute darf nur Buchstaben enthalten.', - 'alpha_dash' => ':attribute darf nur Nummern, Buchstaben und Slashes enthalten.', - 'alpha_num' => ':attribute darf nur Nummern und Buchstaben enthalten.', - 'array' => ':attribute muss ein Array sein.', - 'before' => ':attribute muss vor :date liegen.', - 'between' => [ + 'accepted' => ':attribute muss akzeptiert werden.', + 'active_url' => ':attribute ist keine valide URL.', + 'after' => ':attribute muss nach :date liegen.', + 'alpha' => ':attribute darf nur Buchstaben enthalten.', + 'alpha_dash' => ':attribute darf nur Nummern, Buchstaben und Slashes enthalten.', + 'alpha_num' => ':attribute darf nur Nummern und Buchstaben enthalten.', + 'array' => ':attribute muss ein Array sein.', + 'before' => ':attribute muss vor :date liegen.', + 'between' => [ 'numeric' => ':attribute muss zwichen :min und :max liegen.', 'file' => ':attribute muss zwischen :min und :max kilobyte liegen.', 'string' => ':attribute muss zwischen :min und :max Zeichen lang sein.', 'array' => ':attribute muss zwischen :min und :max Werte enthalten.', ], - 'boolean' => ":attribute Feld muss 'true' oder 'false' sein.", - 'confirmed' => 'Die Bestätigung/Wiederholung von :attribute stimmt nicht überein.', - 'date' => ':attribute ist kein valides Datum.', - 'date_format' => ':attribute passt nicht zu folgendem Format :format.', - 'different' => ':attribute und :other müssen sich unterscheiden.', - 'digits' => ':attribute muss :digits Zeichen lang sein.', - 'digits_between' => ':attribute muss zwischen :min und :max Zeichen lang sein.', - 'email' => ':attribute muss eine valide E-Mail-Adresse sein.', - 'exists' => 'Das gewählte :attribute ist nicht korrekt.', - 'image' => ':attribute muss ein Bild sein.', - 'in' => 'Das ausgewählte :attribute ist nicht korrekt.', - 'integer' => ':attribute muss eine Zahl sein.', - 'ip' => ':attribute muss eine valide IP sein.', # IPv4? - 'max' => [ + 'boolean' => ":attribute Feld muss 'true' oder 'false' sein.", + 'confirmed' => 'Die Bestätigung/Wiederholung von :attribute stimmt nicht überein.', + 'date' => ':attribute ist kein valides Datum.', + 'date_format' => ':attribute passt nicht zu folgendem Format :format.', + 'different' => ':attribute und :other müssen sich unterscheiden.', + 'digits' => ':attribute muss :digits Zeichen lang sein.', + 'digits_between' => ':attribute muss zwischen :min und :max Zeichen lang sein.', + 'email' => ':attribute muss eine valide E-Mail-Adresse sein.', + 'exists' => 'Das gewählte :attribute ist nicht korrekt.', + 'image' => ':attribute muss ein Bild sein.', + 'in' => 'Das ausgewählte :attribute ist nicht korrekt.', + 'integer' => ':attribute muss eine Zahl sein.', + 'ip' => ':attribute muss eine valide IP sein.', # IPv4? + 'max' => [ 'numeric' => ':attribute darf nicht größer als :max sein.', 'file' => ':attribute darf nicht größer als :max kilobyte sein.', 'string' => ':attribute darf nicht mehr als :max Zeichen lang sein.', 'array' => ':attribute darf nicht mehr als :max Werte enthalten.', ], - 'mimes' => ':attribute muss eine Datei vom Typ :values sein.', - 'min' => [ + 'mimes' => ':attribute muss eine Datei vom Typ :values sein.', + 'min' => [ 'numeric' => ':attribute muss mindestens :min sein.', 'file' => ':attribute muss mindestens :min kilobyte groß sein.', 'string' => ':attribute muss mindestens :min Zeichen lang sein.', @@ -78,10 +78,10 @@ return [ 'string' => ':attribute muss :size Zeichen lang sein.', 'array' => ':attribute muss :size Werte enthalten.', ], - 'string' => 'The :attribute must be a string.', - 'unique' => ':attribute wurde beirets gewählt.', - 'url' => 'Das Format von :attribute ist nicht korrekt.', - 'timezone' => ':attribute muss eine valide Zeitzone sein.', + 'string' => 'The :attribute must be a string.', + 'unique' => ':attribute wurde beirets gewählt.', + 'url' => 'Das Format von :attribute ist nicht korrekt.', + 'timezone' => ':attribute muss eine valide Zeitzone sein.', /* |-------------------------------------------------------------------------- diff --git a/resources/lang/en-UD/cachet.php b/resources/lang/en-UD/cachet.php index 137b5f35..393ccefb 100755 --- a/resources/lang/en-UD/cachet.php +++ b/resources/lang/en-UD/cachet.php @@ -58,11 +58,40 @@ return [ ], ], + // Subscriber + 'subscriber' => [ + 'subscribe' => 'crwdns489:0crwdne489:0', + 'button' => 'crwdns490:0crwdne490:0', + 'email' => [ + 'subscribe' => 'crwdns491:0crwdne491:0', + 'subscribed' => 'crwdns492:0crwdne492:0', + 'verified' => 'crwdns493:0crwdne493:0', + 'unsubscribe' => 'crwdns494:0crwdne494:0', + 'unsubscribed' => 'crwdns495:0crwdne495:0', + 'failure' => 'crwdns496:0crwdne496:0', + 'verify' => [ + 'text' => 'crwdns497:0crwdne497:0', + 'html-preheader' => 'crwdns498:0crwdne498:0', + 'html' => 'crwdns499:0crwdne499:0', + ], + 'maintenance' => [ + 'text' => 'crwdns500:0crwdne500:0', + 'html-preheader' => 'crwdns501:0crwdne501:0', + 'html' => 'crwdns502:0crwdne502:0', + ], + 'incident' => [ + 'text' => 'crwdns503:0crwdne503:0', + 'html-preheader' => 'crwdns504:0crwdne504:0', + 'html' => 'crwdns505:0crwdne505:0', + ], + ], + ], + // Other 'powered_by' => 'crwdns11:0crwdne11:0', 'about_this_site' => 'crwdns150:0crwdne150:0', - 'rss-feed' => 'crwdns273:0crwdne273:0', - 'atom-feed' => 'crwdns274:0crwdne274:0', + 'rss-feed' => 'crwdns506:0crwdne506:0', + 'atom-feed' => 'crwdns507:0crwdne507:0', 'feed' => 'crwdns275:0crwdne275:0', ]; diff --git a/resources/lang/en-UD/dashboard.php b/resources/lang/en-UD/dashboard.php index 6259417b..792ce8dc 100755 --- a/resources/lang/en-UD/dashboard.php +++ b/resources/lang/en-UD/dashboard.php @@ -127,7 +127,7 @@ return [ 'success' => 'crwdns340:0crwdne340:0', 'failure' => 'crwdns341:0crwdne341:0', ], - 'edit' => [ + 'edit' => [ 'title' => 'crwdns342:0crwdne342:0', 'success' => 'crwdns343:0crwdne343:0', 'failure' => 'crwdns344:0crwdne344:0', @@ -172,7 +172,7 @@ return [ 'logout' => 'crwdns204:0crwdne204:0', // Notifications - 'notifications' => [ + 'notifications' => [ 'notifications' => 'crwdns205:0crwdne205:0', 'awesome' => 'crwdns356:0crwdne356:0', 'whoops' => 'crwdns357:0crwdne357:0', diff --git a/resources/lang/en-UD/errors.php b/resources/lang/en-UD/errors.php index 4a0c72a9..8d8ce52e 100755 --- a/resources/lang/en-UD/errors.php +++ b/resources/lang/en-UD/errors.php @@ -1,5 +1,14 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + return [ 'not-found' => [ 'code' => 'crwdns208:0crwdne208:0', diff --git a/resources/lang/en-UD/forms.php b/resources/lang/en-UD/forms.php index 8996802f..4ff4a5d0 100755 --- a/resources/lang/en-UD/forms.php +++ b/resources/lang/en-UD/forms.php @@ -21,6 +21,8 @@ return [ 'site_timezone' => 'crwdns378:0crwdne378:0', 'site_locale' => 'crwdns379:0crwdne379:0', 'enable_google2fa' => 'crwdns380:0crwdne380:0', + 'cache_driver' => 'crwdns508:0crwdne508:0', + 'session_driver' => 'crwdns509:0crwdne509:0', ], // Login form fields @@ -35,17 +37,18 @@ return [ // Incidents form fields 'incidents' => [ - 'name' => 'crwdns219:0crwdne219:0', - 'status' => 'crwdns385:0crwdne385:0', - 'component' => 'crwdns386:0crwdne386:0', - 'message' => 'crwdns387:0crwdne387:0', - 'message-help' => 'crwdns388:0crwdne388:0', - 'scheduled_at' => 'crwdns464:0crwdne464:0', - 'incident_time' => 'crwdns481:0crwdne481:0', - 'visibility' => 'crwdns482:0crwdne482:0', - 'public' => 'crwdns483:0crwdne483:0', - 'logged_in_only' => 'crwdns484:0crwdne484:0', - 'templates' => [ + 'name' => 'crwdns219:0crwdne219:0', + 'status' => 'crwdns385:0crwdne385:0', + 'component' => 'crwdns386:0crwdne386:0', + 'message' => 'crwdns387:0crwdne387:0', + 'message-help' => 'crwdns388:0crwdne388:0', + 'scheduled_at' => 'crwdns464:0crwdne464:0', + 'incident_time' => 'crwdns481:0crwdne481:0', + 'notify_subscribers' => 'crwdns510:0crwdne510:0', + 'visibility' => 'crwdns482:0crwdne482:0', + 'public' => 'crwdns483:0crwdne483:0', + 'logged_in_only' => 'crwdns484:0crwdne484:0', + 'templates' => [ 'name' => 'crwdns389:0crwdne389:0', 'template' => 'crwdns390:0crwdne390:0', ], @@ -87,19 +90,22 @@ return [ 'settings' => [ /// Application setup 'app-setup' => [ - 'site-name' => 'crwdns233:0crwdne233:0', - 'site-url' => 'crwdns398:0crwdne398:0', - 'site-timezone' => 'crwdns399:0crwdne399:0', - 'site-locale' => 'crwdns400:0crwdne400:0', - 'date-format' => 'crwdns401:0crwdne401:0', - 'incident-date-format' => 'crwdns485:0crwdne485:0', - 'display-graphs' => 'crwdns472:0crwdne472:0', - 'about-this-page' => 'crwdns402:0crwdne402:0', - 'days-of-incidents' => 'crwdns403:0crwdne403:0', - 'banner' => 'crwdns404:0crwdne404:0', - 'banner-help' => 'crwdns405:0crwdne405:0', - 'analytics_google' => 'crwdns486:0crwdne486:0', - 'analytics_gosquared' => 'crwdns487:0crwdne487:0', + 'site-name' => 'crwdns233:0crwdne233:0', + 'site-url' => 'crwdns398:0crwdne398:0', + 'site-timezone' => 'crwdns399:0crwdne399:0', + 'site-locale' => 'crwdns400:0crwdne400:0', + 'date-format' => 'crwdns401:0crwdne401:0', + 'incident-date-format' => 'crwdns485:0crwdne485:0', + 'display-graphs' => 'crwdns472:0crwdne472:0', + 'about-this-page' => 'crwdns402:0crwdne402:0', + 'days-of-incidents' => 'crwdns403:0crwdne403:0', + 'banner' => 'crwdns404:0crwdne404:0', + 'banner-help' => 'crwdns405:0crwdne405:0', + 'analytics_google' => 'crwdns486:0crwdne486:0', + 'analytics_gosquared' => 'crwdns487:0crwdne487:0', + 'analytics_piwik_url' => 'crwdns511:0crwdne511:0', + 'analytics_piwik_siteid' => 'crwdns512:0crwdne512:0', + 'subscribers' => 'crwdns513:0crwdne513:0', ], 'security' => [ 'allowed-domains' => 'crwdns407:0crwdne407:0', diff --git a/resources/lang/en-UD/pagination.php b/resources/lang/en-UD/pagination.php index 2e03bc2a..ebece693 100755 --- a/resources/lang/en-UD/pagination.php +++ b/resources/lang/en-UD/pagination.php @@ -1,5 +1,14 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + return [ /* diff --git a/resources/lang/en-UD/reminders.php b/resources/lang/en-UD/reminders.php index 7b1ed3cc..8db5dd63 100755 --- a/resources/lang/en-UD/reminders.php +++ b/resources/lang/en-UD/reminders.php @@ -1,5 +1,14 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + return [ /* diff --git a/resources/lang/en-UD/setup.php b/resources/lang/en-UD/setup.php index 3e295942..2773a2bd 100755 --- a/resources/lang/en-UD/setup.php +++ b/resources/lang/en-UD/setup.php @@ -13,6 +13,7 @@ return [ 'setup' => 'crwdns258:0crwdne258:0', 'title' => 'crwdns259:0crwdne259:0', 'service_details' => 'crwdns260:0crwdne260:0', + 'env_setup' => 'crwdns514:0crwdne514:0', 'status_page_setup' => 'crwdns261:0crwdne261:0', 'show_support' => 'crwdns488:0crwdne488:0', 'admin_account' => 'crwdns263:0crwdne263:0', diff --git a/resources/lang/en-UD/validation.php b/resources/lang/en-UD/validation.php index 51a28aa0..b4480ec6 100755 --- a/resources/lang/en-UD/validation.php +++ b/resources/lang/en-UD/validation.php @@ -1,5 +1,14 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + return [ /* @@ -13,41 +22,41 @@ return [ | */ - 'accepted' => 'crwdns96:0crwdne96:0', - 'active_url' => 'crwdns97:0crwdne97:0', - 'after' => 'crwdns98:0crwdne98:0', - 'alpha' => 'crwdns99:0crwdne99:0', - 'alpha_dash' => 'crwdns100:0crwdne100:0', - 'alpha_num' => 'crwdns101:0crwdne101:0', - 'array' => 'crwdns102:0crwdne102:0', - 'before' => 'crwdns103:0crwdne103:0', - 'between' => [ + 'accepted' => 'crwdns96:0crwdne96:0', + 'active_url' => 'crwdns97:0crwdne97:0', + 'after' => 'crwdns98:0crwdne98:0', + 'alpha' => 'crwdns99:0crwdne99:0', + 'alpha_dash' => 'crwdns100:0crwdne100:0', + 'alpha_num' => 'crwdns101:0crwdne101:0', + 'array' => 'crwdns102:0crwdne102:0', + 'before' => 'crwdns103:0crwdne103:0', + 'between' => [ 'numeric' => 'crwdns104:0crwdne104:0', 'file' => 'crwdns418:0crwdne418:0', 'string' => 'crwdns419:0crwdne419:0', 'array' => 'crwdns420:0crwdne420:0', ], - 'boolean' => 'crwdns108:0crwdne108:0', - 'confirmed' => 'crwdns109:0crwdne109:0', - 'date' => 'crwdns110:0crwdne110:0', - 'date_format' => 'crwdns111:0crwdne111:0', - 'different' => 'crwdns112:0crwdne112:0', - 'digits' => 'crwdns113:0crwdne113:0', - 'digits_between' => 'crwdns114:0crwdne114:0', - 'email' => 'crwdns115:0crwdne115:0', - 'exists' => 'crwdns116:0crwdne116:0', - 'image' => 'crwdns117:0crwdne117:0', - 'in' => 'crwdns118:0crwdne118:0', - 'integer' => 'crwdns119:0crwdne119:0', - 'ip' => 'crwdns120:0crwdne120:0', - 'max' => [ + 'boolean' => 'crwdns108:0crwdne108:0', + 'confirmed' => 'crwdns109:0crwdne109:0', + 'date' => 'crwdns110:0crwdne110:0', + 'date_format' => 'crwdns111:0crwdne111:0', + 'different' => 'crwdns112:0crwdne112:0', + 'digits' => 'crwdns113:0crwdne113:0', + 'digits_between' => 'crwdns114:0crwdne114:0', + 'email' => 'crwdns115:0crwdne115:0', + 'exists' => 'crwdns116:0crwdne116:0', + 'image' => 'crwdns117:0crwdne117:0', + 'in' => 'crwdns118:0crwdne118:0', + 'integer' => 'crwdns119:0crwdne119:0', + 'ip' => 'crwdns120:0crwdne120:0', + 'max' => [ 'numeric' => 'crwdns121:0crwdne121:0', 'file' => 'crwdns421:0crwdne421:0', 'string' => 'crwdns422:0crwdne422:0', 'array' => 'crwdns423:0crwdne423:0', ], - 'mimes' => 'crwdns125:0crwdne125:0', - 'min' => [ + 'mimes' => 'crwdns125:0crwdne125:0', + 'min' => [ 'numeric' => 'crwdns126:0crwdne126:0', 'file' => 'crwdns424:0crwdne424:0', 'string' => 'crwdns425:0crwdne425:0', @@ -69,10 +78,10 @@ return [ 'string' => 'crwdns428:0crwdne428:0', 'array' => 'crwdns429:0crwdne429:0', ], - 'string' => 'The :attribute must be a string.', - 'unique' => 'crwdns144:0crwdne144:0', - 'url' => 'crwdns145:0crwdne145:0', - 'timezone' => 'crwdns146:0crwdne146:0', + 'string' => 'crwdns515:0crwdne515:0', + 'unique' => 'crwdns144:0crwdne144:0', + 'url' => 'crwdns145:0crwdne145:0', + 'timezone' => 'crwdns146:0crwdne146:0', /* |-------------------------------------------------------------------------- diff --git a/resources/lang/en/dashboard.php b/resources/lang/en/dashboard.php index 2186a3d3..ff4eb4a5 100755 --- a/resources/lang/en/dashboard.php +++ b/resources/lang/en/dashboard.php @@ -127,7 +127,7 @@ return [ 'success' => 'Team member added.', 'failure' => 'Something went wrong with the component.', ], - 'edit' => [ + 'edit' => [ 'title' => 'Update profile', 'success' => 'Profile updated.', 'failure' => 'Something went wrong when updating.', @@ -172,7 +172,7 @@ return [ 'logout' => 'Logout', // Notifications - 'notifications' => [ + 'notifications' => [ 'notifications' => 'Notifications', 'awesome' => 'Awesome.', 'whoops' => 'Whoops.', diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index decc6789..2b3d8198 100755 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -22,41 +22,41 @@ return [ | */ - 'accepted' => 'The :attribute must be accepted.', - 'active_url' => 'The :attribute is not a valid URL.', - 'after' => 'The :attribute must be a date after :date.', - 'alpha' => 'The :attribute may only contain letters.', - 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.', - 'alpha_num' => 'The :attribute may only contain letters and numbers.', - 'array' => 'The :attribute must be an array.', - 'before' => 'The :attribute must be a date before :date.', - 'between' => [ + 'accepted' => 'The :attribute must be accepted.', + 'active_url' => 'The :attribute is not a valid URL.', + 'after' => 'The :attribute must be a date after :date.', + 'alpha' => 'The :attribute may only contain letters.', + 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.', + 'alpha_num' => 'The :attribute may only contain letters and numbers.', + 'array' => 'The :attribute must be an array.', + 'before' => 'The :attribute must be a date before :date.', + 'between' => [ 'numeric' => 'The :attribute must be between :min and :max.', 'file' => 'The :attribute must be between :min and :max kilobytes.', 'string' => 'The :attribute must be between :min and :max characters.', 'array' => 'The :attribute must have between :min and :max items.', ], - 'boolean' => 'The :attribute field must be true or false.', - 'confirmed' => 'The :attribute confirmation does not match.', - 'date' => 'The :attribute is not a valid date.', - 'date_format' => 'The :attribute does not match the format :format.', - 'different' => 'The :attribute and :other must be different.', - 'digits' => 'The :attribute must be :digits digits.', - 'digits_between' => 'The :attribute must be between :min and :max digits.', - 'email' => 'The :attribute must be a valid email address.', - 'exists' => 'The selected :attribute is invalid.', - 'image' => 'The :attribute must be an image.', - 'in' => 'The selected :attribute is invalid.', - 'integer' => 'The :attribute must be an integer.', - 'ip' => 'The :attribute must be a valid IP address.', - 'max' => [ + 'boolean' => 'The :attribute field must be true or false.', + 'confirmed' => 'The :attribute confirmation does not match.', + 'date' => 'The :attribute is not a valid date.', + 'date_format' => 'The :attribute does not match the format :format.', + 'different' => 'The :attribute and :other must be different.', + 'digits' => 'The :attribute must be :digits digits.', + 'digits_between' => 'The :attribute must be between :min and :max digits.', + 'email' => 'The :attribute must be a valid email address.', + 'exists' => 'The selected :attribute is invalid.', + 'image' => 'The :attribute must be an image.', + 'in' => 'The selected :attribute is invalid.', + 'integer' => 'The :attribute must be an integer.', + 'ip' => 'The :attribute must be a valid IP address.', + 'max' => [ 'numeric' => 'The :attribute may not be greater than :max.', 'file' => 'The :attribute may not be greater than :max kilobytes.', 'string' => 'The :attribute may not be greater than :max characters.', 'array' => 'The :attribute may not have more than :max items.', ], - 'mimes' => 'The :attribute must be a file of type: :values.', - 'min' => [ + 'mimes' => 'The :attribute must be a file of type: :values.', + 'min' => [ 'numeric' => 'The :attribute must be at least :min.', 'file' => 'The :attribute must be at least :min kilobytes.', 'string' => 'The :attribute must be at least :min characters.', @@ -78,10 +78,10 @@ return [ 'string' => 'The :attribute must be :size characters.', 'array' => 'The :attribute must contain :size items.', ], - 'string' => 'The :attribute must be a string.', - 'unique' => 'The :attribute has already been taken.', - 'url' => 'The :attribute format is invalid.', - 'timezone' => 'The :attribute must be a valid zone.', + 'string' => 'The :attribute must be a string.', + 'unique' => 'The :attribute has already been taken.', + 'url' => 'The :attribute format is invalid.', + 'timezone' => 'The :attribute must be a valid zone.', /* |-------------------------------------------------------------------------- diff --git a/resources/lang/es/cachet.php b/resources/lang/es/cachet.php index 021ffb11..43535aa2 100755 --- a/resources/lang/es/cachet.php +++ b/resources/lang/es/cachet.php @@ -72,12 +72,12 @@ return [ 'html-preheader' => 'Please confirm your email subscription to :app_name status updates.', 'html' => '

Please confirm your email subscription to :app_name status updates.

:link

Thank you, :app_name

', ], - 'maintenance' => [ + 'maintenance' => [ 'text' => "New maintenance has been scheduled on :app_name.\nThank you, :app_name", 'html-preheader' => 'New maintenance has been scheduled on :app_name.', 'html' => '

New maintenance has been scheduled on :app_name.

Thank you, :app_name

', ], - 'incident' => [ + 'incident' => [ 'text' => "New incident has been reported on :app_name.\nThank you, :app_name", 'html-preheader' => 'New incident has been reported on :app_name.', 'html' => '

New incident has been reported on :app_name.

Thank you, :app_name

', diff --git a/resources/lang/es/dashboard.php b/resources/lang/es/dashboard.php index da2729e8..949c281e 100755 --- a/resources/lang/es/dashboard.php +++ b/resources/lang/es/dashboard.php @@ -100,7 +100,7 @@ return [ 'success' => 'Miembro del equipo agregado.', 'failure' => 'Algo salió mal con el componente.', ], - 'edit' => [ + 'edit' => [ 'title' => 'Actualizar perfil', 'success' => 'Perfil actualizado.', 'failure' => 'Algo salió mal al actualizar.', @@ -144,7 +144,7 @@ return [ 'logout' => 'Salir', // Notifications - 'notifications' => [ + 'notifications' => [ 'notifications' => 'Notificaciones', 'awesome' => 'Excelente.', 'whoops' => 'Whoops.', diff --git a/resources/lang/es/validation.php b/resources/lang/es/validation.php index fa94fe89..b2541a3d 100755 --- a/resources/lang/es/validation.php +++ b/resources/lang/es/validation.php @@ -22,41 +22,41 @@ return [ | */ - 'accepted' => 'El :attribute debe ser aceptado.', - 'active_url' => 'El :attribute no es un enlace válido.', - 'after' => 'El :attribute debe ser una fecha después de :date.', - 'alpha' => 'El :attribute sólo puede contener letras.', - 'alpha_dash' => 'El :attribute sólo puede contener letras, números y guiones.', - 'alpha_num' => 'El :attribute sólo puede contener letras y números.', - 'array' => 'El :attribute debe ser una matriz.', - 'before' => 'El :attribute debe ser una fecha antes de :date.', - 'between' => [ + 'accepted' => 'El :attribute debe ser aceptado.', + 'active_url' => 'El :attribute no es un enlace válido.', + 'after' => 'El :attribute debe ser una fecha después de :date.', + 'alpha' => 'El :attribute sólo puede contener letras.', + 'alpha_dash' => 'El :attribute sólo puede contener letras, números y guiones.', + 'alpha_num' => 'El :attribute sólo puede contener letras y números.', + 'array' => 'El :attribute debe ser una matriz.', + 'before' => 'El :attribute debe ser una fecha antes de :date.', + 'between' => [ 'numeric' => 'El :attribute debe ser entre :min y :max.', 'file' => 'El :attribute debe ser entre :min y :max kilobytes.', 'string' => 'El :attribute debe tener entre :min y :max caracteres.', 'array' => 'El :attribute debe tener entre :min y :max objetos.', ], - 'boolean' => 'El campo del :attribute debe ser verdadero o falso.', - 'confirmed' => 'La confirmación del :attribute no coincide.', - 'date' => 'El :attribute no es una fecha válida.', - 'date_format' => 'El :attribute no cumple el formato :format.', - 'different' => ':attribute y :other deben ser diferentes.', - 'digits' => 'El :attribute debe tener :digits dígitos.', - 'digits_between' => 'El :attribute debe tener entre: min y :max dígitos.', - 'email' => 'El :attribute debe ser una dirección de email válida.', - 'exists' => 'El :attribute seleccionado es inválido.', - 'image' => 'El :attribute debe ser una imagen.', - 'in' => 'El :attribute seleccionado es inválido.', - 'integer' => 'El :attribute debe ser un número entero.', - 'ip' => 'El :attribute debe ser una dirección IP válida.', - 'max' => [ + 'boolean' => 'El campo del :attribute debe ser verdadero o falso.', + 'confirmed' => 'La confirmación del :attribute no coincide.', + 'date' => 'El :attribute no es una fecha válida.', + 'date_format' => 'El :attribute no cumple el formato :format.', + 'different' => ':attribute y :other deben ser diferentes.', + 'digits' => 'El :attribute debe tener :digits dígitos.', + 'digits_between' => 'El :attribute debe tener entre: min y :max dígitos.', + 'email' => 'El :attribute debe ser una dirección de email válida.', + 'exists' => 'El :attribute seleccionado es inválido.', + 'image' => 'El :attribute debe ser una imagen.', + 'in' => 'El :attribute seleccionado es inválido.', + 'integer' => 'El :attribute debe ser un número entero.', + 'ip' => 'El :attribute debe ser una dirección IP válida.', + 'max' => [ 'numeric' => 'El :attribute no puede tener más de :max.', 'file' => 'El :attribute no puede tener más de :max kilobytes.', 'string' => 'El :attribute no puede tener más de :max caracteres.', 'array' => 'El :attribute no puede tener más de :max objetos.', ], - 'mimes' => 'El :attribute debe ser un archivo de tipo: :values.', - 'min' => [ + 'mimes' => 'El :attribute debe ser un archivo de tipo: :values.', + 'min' => [ 'numeric' => 'El :attribute debe tener al menos :min.', 'file' => 'El :attribute debe tener al menos :min kilobytes.', 'string' => 'El :attribute debe tener al menos :min characters.', @@ -78,10 +78,10 @@ return [ 'string' => 'El :attribute debe tener :size caracteres.', 'array' => 'El :attribute debe contener :size objetos.', ], - 'string' => 'The :attribute must be a string.', - 'unique' => 'El :attribute ya ha sido usado.', - 'url' => 'El formato :attribute es inválido.', - 'timezone' => 'El :attribute debe ser una zona válida.', + 'string' => 'The :attribute must be a string.', + 'unique' => 'El :attribute ya ha sido usado.', + 'url' => 'El formato :attribute es inválido.', + 'timezone' => 'El :attribute debe ser una zona válida.', /* |-------------------------------------------------------------------------- diff --git a/resources/lang/fr/cachet.php b/resources/lang/fr/cachet.php index 89e002a5..3bbb05f5 100755 --- a/resources/lang/fr/cachet.php +++ b/resources/lang/fr/cachet.php @@ -74,12 +74,12 @@ return [ 'html-preheader' => 'Please confirm your email subscription to :app_name status updates.', 'html' => '

Please confirm your email subscription to :app_name status updates.

:link

Thank you, :app_name

', ], - 'maintenance' => [ + 'maintenance' => [ 'text' => "New maintenance has been scheduled on :app_name.\nThank you, :app_name", 'html-preheader' => 'New maintenance has been scheduled on :app_name.', 'html' => '

New maintenance has been scheduled on :app_name.

Thank you, :app_name

', ], - 'incident' => [ + 'incident' => [ 'text' => "New incident has been reported on :app_name.\nThank you, :app_name", 'html-preheader' => 'New incident has been reported on :app_name.', 'html' => '

New incident has been reported on :app_name.

Thank you, :app_name

', diff --git a/resources/lang/fr/dashboard.php b/resources/lang/fr/dashboard.php index 7df51d29..49966d85 100755 --- a/resources/lang/fr/dashboard.php +++ b/resources/lang/fr/dashboard.php @@ -124,7 +124,7 @@ return [ 'success' => 'Membre ajouté.', 'failure' => 'Une erreur s\'est produite lors de l\'ajout de ce membre.', ], - 'edit' => [ + 'edit' => [ 'title' => 'Mettre à jour le profil', 'success' => 'Profil mis-à-jour.', 'failure' => 'Une erreur s\'est produite lors de la mise à jour du le profil.', @@ -133,8 +133,8 @@ return [ // Settings 'settings' => [ - 'settings' => 'Réglages', - 'app-setup' => [ + 'settings' => 'Réglages', + 'app-setup' => [ 'app-setup' => 'Configuration', 'images-only' => 'Only images may be uploaded.', 'too-big' => 'The file you uploaded is too big. Upload an image smaller than :size', @@ -168,7 +168,7 @@ return [ 'logout' => 'Déconnexion', // Notifications - 'notifications' => [ + 'notifications' => [ 'notifications' => 'Notifications', 'awesome' => 'Super.', 'whoops' => 'Oups.', diff --git a/resources/lang/fr/validation.php b/resources/lang/fr/validation.php index 7f6f6a02..6e4f4d3d 100755 --- a/resources/lang/fr/validation.php +++ b/resources/lang/fr/validation.php @@ -22,40 +22,40 @@ return [ | */ - 'accepted' => 'Le champ :attribute doit être accepté.', - 'active_url' => "Le champ :attribute n'est pas une URL valide.", - 'after' => 'Le champ :attribute doit être une date postérieure à :date.', - 'alpha' => 'Le champ :attribute ne peut contenir que des lettres.', - 'alpha_dash' => 'Le champ :attribute ne peut contenir que des lettres, chiffres et tirets.', - 'alpha_num' => 'Le champ :attribute ne peut contenir que des lettres ou des chiffres.', - 'array' => 'Le champ :attribute doit être un tableau.', - 'before' => 'Le champ :attribute doit être une date antérieure à :date.', - 'between' => [ + 'accepted' => 'Le champ :attribute doit être accepté.', + 'active_url' => "Le champ :attribute n'est pas une URL valide.", + 'after' => 'Le champ :attribute doit être une date postérieure à :date.', + 'alpha' => 'Le champ :attribute ne peut contenir que des lettres.', + 'alpha_dash' => 'Le champ :attribute ne peut contenir que des lettres, chiffres et tirets.', + 'alpha_num' => 'Le champ :attribute ne peut contenir que des lettres ou des chiffres.', + 'array' => 'Le champ :attribute doit être un tableau.', + 'before' => 'Le champ :attribute doit être une date antérieure à :date.', + 'between' => [ 'numeric' => 'Le champ :attribute doit être entre :min et :max.', 'file' => 'Le champ :attribute doit être entre :min et :max kilobytes.', 'string' => 'Le champ :attribute doit contenir entre :min et :max caractères.', 'array' => 'Le champ :attribute doit avoir entre :min et :max objets.', ], - 'confirmed' => 'Le champ :attribute confirmation ne correspond pas.', - 'date' => "Le champ :attribute n'est pas une date valide.", - 'date_format' => 'Le champ :attribute ne correspond pas au format :format.', - 'different' => 'Le champ :attribute et :other doivent être différents.', - 'digits' => 'Le champ :attribute doit être composé de :digits chiffres.', - 'digits_between' => "Le champ :attribute doit être composé de :min jusqu'à :max chiffres.", - 'email' => 'Le champ :attribute doit être une adresse email valide.', - 'exists' => 'Le champ selected :attribute est invalide.', - 'image' => 'Le champ :attribute doit être une image.', - 'in' => 'Le champ selected :attribute est invalide.', - 'integer' => 'Le champ :attribute doit être un entier.', - 'ip' => 'Le champ :attribute doit être une adresse IP valide.', - 'max' => [ + 'confirmed' => 'Le champ :attribute confirmation ne correspond pas.', + 'date' => "Le champ :attribute n'est pas une date valide.", + 'date_format' => 'Le champ :attribute ne correspond pas au format :format.', + 'different' => 'Le champ :attribute et :other doivent être différents.', + 'digits' => 'Le champ :attribute doit être composé de :digits chiffres.', + 'digits_between' => "Le champ :attribute doit être composé de :min jusqu'à :max chiffres.", + 'email' => 'Le champ :attribute doit être une adresse email valide.', + 'exists' => 'Le champ selected :attribute est invalide.', + 'image' => 'Le champ :attribute doit être une image.', + 'in' => 'Le champ selected :attribute est invalide.', + 'integer' => 'Le champ :attribute doit être un entier.', + 'ip' => 'Le champ :attribute doit être une adresse IP valide.', + 'max' => [ 'numeric' => 'Le champ :attribute ne doit pas être supérieure à :max.', 'file' => 'Le champ :attribute ne doit pas être supérieure à :max kilobytes.', 'string' => 'Le champ :attribute ne doit pas être supérieure à :max caractères.', 'array' => 'Le champ :attribute ne doit pas avoir plus de :max objets.', ], - 'mimes' => 'Le champ :attribute doit être un fichier de type : :values.', - 'min' => [ + 'mimes' => 'Le champ :attribute doit être un fichier de type : :values.', + 'min' => [ 'numeric' => 'Le champ :attribute doit être supérieur à :min.', 'file' => 'Le champ :attribute doit être supérieur à :min kilobytes.', 'string' => 'Le champ :attribute doit être supérieur à :min caractères.', @@ -77,9 +77,9 @@ return [ 'string' => 'Le nombre de caractères du champ :attribute doit être de :size caractères.', 'array' => 'Le champ :attribute doit contenir :size objets.', ], - 'string' => 'The :attribute must be a string.', - 'unique' => 'Le champ :attribute est déjà utilisé.', - 'url' => 'Le format du champ :attribute est invalide.', + 'string' => 'The :attribute must be a string.', + 'unique' => 'Le champ :attribute est déjà utilisé.', + 'url' => 'Le format du champ :attribute est invalide.', /* |-------------------------------------------------------------------------- @@ -92,7 +92,7 @@ return [ | */ - 'custom' => [ + 'custom' => [ 'attribute-name' => [ 'rule-name' => 'custom-message', ], @@ -109,6 +109,6 @@ return [ | */ - 'attributes' => [], + 'attributes' => [], ]; diff --git a/resources/lang/id/cachet.php b/resources/lang/id/cachet.php index f16a13ed..c46d2f99 100644 --- a/resources/lang/id/cachet.php +++ b/resources/lang/id/cachet.php @@ -74,12 +74,12 @@ return [ 'html-preheader' => 'Please confirm your email subscription to :app_name status updates.', 'html' => '

Please confirm your email subscription to :app_name status updates.

:link

Thank you, :app_name

', ], - 'maintenance' => [ + 'maintenance' => [ 'text' => "New maintenance has been scheduled on :app_name.\nThank you, :app_name", 'html-preheader' => 'New maintenance has been scheduled on :app_name.', 'html' => '

New maintenance has been scheduled on :app_name.

Thank you, :app_name

', ], - 'incident' => [ + 'incident' => [ 'text' => "New incident has been reported on :app_name.\nThank you, :app_name", 'html-preheader' => 'New incident has been reported on :app_name.', 'html' => '

New incident has been reported on :app_name.

Thank you, :app_name

', diff --git a/resources/lang/id/dashboard.php b/resources/lang/id/dashboard.php index 0f1f4f29..615b4537 100644 --- a/resources/lang/id/dashboard.php +++ b/resources/lang/id/dashboard.php @@ -127,7 +127,7 @@ return [ 'success' => 'Anggota Tim sudah ditambahkan.', 'failure' => 'Ada masalah dengan komponen ini.', ], - 'edit' => [ + 'edit' => [ 'title' => 'Perbarui profil', 'success' => 'Profil sudah diperbarui.', 'failure' => 'Ada masalah saat memperbarui.', @@ -172,7 +172,7 @@ return [ 'logout' => 'Logout', // Notifications - 'notifications' => [ + 'notifications' => [ 'notifications' => 'Notifikasi', 'awesome' => 'Keren.', 'whoops' => 'Waduh.', diff --git a/resources/lang/id/validation.php b/resources/lang/id/validation.php index 86fc5008..14d8c330 100644 --- a/resources/lang/id/validation.php +++ b/resources/lang/id/validation.php @@ -22,41 +22,41 @@ return [ | */ - 'accepted' => 'Anda harus menerima :attribute .', - 'active_url' => ':attribute bukan merupakan URL yang benar.', - 'after' => ':attribute harus merupakan tanggal setelah :date.', - 'alpha' => ':attribute hanya boleh berisi huruf.', - 'alpha_dash' => ':attribute hanya boleh berisi huruf, angka dan tanda minus.', - 'alpha_num' => ':attribute hanya boleh berisi huruf dan angka.', - 'array' => ':attribute harus merupakan array.', - 'before' => ':attribute harus merupakan tanngga sebelum :date.', - 'between' => [ + 'accepted' => 'Anda harus menerima :attribute .', + 'active_url' => ':attribute bukan merupakan URL yang benar.', + 'after' => ':attribute harus merupakan tanggal setelah :date.', + 'alpha' => ':attribute hanya boleh berisi huruf.', + 'alpha_dash' => ':attribute hanya boleh berisi huruf, angka dan tanda minus.', + 'alpha_num' => ':attribute hanya boleh berisi huruf dan angka.', + 'array' => ':attribute harus merupakan array.', + 'before' => ':attribute harus merupakan tanngga sebelum :date.', + 'between' => [ 'numeric' => ':attribute harus antara :min dan :max.', 'file' => ':attribute harus antara :min dan :max kilobyte.', 'string' => ':attribute harus antara :min dan :max karakter.', 'array' => ':attribute harus antara :min dan :max item.', ], - 'boolean' => 'Kotak :attribute harus berupa true atau false.', - 'confirmed' => 'Kedua :attribute tidak sama.', - 'date' => ':attribute bukan merupakan tanggal yang benar.', - 'date_format' => ':attribute tidak sesuai dengan format :format.', - 'different' => ':attribute dan :other harus beda.', - 'digits' => ':attribute harus terdiri dari :digits digit.', - 'digits_between' => ':attribute harus antara :min dan :max digit.', - 'email' => ':attribute harus merupakan alamat email yang benar.', - 'exists' => ':attribute yang dipilih tidak benar.', - 'image' => ':attribute harus merupakan gambar.', - 'in' => ':attribute yang dipilih tidak benar.', - 'integer' => ':attribute harus merupakan bilangan bulat.', - 'ip' => ':attribute harus merupakan alamat IP yang benar.', - 'max' => [ + 'boolean' => 'Kotak :attribute harus berupa true atau false.', + 'confirmed' => 'Kedua :attribute tidak sama.', + 'date' => ':attribute bukan merupakan tanggal yang benar.', + 'date_format' => ':attribute tidak sesuai dengan format :format.', + 'different' => ':attribute dan :other harus beda.', + 'digits' => ':attribute harus terdiri dari :digits digit.', + 'digits_between' => ':attribute harus antara :min dan :max digit.', + 'email' => ':attribute harus merupakan alamat email yang benar.', + 'exists' => ':attribute yang dipilih tidak benar.', + 'image' => ':attribute harus merupakan gambar.', + 'in' => ':attribute yang dipilih tidak benar.', + 'integer' => ':attribute harus merupakan bilangan bulat.', + 'ip' => ':attribute harus merupakan alamat IP yang benar.', + 'max' => [ 'numeric' => ':attribute tidak boleh lebih dari :max.', 'file' => ':attribute tidak boleh lebih dari :max kilobyte.', 'string' => ':attribute tidak boleh lebih dari :max karakter.', 'array' => ':attribute tidak boleh lebih dari :max item.', ], - 'mimes' => ':attribute harus merupakan jenis berkas: :values.', - 'min' => [ + 'mimes' => ':attribute harus merupakan jenis berkas: :values.', + 'min' => [ 'numeric' => ':attribute minimal harus :min.', 'file' => ':attribute minimal harus :min kilobyte.', 'string' => ':attribute minimal harus :min karakter.', @@ -78,10 +78,10 @@ return [ 'string' => ':attribute harus :size karakter.', 'array' => ':attribute harus berisi :size item.', ], - 'string' => 'The :attribute must be a string.', - 'unique' => ':attribute sudah ada.', - 'url' => 'Format :attribute tidak benar.', - 'timezone' => ':attribute harus merupakan zona yang benar.', + 'string' => 'The :attribute must be a string.', + 'unique' => ':attribute sudah ada.', + 'url' => 'Format :attribute tidak benar.', + 'timezone' => ':attribute harus merupakan zona yang benar.', /* |-------------------------------------------------------------------------- diff --git a/resources/lang/nl/cachet.php b/resources/lang/nl/cachet.php index f477c751..10771828 100755 --- a/resources/lang/nl/cachet.php +++ b/resources/lang/nl/cachet.php @@ -74,12 +74,12 @@ return [ 'html-preheader' => 'Please confirm your email subscription to :app_name status updates.', 'html' => '

Please confirm your email subscription to :app_name status updates.

:link

Thank you, :app_name

', ], - 'maintenance' => [ + 'maintenance' => [ 'text' => "New maintenance has been scheduled on :app_name.\nThank you, :app_name", 'html-preheader' => 'New maintenance has been scheduled on :app_name.', 'html' => '

New maintenance has been scheduled on :app_name.

Thank you, :app_name

', ], - 'incident' => [ + 'incident' => [ 'text' => "New incident has been reported on :app_name.\nThank you, :app_name", 'html-preheader' => 'New incident has been reported on :app_name.', 'html' => '

New incident has been reported on :app_name.

Thank you, :app_name

', diff --git a/resources/lang/nl/dashboard.php b/resources/lang/nl/dashboard.php index 4ba64587..2674f08f 100755 --- a/resources/lang/nl/dashboard.php +++ b/resources/lang/nl/dashboard.php @@ -127,7 +127,7 @@ return [ 'success' => 'Teamlid toegevoegd.', 'failure' => 'Er ging iets mis met de component.', ], - 'edit' => [ + 'edit' => [ 'title' => 'Profiel bijwerken', 'success' => 'Profiel bijgewerkt.', 'failure' => 'Er ging iets mis met het bijwerken.', @@ -172,7 +172,7 @@ return [ 'logout' => 'Uitloggen', // Notifications - 'notifications' => [ + 'notifications' => [ 'notifications' => 'Meldingen', 'awesome' => 'Geweldig.', 'whoops' => 'Oeps.', diff --git a/resources/lang/nl/validation.php b/resources/lang/nl/validation.php index dfc9ce50..7a6e2ecd 100755 --- a/resources/lang/nl/validation.php +++ b/resources/lang/nl/validation.php @@ -22,41 +22,41 @@ return [ | */ - 'accepted' => 'The :attribute must be accepted.', - 'active_url' => 'The :attribute is not a valid URL.', - 'after' => 'The :attribute must be a date after :date.', - 'alpha' => 'The :attribute may only contain letters.', - 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.', - 'alpha_num' => 'The :attribute may only contain letters and numbers.', - 'array' => 'The :attribute must be an array.', - 'before' => 'The :attribute must be a date before :date.', - 'between' => [ + 'accepted' => 'The :attribute must be accepted.', + 'active_url' => 'The :attribute is not a valid URL.', + 'after' => 'The :attribute must be a date after :date.', + 'alpha' => 'The :attribute may only contain letters.', + 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.', + 'alpha_num' => 'The :attribute may only contain letters and numbers.', + 'array' => 'The :attribute must be an array.', + 'before' => 'The :attribute must be a date before :date.', + 'between' => [ 'numeric' => 'The :attribute must be between :min and :max.', 'file' => 'The :attribute must be between :min and :max kilobytes.', 'string' => 'The :attribute must be between :min and :max characters.', 'array' => 'The :attribute must have between :min and :max items.', ], - 'boolean' => 'Het :attribute-veld moet true of false zijn.', - 'confirmed' => 'The :attribute confirmation does not match.', - 'date' => 'The :attribute is not a valid date.', - 'date_format' => 'The :attribute does not match the format :format.', - 'different' => 'The :attribute and :other must be different.', - 'digits' => 'The :attribute must be :digits digits.', - 'digits_between' => 'The :attribute must be between :min and :max digits.', - 'email' => 'The :attribute must be a valid email address.', - 'exists' => 'The selected :attribute is invalid.', - 'image' => 'The :attribute must be an image.', - 'in' => 'The selected :attribute is invalid.', - 'integer' => 'The :attribute must be an integer.', - 'ip' => 'The :attribute must be a valid IP address.', - 'max' => [ + 'boolean' => 'Het :attribute-veld moet true of false zijn.', + 'confirmed' => 'The :attribute confirmation does not match.', + 'date' => 'The :attribute is not a valid date.', + 'date_format' => 'The :attribute does not match the format :format.', + 'different' => 'The :attribute and :other must be different.', + 'digits' => 'The :attribute must be :digits digits.', + 'digits_between' => 'The :attribute must be between :min and :max digits.', + 'email' => 'The :attribute must be a valid email address.', + 'exists' => 'The selected :attribute is invalid.', + 'image' => 'The :attribute must be an image.', + 'in' => 'The selected :attribute is invalid.', + 'integer' => 'The :attribute must be an integer.', + 'ip' => 'The :attribute must be a valid IP address.', + 'max' => [ 'numeric' => 'The :attribute may not be greater than :max.', 'file' => 'The :attribute may not be greater than :max kilobytes.', 'string' => 'The :attribute may not be greater than :max characters.', 'array' => 'The :attribute may not have more than :max items.', ], - 'mimes' => 'The :attribute must be a file of type: :values.', - 'min' => [ + 'mimes' => 'The :attribute must be a file of type: :values.', + 'min' => [ 'numeric' => 'The :attribute must be at least :min.', 'file' => 'The :attribute must be at least :min kilobytes.', 'string' => 'The :attribute must be at least :min characters.', @@ -78,10 +78,10 @@ return [ 'string' => 'The :attribute must be :size characters.', 'array' => 'The :attribute must contain :size items.', ], - 'string' => 'The :attribute must be a string.', - 'unique' => 'The :attribute has already been taken.', - 'url' => 'Het :attribute-formaat is ongeldig.', - 'timezone' => 'The :attribute must be a valid zone.', + 'string' => 'The :attribute must be a string.', + 'unique' => 'The :attribute has already been taken.', + 'url' => 'Het :attribute-formaat is ongeldig.', + 'timezone' => 'The :attribute must be a valid zone.', /* |-------------------------------------------------------------------------- diff --git a/resources/lang/pl/cachet.php b/resources/lang/pl/cachet.php index c26ea642..2a75e63b 100755 --- a/resources/lang/pl/cachet.php +++ b/resources/lang/pl/cachet.php @@ -74,12 +74,12 @@ return [ 'html-preheader' => 'Please confirm your email subscription to :app_name status updates.', 'html' => '

Please confirm your email subscription to :app_name status updates.

:link

Thank you, :app_name

', ], - 'maintenance' => [ + 'maintenance' => [ 'text' => "New maintenance has been scheduled on :app_name.\nThank you, :app_name", 'html-preheader' => 'New maintenance has been scheduled on :app_name.', 'html' => '

New maintenance has been scheduled on :app_name.

Thank you, :app_name

', ], - 'incident' => [ + 'incident' => [ 'text' => "New incident has been reported on :app_name.\nThank you, :app_name", 'html-preheader' => 'New incident has been reported on :app_name.', 'html' => '

New incident has been reported on :app_name.

Thank you, :app_name

', diff --git a/resources/lang/pl/dashboard.php b/resources/lang/pl/dashboard.php index c16fa61f..4ff7ce6f 100755 --- a/resources/lang/pl/dashboard.php +++ b/resources/lang/pl/dashboard.php @@ -127,7 +127,7 @@ return [ 'success' => 'Dodano członka zespołu.', 'failure' => 'Coś poszło nie tak z dodawaniem do zespołu.', ], - 'edit' => [ + 'edit' => [ 'title' => 'Aktualizuj profil', 'success' => 'Profil zaktualizowany.', 'failure' => 'Coś poszło nie tak przy aktualizacji.', @@ -172,7 +172,7 @@ return [ 'logout' => 'Wyloguj', // Notifications - 'notifications' => [ + 'notifications' => [ 'notifications' => 'Powiadomienia', 'awesome' => 'Super.', 'whoops' => 'Ojej.', diff --git a/resources/lang/pl/validation.php b/resources/lang/pl/validation.php index decc6789..2b3d8198 100755 --- a/resources/lang/pl/validation.php +++ b/resources/lang/pl/validation.php @@ -22,41 +22,41 @@ return [ | */ - 'accepted' => 'The :attribute must be accepted.', - 'active_url' => 'The :attribute is not a valid URL.', - 'after' => 'The :attribute must be a date after :date.', - 'alpha' => 'The :attribute may only contain letters.', - 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.', - 'alpha_num' => 'The :attribute may only contain letters and numbers.', - 'array' => 'The :attribute must be an array.', - 'before' => 'The :attribute must be a date before :date.', - 'between' => [ + 'accepted' => 'The :attribute must be accepted.', + 'active_url' => 'The :attribute is not a valid URL.', + 'after' => 'The :attribute must be a date after :date.', + 'alpha' => 'The :attribute may only contain letters.', + 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.', + 'alpha_num' => 'The :attribute may only contain letters and numbers.', + 'array' => 'The :attribute must be an array.', + 'before' => 'The :attribute must be a date before :date.', + 'between' => [ 'numeric' => 'The :attribute must be between :min and :max.', 'file' => 'The :attribute must be between :min and :max kilobytes.', 'string' => 'The :attribute must be between :min and :max characters.', 'array' => 'The :attribute must have between :min and :max items.', ], - 'boolean' => 'The :attribute field must be true or false.', - 'confirmed' => 'The :attribute confirmation does not match.', - 'date' => 'The :attribute is not a valid date.', - 'date_format' => 'The :attribute does not match the format :format.', - 'different' => 'The :attribute and :other must be different.', - 'digits' => 'The :attribute must be :digits digits.', - 'digits_between' => 'The :attribute must be between :min and :max digits.', - 'email' => 'The :attribute must be a valid email address.', - 'exists' => 'The selected :attribute is invalid.', - 'image' => 'The :attribute must be an image.', - 'in' => 'The selected :attribute is invalid.', - 'integer' => 'The :attribute must be an integer.', - 'ip' => 'The :attribute must be a valid IP address.', - 'max' => [ + 'boolean' => 'The :attribute field must be true or false.', + 'confirmed' => 'The :attribute confirmation does not match.', + 'date' => 'The :attribute is not a valid date.', + 'date_format' => 'The :attribute does not match the format :format.', + 'different' => 'The :attribute and :other must be different.', + 'digits' => 'The :attribute must be :digits digits.', + 'digits_between' => 'The :attribute must be between :min and :max digits.', + 'email' => 'The :attribute must be a valid email address.', + 'exists' => 'The selected :attribute is invalid.', + 'image' => 'The :attribute must be an image.', + 'in' => 'The selected :attribute is invalid.', + 'integer' => 'The :attribute must be an integer.', + 'ip' => 'The :attribute must be a valid IP address.', + 'max' => [ 'numeric' => 'The :attribute may not be greater than :max.', 'file' => 'The :attribute may not be greater than :max kilobytes.', 'string' => 'The :attribute may not be greater than :max characters.', 'array' => 'The :attribute may not have more than :max items.', ], - 'mimes' => 'The :attribute must be a file of type: :values.', - 'min' => [ + 'mimes' => 'The :attribute must be a file of type: :values.', + 'min' => [ 'numeric' => 'The :attribute must be at least :min.', 'file' => 'The :attribute must be at least :min kilobytes.', 'string' => 'The :attribute must be at least :min characters.', @@ -78,10 +78,10 @@ return [ 'string' => 'The :attribute must be :size characters.', 'array' => 'The :attribute must contain :size items.', ], - 'string' => 'The :attribute must be a string.', - 'unique' => 'The :attribute has already been taken.', - 'url' => 'The :attribute format is invalid.', - 'timezone' => 'The :attribute must be a valid zone.', + 'string' => 'The :attribute must be a string.', + 'unique' => 'The :attribute has already been taken.', + 'url' => 'The :attribute format is invalid.', + 'timezone' => 'The :attribute must be a valid zone.', /* |-------------------------------------------------------------------------- diff --git a/resources/lang/pt-BR/cachet.php b/resources/lang/pt-BR/cachet.php index ff27b615..e3e352f0 100755 --- a/resources/lang/pt-BR/cachet.php +++ b/resources/lang/pt-BR/cachet.php @@ -74,12 +74,12 @@ return [ 'html-preheader' => 'Please confirm your email subscription to :app_name status updates.', 'html' => '

Please confirm your email subscription to :app_name status updates.

:link

Thank you, :app_name

', ], - 'maintenance' => [ + 'maintenance' => [ 'text' => "New maintenance has been scheduled on :app_name.\nThank you, :app_name", 'html-preheader' => 'New maintenance has been scheduled on :app_name.', 'html' => '

New maintenance has been scheduled on :app_name.

Thank you, :app_name

', ], - 'incident' => [ + 'incident' => [ 'text' => "New incident has been reported on :app_name.\nThank you, :app_name", 'html-preheader' => 'New incident has been reported on :app_name.', 'html' => '

New incident has been reported on :app_name.

Thank you, :app_name

', diff --git a/resources/lang/pt-BR/dashboard.php b/resources/lang/pt-BR/dashboard.php index 914c52fd..ea9d5e3f 100755 --- a/resources/lang/pt-BR/dashboard.php +++ b/resources/lang/pt-BR/dashboard.php @@ -126,7 +126,7 @@ return [ 'success' => 'Membro da equipe adicionado.', 'failure' => 'Algo deu errado com o componente.', ], - 'edit' => [ + 'edit' => [ 'title' => 'Atualizar perfil', 'success' => 'Perfil atualizado.', 'failure' => 'Algo deu errado duante a atualização.', @@ -170,7 +170,7 @@ return [ 'logout' => 'Sair', // Notifications - 'notifications' => [ + 'notifications' => [ 'notifications' => 'Notificações', 'awesome' => 'Excelente.', 'whoops' => 'Opa.', diff --git a/resources/lang/pt-BR/validation.php b/resources/lang/pt-BR/validation.php index c4716f46..fcac97d0 100755 --- a/resources/lang/pt-BR/validation.php +++ b/resources/lang/pt-BR/validation.php @@ -22,41 +22,41 @@ return [ | */ - 'accepted' => 'O campo :attribute deve ser aceito.', - 'active_url' => 'O campo :attribute não é uma URL válida.', - 'after' => 'O campo :attribute deverá conter uma data posterior a :date.', - 'alpha' => 'O campo :attribute deverá conter apenas letras.', - 'alpha_dash' => 'O campo :attribute só pode conter letras, números, e hifens.', - 'alpha_num' => 'O campo :attribute só pode conter letras e números.', - 'array' => 'O campo :attribute deve ser um vetor.', - 'before' => 'O campo :attribute deverá conter uma data anterior a :date.', - 'between' => [ + 'accepted' => 'O campo :attribute deve ser aceito.', + 'active_url' => 'O campo :attribute não é uma URL válida.', + 'after' => 'O campo :attribute deverá conter uma data posterior a :date.', + 'alpha' => 'O campo :attribute deverá conter apenas letras.', + 'alpha_dash' => 'O campo :attribute só pode conter letras, números, e hifens.', + 'alpha_num' => 'O campo :attribute só pode conter letras e números.', + 'array' => 'O campo :attribute deve ser um vetor.', + 'before' => 'O campo :attribute deverá conter uma data anterior a :date.', + 'between' => [ 'numeric' => 'O campo :attribute deverá ter um valor entre :min - :max.', 'file' => 'O campo :attribute deverá ter um tamanho entre :min - :max kilobytes.', 'string' => 'O campo :attribute deverá conter entre :min - :max caracteres.', 'array' => 'O campo :attribute deve ter entre :min e :max itens.', ], - 'boolean' => 'O campo :attribute deve ser verdadeiro ou falso.', - 'confirmed' => 'A confirmação para o campo :attribute não coincide.', - 'date' => 'O :attribute não é uma data válida.', - 'date_format' => 'O :attribute não corresponde ao formato :format.', - 'different' => 'O :attribute e :other devem ser diferentes.', - 'digits' => 'O campo :attribute deverá conter :digits dígitos.', - 'digits_between' => 'O :attribute deve ter entre :min e :max dígitos.', - 'email' => 'A: attribute deve ser um endereço de email válido.', - 'exists' => 'O :attribute selecionado é inválido.', - 'image' => 'O :attribute deve ser uma imagem.', - 'in' => 'O :attribute selecionado é inválido.', - 'integer' => 'O :attribute deve ser um número inteiro.', - 'ip' => 'O :attribute deve ser um endereço de IP válido.', - 'max' => [ + 'boolean' => 'O campo :attribute deve ser verdadeiro ou falso.', + 'confirmed' => 'A confirmação para o campo :attribute não coincide.', + 'date' => 'O :attribute não é uma data válida.', + 'date_format' => 'O :attribute não corresponde ao formato :format.', + 'different' => 'O :attribute e :other devem ser diferentes.', + 'digits' => 'O campo :attribute deverá conter :digits dígitos.', + 'digits_between' => 'O :attribute deve ter entre :min e :max dígitos.', + 'email' => 'A: attribute deve ser um endereço de email válido.', + 'exists' => 'O :attribute selecionado é inválido.', + 'image' => 'O :attribute deve ser uma imagem.', + 'in' => 'O :attribute selecionado é inválido.', + 'integer' => 'O :attribute deve ser um número inteiro.', + 'ip' => 'O :attribute deve ser um endereço de IP válido.', + 'max' => [ 'numeric' => 'O :attribute não pode ser maior do que :max.', 'file' => 'O campo :attribute não deverá ter um tamanho superior a :max kilobytes.', 'string' => 'O :attribute não pode ser maior do que :max caracteres.', 'array' => 'A: atributo não pode ter mais de que :max itens.', ], - 'mimes' => 'O :attribute deve ser um arquivo do tipo: :values.', - 'min' => [ + 'mimes' => 'O :attribute deve ser um arquivo do tipo: :values.', + 'min' => [ 'numeric' => 'O :attribute deve ter pelo menos :min.', 'file' => 'O :attribute deve ter pelo menos :min kilobytes.', 'string' => 'O :attribute deve ter pelo menos :min caracteres.', @@ -78,10 +78,10 @@ return [ 'string' => 'O :attribute deve ter :size caracteres.', 'array' => 'O :attribute deve ter :size itens.', ], - 'string' => 'The :attribute must be a string.', - 'unique' => 'O :attribute já existe.', - 'url' => 'O formato de :attribute é inválido.', - 'timezone' => 'O :attribute deve ser uma zona válida.', + 'string' => 'The :attribute must be a string.', + 'unique' => 'O :attribute já existe.', + 'url' => 'O formato de :attribute é inválido.', + 'timezone' => 'O :attribute deve ser uma zona válida.', /* |-------------------------------------------------------------------------- diff --git a/resources/lang/zh-CN/cachet.php b/resources/lang/zh-CN/cachet.php old mode 100644 new mode 100755 index daba168e..1f59d82b --- a/resources/lang/zh-CN/cachet.php +++ b/resources/lang/zh-CN/cachet.php @@ -60,29 +60,29 @@ return [ // Subscriber 'subscriber' => [ - 'subscribe' => 'Subscribe to get the most recent updates.', - 'button' => 'Subscribe', + 'subscribe' => '', + 'button' => '', 'email' => [ - 'subscribe' => 'Subscribe to email updates.', - 'subscribed' => 'You\'ve been subscribed to email notifications, please check your email to confirm your subscription.', - 'verified' => 'Your email subscription has been confirmed. Thank you!', - 'unsubscribe' => 'Unsuscribe from email updates.', - 'unsubscribed' => 'Your email subscription has been cancelled.', - 'failure' => 'Something went wrong with the subscription.', + 'subscribe' => '', + 'subscribed' => '', + 'verified' => '', + 'unsubscribe' => '', + 'unsubscribed' => '', + 'failure' => '', 'verify' => [ - 'text' => "Please confirm your email subscription to :app_name status updates.\n:link\nThank you, :app_name", - 'html-preheader' => 'Please confirm your email subscription to :app_name status updates.', - 'html' => '

Please confirm your email subscription to :app_name status updates.

:link

Thank you, :app_name

', + 'text' => '', + 'html-preheader' => '', + 'html' => '', ], - 'maintenance' => [ - 'text' => "New maintenance has been scheduled on :app_name.\nThank you, :app_name", - 'html-preheader' => 'New maintenance has been scheduled on :app_name.', - 'html' => '

New maintenance has been scheduled on :app_name.

Thank you, :app_name

', + 'maintenance' => [ + 'text' => '', + 'html-preheader' => '', + 'html' => '', ], - 'incident' => [ - 'text' => "New incident has been reported on :app_name.\nThank you, :app_name", - 'html-preheader' => 'New incident has been reported on :app_name.', - 'html' => '

New incident has been reported on :app_name.

Thank you, :app_name

', + 'incident' => [ + 'text' => '', + 'html-preheader' => '', + 'html' => '', ], ], ], @@ -90,8 +90,8 @@ return [ // Other 'powered_by' => ':app 应用状态页面由 Cachet提供支持。', 'about_this_site' => '关于此站点', - 'rss-feed' => 'RSS 源', - 'atom-feed' => 'Atom 源', + 'rss-feed' => '', + 'atom-feed' => '', 'feed' => '状态源', ]; diff --git a/resources/lang/zh-CN/dashboard.php b/resources/lang/zh-CN/dashboard.php old mode 100644 new mode 100755 index 008af0d0..852d7474 --- a/resources/lang/zh-CN/dashboard.php +++ b/resources/lang/zh-CN/dashboard.php @@ -87,7 +87,7 @@ return [ // Component groups 'groups' => [ 'groups' => '部件分组|部件分组', - 'no_components' => 'You should add a component group.', + 'no_components' => '您应添加一个组件分组。', 'add' => [ 'title' => '添加一个分组。', 'success' => '部件分组已添加。', @@ -127,7 +127,7 @@ return [ 'success' => '团队成员已添加。', 'failure' => '添加组件失败。', ], - 'edit' => [ + 'edit' => [ 'title' => '更新配置文件', 'success' => '配置文件已更新。', 'failure' => '资料更新失败。', @@ -172,7 +172,7 @@ return [ 'logout' => '注销', // Notifications - 'notifications' => [ + 'notifications' => [ 'notifications' => '通知', 'awesome' => '太棒了！', 'whoops' => '哎呦！', @@ -189,7 +189,7 @@ return [ 'customize' => '自定义', 'team' => '添加用户', 'api' => '生成 API 令牌。', - 'two-factor' => '双因素认证', + 'two-factor' => '双因素身份验证', ], ], diff --git a/resources/lang/zh-CN/errors.php b/resources/lang/zh-CN/errors.php old mode 100644 new mode 100755 diff --git a/resources/lang/zh-CN/forms.php b/resources/lang/zh-CN/forms.php old mode 100644 new mode 100755 index 594adcc6..ffdced44 --- a/resources/lang/zh-CN/forms.php +++ b/resources/lang/zh-CN/forms.php @@ -21,6 +21,8 @@ return [ 'site_timezone' => '选择您的时区', 'site_locale' => '选择您的语言', 'enable_google2fa' => '启用谷歌双因素身份验证', + 'cache_driver' => '', + 'session_driver' => '', ], // Login form fields @@ -30,19 +32,23 @@ return [ '2fauth' => '双因素验证代码', 'invalid' => '无效的电子邮件或密码。', 'invalid-token' => '无效的令牌。', - 'cookies' => 'You must enable cookies to login.', + 'cookies' => '您必须启用 cookies 来进行登录。', ], // Incidents form fields 'incidents' => [ - 'name' => '事件名', - 'status' => '状态', - 'component' => '组件', - 'message' => '消息', - 'message-help' => '您可以使用Markdown语言。', - 'scheduled_at' => '什么时间安排维护？', - - 'templates' => [ + 'name' => '事件名', + 'status' => '状态', + 'component' => '组件', + 'message' => '消息', + 'message-help' => '您可以使用Markdown语言。', + 'scheduled_at' => '什么时间安排维护？', + 'incident_time' => '这次事件是什么时候发生的？', + 'notify_subscribers' => '', + 'visibility' => '事件的可见性', + 'public' => '公共可见', + 'logged_in_only' => '仅登录用户可见', + 'templates' => [ 'name' => '事件名', 'template' => '模板', ], @@ -89,15 +95,17 @@ return [ 'site-timezone' => '站点时区', 'site-locale' => '站点语言', 'date-format' => '日期格式', + 'incident-date-format' => '事件的时间戳格式', 'display-graphs' => '是否在状态页上显示图表', 'about-this-page' => '关于这个页面', 'days-of-incidents' => '显示多少天的事件？', 'banner' => '横幅图像', 'banner-help' => '建议上传文件宽度不大于930像素。', - 'analytics_google' => 'Google Analytics code', - 'analytics_gosquared' => 'GoSquared Analytics code', - 'analytics_piwik_url' => 'URL of your Piwik instance (without http(s)://)', - 'analytics_piwik_siteid' => 'Piwik\'s site id', + 'analytics_google' => 'Google Analytics 代码', + 'analytics_gosquared' => 'GoSquared Analytics 代码', + 'analytics_piwik_url' => '', + 'analytics_piwik_siteid' => '', + 'subscribers' => '', ], 'security' => [ 'allowed-domains' => '允许的域', diff --git a/resources/lang/zh-CN/pagination.php b/resources/lang/zh-CN/pagination.php old mode 100644 new mode 100755 diff --git a/resources/lang/zh-CN/reminders.php b/resources/lang/zh-CN/reminders.php old mode 100644 new mode 100755 diff --git a/resources/lang/zh-CN/setup.php b/resources/lang/zh-CN/setup.php old mode 100644 new mode 100755 index b30aefc1..d1439f3a --- a/resources/lang/zh-CN/setup.php +++ b/resources/lang/zh-CN/setup.php @@ -13,8 +13,9 @@ return [ 'setup' => '设置', 'title' => '安装 Cachet', 'service_details' => '服务细节', + 'env_setup' => '', 'status_page_setup' => '状态页面设置', - 'show_support' => '想支持Cachet？', + 'show_support' => '您想支持Cachet么?', 'admin_account' => '管理员帐户', 'complete_setup' => '设置完成', 'completed' => 'Cachet已成功配置！', diff --git a/resources/lang/zh-CN/validation.php b/resources/lang/zh-CN/validation.php old mode 100644 new mode 100755 index 6fec8c65..85270cfb --- a/resources/lang/zh-CN/validation.php +++ b/resources/lang/zh-CN/validation.php @@ -22,41 +22,41 @@ return [ | */ - 'accepted' => ':attribute 必须是可以接受的。', - 'active_url' => ':attribute 不是一个有效的URL网址。', - 'after' => ':attribute 必须在 :date 之后。', - 'alpha' => ':attribute 只能包含字母。', - 'alpha_dash' => ':attribute 只能包含字母，数字和破折号。', - 'alpha_num' => ':attribute 只允许包含字母和数字。', - 'array' => ':attribute 必须是个数组。', - 'before' => ':attribute 必须在 :date 之前。', - 'between' => [ + 'accepted' => ':attribute 必须是可以接受的。', + 'active_url' => ':attribute 不是一个有效的URL网址。', + 'after' => ':attribute 必须在 :date 之后。', + 'alpha' => ':attribute 只能包含字母。', + 'alpha_dash' => ':attribute 只能包含字母，数字和破折号。', + 'alpha_num' => ':attribute 只允许包含字母和数字。', + 'array' => ':attribute 必须是个数组。', + 'before' => ':attribute 必须在 :date 之前。', + 'between' => [ 'numeric' => ':attribute 必须在 :min 到 :max 之间。', 'file' => ':attribute 必须在 :min 到 :max KB 之间。', 'string' => ':attribute 必须在 :min 到 :max 字符之间。', 'array' => ':attribute 必须在 :min 到 :max 个数目之间。', ], - 'boolean' => ':attribute 必须为 true（正确） 或者 false（错误）', - 'confirmed' => ':attribute 与确认项目不匹配', - 'date' => ':attribute 不是个有效日期', - 'date_format' => ':attribute 不符合 :format 的格式', - 'different' => ':attribute 和 :other 不能相同。', - 'digits' => ':attribute 必须是 :digits 位数。', - 'digits_between' => ':attribute 必须在 :min 和 :max 位之间。', - 'email' => ':attribute 必须是个有效的邮件地址。', - 'exists' => '选择的 :attribute 无效。', - 'image' => ':attribute 必须是图片。', - 'in' => '选择的 :attribute 无效。', - 'integer' => ':attribute 必须是整数。', - 'ip' => ':attribute 必须是一个有效的 IP 地址。', - 'max' => [ + 'boolean' => ':attribute 必须为 true（正确） 或者 false（错误）', + 'confirmed' => ':attribute 与确认项目不匹配', + 'date' => ':attribute 不是个有效日期', + 'date_format' => ':attribute 不符合 :format 的格式', + 'different' => ':attribute 和 :other 不能相同。', + 'digits' => ':attribute 必须是 :digits 位数。', + 'digits_between' => ':attribute 必须在 :min 和 :max 位之间。', + 'email' => ':attribute 必须是个有效的邮件地址。', + 'exists' => '选择的 :attribute 无效。', + 'image' => ':attribute 必须是图片。', + 'in' => '选择的 :attribute 无效。', + 'integer' => ':attribute 必须是整数。', + 'ip' => ':attribute 必须是一个有效的 IP 地址。', + 'max' => [ 'numeric' => ':attribute 不能大于 :max。', 'file' => ':attribute 不能大于 :max KB。', 'string' => ':attribute 不能大于 :max 个字符。', 'array' => ':attribute 不能超过 :max 个。', ], - 'mimes' => ':attribute 文件类型必须是 :values。', - 'min' => [ + 'mimes' => ':attribute 文件类型必须是 :values。', + 'min' => [ 'numeric' => ':attribute 最少是 :min。', 'file' => ':attribute 至少需要 :min KB。', 'string' => ':attribute 最少需要 :min个字符。', @@ -78,10 +78,10 @@ return [ 'string' => ':attribute 必须是 :size 个字符', 'array' => ':attribute 必须包含 :size 个', ], - 'string' => 'The :attribute must be a string.', - 'unique' => ':attribute 已经被占用', - 'url' => ':attribute 的格式无效', - 'timezone' => ':attribute 必须是个有效的区域。', + 'string' => '', + 'unique' => ':attribute 已经被占用', + 'url' => ':attribute 的格式无效', + 'timezone' => ':attribute 必须是个有效的区域。', /* |-------------------------------------------------------------------------- diff --git a/resources/lang/zh-TW/cachet.php b/resources/lang/zh-TW/cachet.php old mode 100644 new mode 100755 index c6939dd6..8d1c9fca --- a/resources/lang/zh-TW/cachet.php +++ b/resources/lang/zh-TW/cachet.php @@ -13,7 +13,7 @@ return [ // Components 'components' => [ 'status' => [ - 1 => '正常運行', + 1 => '正常', 2 => '效能問題', 3 => '部分停止運作', 4 => '停止運作', @@ -22,7 +22,7 @@ return [ // Incidents 'incidents' => [ - 'none' => '沒有任何事件。', + 'none' => '沒有任何報告', 'past' => '以前的事件', 'previous_week' => '上星期', 'next_week' => '下星期', @@ -40,12 +40,12 @@ return [ // Service Status 'service' => [ - 'good' => '全部系統運作正常。', + 'good' => '所有系統正常運轉', 'bad' => '部分系統出現異常。', ], 'api' => [ - 'regenerate' => '重新生成 API 密鑰', + 'regenerate' => '重新產生 API 金鑰', 'revoke' => '撤銷 API 密鑰', ], @@ -60,38 +60,38 @@ return [ // Subscriber 'subscriber' => [ - 'subscribe' => 'Subscribe to get the most recent updates.', - 'button' => 'Subscribe', + 'subscribe' => '', + 'button' => '', 'email' => [ - 'subscribe' => 'Subscribe to email updates.', - 'subscribed' => 'You\'ve been subscribed to email notifications, please check your email to confirm your subscription.', - 'verified' => 'Your email subscription has been confirmed. Thank you!', - 'unsubscribe' => 'Unsuscribe from email updates.', - 'unsubscribed' => 'Your email subscription has been cancelled.', - 'failure' => 'Something went wrong with the subscription.', + 'subscribe' => '', + 'subscribed' => '', + 'verified' => '', + 'unsubscribe' => '', + 'unsubscribed' => '', + 'failure' => '', 'verify' => [ - 'text' => "Please confirm your email subscription to :app_name status updates.\n:link\nThank you, :app_name", - 'html-preheader' => 'Please confirm your email subscription to :app_name status updates.', - 'html' => '

Please confirm your email subscription to :app_name status updates.

:link

Thank you, :app_name

', + 'text' => '', + 'html-preheader' => '', + 'html' => '', ], - 'maintenance' => [ - 'text' => "New maintenance has been scheduled on :app_name.\nThank you, :app_name", - 'html-preheader' => 'New maintenance has been scheduled on :app_name.', - 'html' => '

New maintenance has been scheduled on :app_name.

Thank you, :app_name

', + 'maintenance' => [ + 'text' => '', + 'html-preheader' => '', + 'html' => '', ], - 'incident' => [ - 'text' => "New incident has been reported on :app_name.\nThank you, :app_name", - 'html-preheader' => 'New incident has been reported on :app_name.', - 'html' => '

New incident has been reported on :app_name.

Thank you, :app_name

', + 'incident' => [ + 'text' => '', + 'html-preheader' => '', + 'html' => '', ], ], ], // Other 'powered_by' => ':app 狀態頁是由 Cachet 提供。', - 'about_this_site' => '關於本站', - 'rss-feed' => 'RSS 訂閱', - 'atom-feed' => 'Atom 訂閱', + 'about_this_site' => '關於此網站', + 'rss-feed' => '', + 'atom-feed' => '', 'feed' => 'Status 訂閱', ]; diff --git a/resources/lang/zh-TW/dashboard.php b/resources/lang/zh-TW/dashboard.php old mode 100644 new mode 100755 index 8eb7d15d..0dadfe8c --- a/resources/lang/zh-TW/dashboard.php +++ b/resources/lang/zh-TW/dashboard.php @@ -87,7 +87,7 @@ return [ // Component groups 'groups' => [ 'groups' => '組件組|組件組', - 'no_components' => 'You should add a component group.', + 'no_components' => '', 'add' => [ 'title' => '新增組件組', 'success' => '組件組新增成功。', @@ -103,7 +103,7 @@ return [ // Metrics 'metrics' => [ - 'metrics' => '指標', + 'metrics' => '效能度量', 'add' => [ 'title' => '新增指標', 'success' => '指標新增成功。', @@ -127,7 +127,7 @@ return [ 'success' => '成功新增團隊成員。', 'failure' => '新增團隊成員時遇到一些問題。', ], - 'edit' => [ + 'edit' => [ 'title' => '修改個人檔案', 'success' => '成功修改個人檔案。', 'failure' => '更新時遇到一些問題。', @@ -160,7 +160,7 @@ return [ // Login 'login' => [ - 'login' => '登錄', + 'login' => '登入', 'logged_in' => '你已經登錄。', 'welcome' => '歡迎回來！', 'two-factor' => '請輸入驗證碼。', @@ -172,7 +172,7 @@ return [ 'logout' => '登出', // Notifications - 'notifications' => [ + 'notifications' => [ 'notifications' => '通知', 'awesome' => '太好了。', 'whoops' => '唉呀。', @@ -189,7 +189,7 @@ return [ 'customize' => '定制化', 'team' => '新增用戶', 'api' => '生成 API 密鑰', - 'two-factor' => '兩步驗證', + 'two-factor' => '', ], ], diff --git a/resources/lang/zh-TW/errors.php b/resources/lang/zh-TW/errors.php old mode 100644 new mode 100755 diff --git a/resources/lang/zh-TW/forms.php b/resources/lang/zh-TW/forms.php old mode 100644 new mode 100755 index 5ebaa3aa..4a4e214f --- a/resources/lang/zh-TW/forms.php +++ b/resources/lang/zh-TW/forms.php @@ -21,6 +21,8 @@ return [ 'site_timezone' => '選擇你的時區', 'site_locale' => '選擇你的語言', 'enable_google2fa' => '啟用 Google 兩步驗證', + 'cache_driver' => '', + 'session_driver' => '', ], // Login form fields @@ -30,21 +32,25 @@ return [ '2fauth' => '驗證碼', 'invalid' => '錯誤的電郵地址或密碼', 'invalid-token' => '錯誤的驗證碼', - 'cookies' => 'You must enable cookies to login.', + 'cookies' => '', ], // Incidents form fields 'incidents' => [ - 'name' => '名稱', - 'status' => '狀態', - 'component' => '組件', - 'message' => '信息', - 'message-help' => '你可以使用 Markdown 。', - 'scheduled_at' => '排期在什麼時候進行維護？', - - 'templates' => [ + 'name' => '名稱', + 'status' => '狀態', + 'component' => '組件', + 'message' => '訊息', + 'message-help' => '你可以使用 Markdown 。', + 'scheduled_at' => '排期在什麼時候進行維護？', + 'incident_time' => '', + 'notify_subscribers' => '', + 'visibility' => '', + 'public' => '', + 'logged_in_only' => '', + 'templates' => [ 'name' => '名稱', - 'template' => '模板', + 'template' => '範本', ], ], @@ -68,7 +74,7 @@ return [ 'name' => '名稱', 'suffix' => '後綴', 'description' => '描述', - 'description-help' => '你可以使用 Markdown 。', + 'description-help' => '你也可以使用 Markdown', 'display-chart' => '在狀態頁上顯示圖表？', 'default-value' => '默認值', 'calc_type' => '指標的計算方法', @@ -89,15 +95,17 @@ return [ 'site-timezone' => '網站時區', 'site-locale' => '網站語言', 'date-format' => '日期格式', + 'incident-date-format' => '', 'display-graphs' => '在狀態頁上顯示圖片？', 'about-this-page' => '關於本站', 'days-of-incidents' => '顯示多少天前的事件？', 'banner' => '圖片橫幅', 'banner-help' => '橫幅寬度建議少於 930px 。', - 'analytics_google' => 'Google Analytics code', - 'analytics_gosquared' => 'GoSquared Analytics code', - 'analytics_piwik_url' => 'URL of your Piwik instance (without http(s)://)', - 'analytics_piwik_siteid' => 'Piwik\'s site id', + 'analytics_google' => '', + 'analytics_gosquared' => '', + 'analytics_piwik_url' => '', + 'analytics_piwik_siteid' => '', + 'subscribers' => '', ], 'security' => [ 'allowed-domains' => '容許訪問的域名', @@ -127,12 +135,12 @@ return [ 'add' => '增加', 'save' => '儲存', 'update' => '更新', - 'create' => '新增', - 'edit' => '修改', + 'create' => '建立', + 'edit' => '編輯', 'delete' => '刪除', - 'submit' => '提交', + 'submit' => '送出', 'cancel' => '取消', - 'remove' => '刪除', + 'remove' => '移除', // Other 'optional' => '* 可選項目', diff --git a/resources/lang/zh-TW/pagination.php b/resources/lang/zh-TW/pagination.php old mode 100644 new mode 100755 index 586ec16e..de52f3a4 --- a/resources/lang/zh-TW/pagination.php +++ b/resources/lang/zh-TW/pagination.php @@ -22,7 +22,7 @@ return [ | */ - 'previous' => '« 前一頁', - 'next' => '後一頁 »', + 'previous' => '« 上一頁', + 'next' => '下一頁 »', ]; diff --git a/resources/lang/zh-TW/reminders.php b/resources/lang/zh-TW/reminders.php old mode 100644 new mode 100755 index f75ec1e7..ba1a256e --- a/resources/lang/zh-TW/reminders.php +++ b/resources/lang/zh-TW/reminders.php @@ -22,10 +22,10 @@ return [ | */ - 'password' => '密碼必須至少有六個字符，而兩次輸入的密碼也必須匹配。', - 'user' => '無法找到擁有該電郵地址的用戶。', - 'token' => '無效的密碼重置令牌。', - 'sent' => '已發送密碼重置郵件。', - 'reset' => '成功重置密碼。', + 'password' => '密碼至少需六個字元，並且和確認欄相同', + 'user' => '我們無法找到具有該電子郵件地址的使用者。', + 'token' => '此密碼重設 token 無效', + 'sent' => '已發送密碼提醒 ！', + 'reset' => '已重設密碼 ！', ]; diff --git a/resources/lang/zh-TW/setup.php b/resources/lang/zh-TW/setup.php old mode 100644 new mode 100755 index f3a94299..872bddd8 --- a/resources/lang/zh-TW/setup.php +++ b/resources/lang/zh-TW/setup.php @@ -13,8 +13,9 @@ return [ 'setup' => '安裝', 'title' => '安裝 Cachet', 'service_details' => '服務詳細信息', + 'env_setup' => '', 'status_page_setup' => '設置狀態頁面', - 'show_support' => '希望支持 Cachet 嗎？', + 'show_support' => '', 'admin_account' => '管理員帳戶', 'complete_setup' => '完成安裝', 'completed' => '成功安裝 Cachet ！', diff --git a/resources/lang/zh-TW/validation.php b/resources/lang/zh-TW/validation.php old mode 100644 new mode 100755 index decc6789..d7ca2e56 --- a/resources/lang/zh-TW/validation.php +++ b/resources/lang/zh-TW/validation.php @@ -22,66 +22,66 @@ return [ | */ - 'accepted' => 'The :attribute must be accepted.', - 'active_url' => 'The :attribute is not a valid URL.', - 'after' => 'The :attribute must be a date after :date.', - 'alpha' => 'The :attribute may only contain letters.', - 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.', - 'alpha_num' => 'The :attribute may only contain letters and numbers.', - 'array' => 'The :attribute must be an array.', - 'before' => 'The :attribute must be a date before :date.', - 'between' => [ - 'numeric' => 'The :attribute must be between :min and :max.', + 'accepted' => '這個 :attribute 必須被接受', + 'active_url' => '這個 :attribute 不是一個有效的網址', + 'after' => ':attribute 必須在 :date 之後', + 'alpha' => ':attribute 只能包含字母', + 'alpha_dash' => ':attribute 只能包含字母、數字、破折號', + 'alpha_num' => ':attribute 只能包含字母及數字', + 'array' => ':attribute 必須是一個陣列', + 'before' => ':attribute 必須在 :date 之前', + 'between' => [ + 'numeric' => ':attribute 必須介於 :min 到 :max 之間', 'file' => 'The :attribute must be between :min and :max kilobytes.', 'string' => 'The :attribute must be between :min and :max characters.', 'array' => 'The :attribute must have between :min and :max items.', ], - 'boolean' => 'The :attribute field must be true or false.', - 'confirmed' => 'The :attribute confirmation does not match.', - 'date' => 'The :attribute is not a valid date.', - 'date_format' => 'The :attribute does not match the format :format.', - 'different' => 'The :attribute and :other must be different.', - 'digits' => 'The :attribute must be :digits digits.', - 'digits_between' => 'The :attribute must be between :min and :max digits.', - 'email' => 'The :attribute must be a valid email address.', - 'exists' => 'The selected :attribute is invalid.', - 'image' => 'The :attribute must be an image.', - 'in' => 'The selected :attribute is invalid.', - 'integer' => 'The :attribute must be an integer.', - 'ip' => 'The :attribute must be a valid IP address.', - 'max' => [ - 'numeric' => 'The :attribute may not be greater than :max.', + 'boolean' => ':attribute 欄位必須是 true 或 false', + 'confirmed' => ':attribute 確認不符合', + 'date' => ':attribute 不是一個有效的日期', + 'date_format' => ':attribute 不符合 :format 的格式', + 'different' => ':attribute 與 :other 必須不同', + 'digits' => ':attribute 必須是 :digits 位數', + 'digits_between' => ':attribute 必須介於 :min 到 :max 位數之間', + 'email' => ':attribute 必須是一個有效的電子郵件地址', + 'exists' => '選擇的 :attribute 是無效的', + 'image' => ':attribute 必須是圖片', + 'in' => '選擇的 :attribute 是無效的', + 'integer' => ':attribute 必須是整數', + 'ip' => ':attribute 必須是有效的 IP 位址', + 'max' => [ + 'numeric' => ':attribute 不能大於 :max', 'file' => 'The :attribute may not be greater than :max kilobytes.', 'string' => 'The :attribute may not be greater than :max characters.', 'array' => 'The :attribute may not have more than :max items.', ], - 'mimes' => 'The :attribute must be a file of type: :values.', - 'min' => [ - 'numeric' => 'The :attribute must be at least :min.', + 'mimes' => ':attribute 檔案類型必須是 :values ', + 'min' => [ + 'numeric' => ':attribute 至少要 :min', 'file' => 'The :attribute must be at least :min kilobytes.', 'string' => 'The :attribute must be at least :min characters.', 'array' => 'The :attribute must have at least :min items.', ], - 'not_in' => 'The selected :attribute is invalid.', - 'numeric' => 'The :attribute must be a number.', - 'regex' => 'The :attribute format is invalid.', - 'required' => 'The :attribute field is required.', - 'required_if' => 'The :attribute field is required when :other is :value.', - 'required_with' => 'The :attribute field is required when :values is present.', - 'required_with_all' => 'The :attribute field is required when :values is present.', - 'required_without' => 'The :attribute field is required when :values is not present.', - 'required_without_all' => 'The :attribute field is required when none of :values are present.', - 'same' => 'The :attribute and :other must match.', + 'not_in' => '選擇的 :attribute 是無效的', + 'numeric' => ':attribute 必須是數字', + 'regex' => ':attribute 格式無效', + 'required' => ':attribute 欄位是必須的', + 'required_if' => ':attribute 欄位在 :other 為 :value 時，是必填的', + 'required_with' => ':attribute 欄位在 :values 存在時，是必填的', + 'required_with_all' => ':attribute 欄位在 :values 存在時，是必填的', + 'required_without' => ':attribute 欄位在 :values 不存在時，是必填的', + 'required_without_all' => ':attribute 欄位在沒有 :values 存在時，是必填的', + 'same' => ':attribute 及 :other 必須相符', 'size' => [ - 'numeric' => 'The :attribute must be :size.', + 'numeric' => ':attribute 必須為 :size', 'file' => 'The :attribute must be :size kilobytes.', 'string' => 'The :attribute must be :size characters.', 'array' => 'The :attribute must contain :size items.', ], - 'string' => 'The :attribute must be a string.', - 'unique' => 'The :attribute has already been taken.', - 'url' => 'The :attribute format is invalid.', - 'timezone' => 'The :attribute must be a valid zone.', + 'string' => '', + 'unique' => ':attribute 已經被佔用', + 'url' => ':attribute 格式無效', + 'timezone' => ':attribute 必須是有效的區域', /* |-------------------------------------------------------------------------- @@ -96,7 +96,7 @@ return [ 'custom' => [ 'attribute-name' => [ - 'rule-name' => 'custom-message', + 'rule-name' => '自訂訊息', ], ], diff --git a/tests/AbstractTestCase.php b/tests/AbstractTestCase.php index 42f855f5..62378f61 100644 --- a/tests/AbstractTestCase.php +++ b/tests/AbstractTestCase.php @@ -38,8 +38,6 @@ abstract class AbstractTestCase extends TestCase /** * Becomes a user. - * - * @return void */ protected function beUser() {