From 7eaedb97dcb6c3afc3fce6585f847128404ab070 Mon Sep 17 00:00:00 2001 From: Luca Volpones Date: Tue, 7 Nov 2017 18:46:39 +0100 Subject: [PATCH 1/5] Duplicate array key in lang.php in all languages --- resources/lang/de/lang.php | 1 - resources/lang/en/lang.php | 1 - resources/lang/fr/lang.php | 1 - resources/lang/it/lang.php | 1 - resources/lang/nl/lang.php | 1 - resources/lang/pt/lang.php | 1 - resources/lang/ru/lang.php | 1 - 7 files changed, 7 deletions(-) diff --git a/resources/lang/de/lang.php b/resources/lang/de/lang.php index dba6d0849..60b0b2010 100644 --- a/resources/lang/de/lang.php +++ b/resources/lang/de/lang.php @@ -1154,7 +1154,6 @@ return [ 'banned-users' => 'Banned users', 'inactive-users' => 'Inactive users', 'all-users' => 'All users', - 'search' => 'Search...', //update 21-12-2016 'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.', //updated 15-5-2017 diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index e576f8265..b3cc8e21e 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -1591,7 +1591,6 @@ return [ 'banned-users' => 'Banned users', 'inactive-users' => 'Inactive users', 'all-users' => 'All users', - 'search' => 'Search...', //update 21-12-2016 'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.', //updated 15-5-2017 diff --git a/resources/lang/fr/lang.php b/resources/lang/fr/lang.php index e8656a327..95ee1ad1b 100644 --- a/resources/lang/fr/lang.php +++ b/resources/lang/fr/lang.php @@ -1562,7 +1562,6 @@ return [ 'banned-users' => 'Utilisateurs bannis', 'inactive-users' => 'Utilisateurs inactifs', 'all-users' => 'Tous les utilisateurs', - 'search' => 'Rechercher...', //update 21-12-2016 'selected-user-is-already-the-owner' => 'L\'utilisateur sélectionné est déjà le propriétaire du ticket.', //updated 15-5-2017 diff --git a/resources/lang/it/lang.php b/resources/lang/it/lang.php index 087f45769..8d4b80168 100644 --- a/resources/lang/it/lang.php +++ b/resources/lang/it/lang.php @@ -1114,7 +1114,6 @@ return [ 'banned-users' => 'Banned users', 'inactive-users' => 'Inactive users', 'all-users' => 'All users', - 'search' => 'Search...', //update 21-12-2016 'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.', //updated 15-5-2017 diff --git a/resources/lang/nl/lang.php b/resources/lang/nl/lang.php index fbf5463fb..191fe648f 100644 --- a/resources/lang/nl/lang.php +++ b/resources/lang/nl/lang.php @@ -1608,7 +1608,6 @@ return [ 'banned-users' => 'Banned users', 'inactive-users' => 'Inactive users', 'all-users' => 'All users', - 'search' => 'Search...', //update 21-12-2016 'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.', //updated 15-5-2017 diff --git a/resources/lang/pt/lang.php b/resources/lang/pt/lang.php index 35727ce30..0b9d29150 100644 --- a/resources/lang/pt/lang.php +++ b/resources/lang/pt/lang.php @@ -1553,7 +1553,6 @@ return [ 'banned-users' => 'Banned users', 'inactive-users' => 'Inactive users', 'all-users' => 'All users', - 'search' => 'Search...', //update 21-12-2016 'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.', //updated 15-5-2017 diff --git a/resources/lang/ru/lang.php b/resources/lang/ru/lang.php index 0fc6c253d..17c4541e7 100644 --- a/resources/lang/ru/lang.php +++ b/resources/lang/ru/lang.php @@ -1062,7 +1062,6 @@ return [ 'banned-users' => 'Banned users', 'inactive-users' => 'Inactive users', 'all-users' => 'All users', - 'search' => 'Search...', //update 21-12-2016 'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.', //updated 15-5-2017 From 760d752b5dde468b16710179f661cce73f4ad591 Mon Sep 17 00:00:00 2001 From: Luca Volpones Date: Tue, 7 Nov 2017 19:01:46 +0100 Subject: [PATCH 2/5] Fix #2 --- resources/lang/de/lang.php | 1 - resources/lang/en/lang.php | 1 - resources/lang/fr/lang.php | 1 - resources/lang/it/lang.php | 1 - resources/lang/nl/lang.php | 1 - resources/lang/pt/lang.php | 1 - resources/lang/ru/lang.php | 1 - 7 files changed, 7 deletions(-) diff --git a/resources/lang/de/lang.php b/resources/lang/de/lang.php index 60b0b2010..b5f709973 100644 --- a/resources/lang/de/lang.php +++ b/resources/lang/de/lang.php @@ -923,7 +923,6 @@ return [ *translation required from here *****************************************************/ 'edit_profile' => 'Edit profile', - 'you_are_here' => 'You are here', 'Send' => 'SEND', 'no_article' => 'No article', 'profile_settings' => 'Profile settings', diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index b3cc8e21e..a7cbe124c 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -1360,7 +1360,6 @@ return [ 'post_comment' => 'Post comment', 'plugin' => 'Plugin', 'edit_profile' => 'Edit profile', - 'you_are_here' => 'You are here', 'Send' => 'SEND', 'no_article' => 'No article', 'profile_settings' => 'Profile settings', diff --git a/resources/lang/fr/lang.php b/resources/lang/fr/lang.php index 95ee1ad1b..bcf2a27f1 100644 --- a/resources/lang/fr/lang.php +++ b/resources/lang/fr/lang.php @@ -1322,7 +1322,6 @@ return [ 'post_comment' => 'Poster commentaire', 'plugin' => 'Plugin', 'edit_profile' => 'Modifier profil', - 'you_are_here' => 'Vous êtes ici', 'Send' => 'VALIDER', 'no_article' => 'Pas d\'article', 'profile_settings' => 'Paramètres du profil', diff --git a/resources/lang/it/lang.php b/resources/lang/it/lang.php index 8d4b80168..4cba37743 100644 --- a/resources/lang/it/lang.php +++ b/resources/lang/it/lang.php @@ -883,7 +883,6 @@ return [ /* Translation Required after this line */ /******************************************************************************/ 'edit_profile' => 'Edit profile', - 'you_are_here' => 'You are here', 'Send' => 'SEND', 'no_article' => 'No article', 'profile_settings' => 'Profile settings', diff --git a/resources/lang/nl/lang.php b/resources/lang/nl/lang.php index 191fe648f..2afe15a2c 100644 --- a/resources/lang/nl/lang.php +++ b/resources/lang/nl/lang.php @@ -1378,7 +1378,6 @@ return [ 'post_comment' => 'Plaats reactie', 'plugin' => 'Plugin', 'edit_profile' => 'Bewerk profiel', - 'you_are_here' => 'Je bent hier', 'Send' => 'Verstuur', 'no_article' => 'Geen artikel', 'profile_settings' => 'Profiel instellingen', diff --git a/resources/lang/pt/lang.php b/resources/lang/pt/lang.php index 0b9d29150..e0c0f5b8a 100644 --- a/resources/lang/pt/lang.php +++ b/resources/lang/pt/lang.php @@ -1316,7 +1316,6 @@ return [ 'post_comment' => 'Enviar comentário', 'plugin' => 'Plugin', 'edit_profile' => 'Editar Perfil', - 'you_are_here' => 'Você está aqui', 'Send' => 'ENVIAR', 'no_article' => 'Nenhum artigo', 'profile_settings' => 'Configurações de perfil', diff --git a/resources/lang/ru/lang.php b/resources/lang/ru/lang.php index 17c4541e7..293134029 100644 --- a/resources/lang/ru/lang.php +++ b/resources/lang/ru/lang.php @@ -830,7 +830,6 @@ return [ /* Translation reuired */ /*****************************************************************************************/ 'edit_profile' => 'Edit profile', - 'you_are_here' => 'You are here', 'Send' => 'SEND', 'no_article' => 'No article', 'profile_settings' => 'Profile settings', From 5d51afd360fa2f8c3f0c0c941c387277932b3bff Mon Sep 17 00:00:00 2001 From: Luca Volpones Date: Tue, 7 Nov 2017 19:08:48 +0100 Subject: [PATCH 3/5] Fix #3 --- resources/lang/de/lang.php | 3 +-- resources/lang/en/lang.php | 1 - resources/lang/fr/lang.php | 1 - resources/lang/it/lang.php | 1 - resources/lang/nl/lang.php | 1 - resources/lang/pt/lang.php | 1 - resources/lang/ru/lang.php | 1 - 7 files changed, 1 insertion(+), 8 deletions(-) diff --git a/resources/lang/de/lang.php b/resources/lang/de/lang.php index b5f709973..7ba032e3d 100644 --- a/resources/lang/de/lang.php +++ b/resources/lang/de/lang.php @@ -28,7 +28,7 @@ return [ |-------------------------------------- */ 'Login_to_start_your_session' => 'Einloggen um Ihre Sitzung zu starten', - 'login' => 'Login', + 'login' => 'Anmeldung', 'remember' => 'Erinnere dich an mich', 'signmein' => 'Melde mich an', 'iforgot' => 'Ich habe mein Passwort vergessen', @@ -36,7 +36,6 @@ return [ 'password' => 'Passwort', 'woops' => 'Whoops!', 'theirisproblem' => 'Es gab einige Probleme mit Ihrer Eingabe.', - 'login' => 'Anmeldung', 'e-mail' => 'E-Mail', 'reg_new_member' => 'Registrieren für eine neue Mitgliedschaft', /* diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index a7cbe124c..0c94c3585 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -51,7 +51,6 @@ return [ 'password_confirmation' => 'Password confirmation', 'woops' => 'Whoops!', 'theirisproblem' => 'There were some problems with your input.', - 'login' => 'Login', 'e-mail' => 'Email', 'reg_new_member' => 'Register a new membership', 'this_account_is_currently_inactive' => 'This account is currently inactive!', diff --git a/resources/lang/fr/lang.php b/resources/lang/fr/lang.php index bcf2a27f1..45d0bddbd 100644 --- a/resources/lang/fr/lang.php +++ b/resources/lang/fr/lang.php @@ -44,7 +44,6 @@ return [ 'password' => 'Mot de passe', 'woops' => 'Oups!', 'theirisproblem' => 'Il y a eu un problème avec ce que vous avez saisi', - 'login' => 'Connexion', 'e-mail' => 'E-mail', 'reg_new_member' => 'Inscrivez-vous', 'this_account_is_currently_inactive' => 'Ce compte est actuellement inactif!', diff --git a/resources/lang/it/lang.php b/resources/lang/it/lang.php index 4cba37743..ac92e646a 100644 --- a/resources/lang/it/lang.php +++ b/resources/lang/it/lang.php @@ -37,7 +37,6 @@ return [ 'password' => 'Password', 'woops' => 'Whoops!', 'theirisproblem' => 'Ci sono problemi con ciò che hai inserito.', - 'login' => 'Login', 'e-mail' => 'E-mail', 'reg_new_member' => 'Registra una nuova associazione', /* diff --git a/resources/lang/nl/lang.php b/resources/lang/nl/lang.php index 2afe15a2c..f4466ea93 100644 --- a/resources/lang/nl/lang.php +++ b/resources/lang/nl/lang.php @@ -64,7 +64,6 @@ return [ 'password' => 'Wachtwoord', 'woops' => 'Oeps!!', 'theirisproblem' => 'Er is een probleem met je invoer.', - 'login' => 'Login', 'e-mail' => 'E-mailadres', 'reg_new_member' => 'Registreren', 'this_account_is_currently_inactive' => 'Dit account is niet actief!', diff --git a/resources/lang/pt/lang.php b/resources/lang/pt/lang.php index e0c0f5b8a..4ceece5be 100644 --- a/resources/lang/pt/lang.php +++ b/resources/lang/pt/lang.php @@ -57,7 +57,6 @@ return [ 'password' => 'Senha', 'woops' => 'Whoops!', 'theirisproblem' => 'Ocorreu um erro durante o login.', - 'login' => 'Login', 'e-mail' => 'E-mail', 'reg_new_member' => 'Registrar uma nova associação.', 'this_account_is_currently_inactive' => 'Essa conta está inativa!', diff --git a/resources/lang/ru/lang.php b/resources/lang/ru/lang.php index 293134029..542d90c27 100644 --- a/resources/lang/ru/lang.php +++ b/resources/lang/ru/lang.php @@ -34,7 +34,6 @@ return [ 'password' => 'Пароль', 'woops' => 'Whoops!', 'theirisproblem' => 'There were some problems with your input.', - 'login' => 'Login', 'e-mail' => 'E-mail', 'reg_new_member' => 'Register a new membership', /* From 954b5d6a9a29739621c9e7ff820f6931e72519b1 Mon Sep 17 00:00:00 2001 From: Luca Volpones Date: Wed, 8 Nov 2017 17:50:11 +0100 Subject: [PATCH 4/5] Fix #4 --- resources/lang/en/lang.php | 1 - resources/lang/fr/lang.php | 1 - resources/lang/nl/lang.php | 1 - resources/lang/pt/lang.php | 1 - 4 files changed, 4 deletions(-) diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index 0c94c3585..06f7d0fb3 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -827,7 +827,6 @@ return [ 'the_associated_helptopic_has_been_deactivated' => 'The associated helptopic has been deactivated', 'department_deleted_sucessfully' => 'Department deleted successfully', 'department_can_not_delete' => 'Department can not be deleted', - 'select_a_department' => 'Select a department', 'make-default-department' => 'Make system\'s default department', /* |-------------------------------------- diff --git a/resources/lang/fr/lang.php b/resources/lang/fr/lang.php index 45d0bddbd..cb2709695 100644 --- a/resources/lang/fr/lang.php +++ b/resources/lang/fr/lang.php @@ -789,7 +789,6 @@ return [ 'the_associated_helptopic_has_been_deactivated' => 'La branche de support associée a été désactivée', 'department_deleted_sucessfully' => 'Département supprimé avec succès', 'department_can_not_delete' => 'Le département ne peut pas être supprimé', - 'select_a_department' => 'Sélectionner un département', 'make-default-department' => 'Marquer comme département par défaut du système', /* |-------------------------------------- diff --git a/resources/lang/nl/lang.php b/resources/lang/nl/lang.php index f4466ea93..78f50247e 100644 --- a/resources/lang/nl/lang.php +++ b/resources/lang/nl/lang.php @@ -852,7 +852,6 @@ return [ 'the_associated_helptopic_has_been_deactivated' => 'Het gerelateerde help-onderwerp is uitgeschakeld', 'department_deleted_sucessfully' => 'Afdeling succesvol verwijderd', 'department_can_not_delete' => 'Afdeling kan niet verwijderd worden', - 'select_a_department' => 'Selecteer een afdeling', 'make-default-department' => 'Maak hier de standaard afdeling van', /* |-------------------------------------- diff --git a/resources/lang/pt/lang.php b/resources/lang/pt/lang.php index 4ceece5be..6660b2f70 100644 --- a/resources/lang/pt/lang.php +++ b/resources/lang/pt/lang.php @@ -788,7 +788,6 @@ return [ 'the_associated_helptopic_has_been_deactivated' => 'O tópico de ajuda associado foi desativado', 'department_deleted_sucessfully' => 'Departamento deletado com sucesso', 'department_can_not_delete' => 'Departamento não pode ser deletado', - 'select_a_department' => 'Selecione um departamento', 'make-default-department' => 'Criar departamento padrão', /* |-------------------------------------- From 36bcf0af30e7f5c070973723634ccb6390d186c6 Mon Sep 17 00:00:00 2001 From: Luca Volpones Date: Wed, 8 Nov 2017 17:56:11 +0100 Subject: [PATCH 5/5] Fix #5 --- resources/lang/en/lang.php | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index 06f7d0fb3..df908fa82 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -756,7 +756,6 @@ return [ 'edit' => 'Edit', 'departments' => 'Departments', 'groups' => 'Groups', - 'select_a_time_zone' => 'Select a time zone', 'time_zones' => 'Time zones', /* |--------------------------------------