From 330f008a953b85d0c8671e9be2a8d17b1852605e Mon Sep 17 00:00:00 2001 From: Nuno Miguel Reis Date: Tue, 17 Sep 2013 16:48:23 +0000 Subject: [PATCH] fixed some typos Conflicts: fusionpbx/app/adminer/app_config.php fusionpbx/app/gateways/app_languages.php fusionpbx/app/ring_groups/app_languages.php fusionpbx/app/voicemails/app_languages.php fusionpbx/core/user_settings/app_languages.php --- app/adminer/app_config.php | 4 ++-- app/gateways/app_languages.php | 8 ++++---- app/ring_groups/app_languages.php | 4 ++-- app/voicemails/app_languages.php | 8 ++++---- core/user_settings/app_languages.php | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/adminer/app_config.php b/app/adminer/app_config.php index 5f2d5793cd..87635b5231 100644 --- a/app/adminer/app_config.php +++ b/app/adminer/app_config.php @@ -15,7 +15,7 @@ $apps[$x]['description']['fr'] = 'Adminer (précédemment phpMinAdmin) est un outil gestion de base de données complet écrite en php. Adminer est disponible pour MySQL, PostgreSQL, SQLite, MS SQL et Oracle.'; $apps[$x]['description']['fr-ca'] = ''; $apps[$x]['description']['fr-ch'] = ''; - $apps[$x]['description']['pt-pt'] = 'Adminer (anteriormente phpMinAdmin) é uma completa ferramenta de gestão de banco de dados escrito em PHP. Adminer está disponível para MySQL, PostgreSQL, SQLite, MS SQL e Oracle.'; + $apps[$x]['description']['pt-pt'] = 'Adminer (anteriormente phpMinAdmin) é uma ferramenta completa para gestão de bases de dados escrita em PHP. O Adminer está disponível para MySQL, PostgreSQL, SQLite, MS SQL e Oracle.'; $apps[$x]['description']['pt-br'] = ''; //menu details @@ -39,4 +39,4 @@ $apps[$x]['permissions'][0]['name'] = 'adminer'; $apps[$x]['permissions'][0]['groups'][] = 'superadmin'; -?> \ No newline at end of file +?> diff --git a/app/gateways/app_languages.php b/app/gateways/app_languages.php index cc6026c76e..eea83f677c 100644 --- a/app/gateways/app_languages.php +++ b/app/gateways/app_languages.php @@ -62,7 +62,7 @@ $text['description-realm']['en-us'] = 'Enter the realm here.'; $text['description-realm']['pt-pt'] = ''; - $text['description-realm']['pt-pt'] = "Insérer le Royaume d'authentification"; + $text['description-realm']['fr'] = "Insérer le Royaume d'authentification"; $text['label-from_user']['en-us'] = 'From User'; $text['label-from_user']['pt-pt'] = ''; @@ -106,7 +106,7 @@ $text['label-expire_seconds']['en-us'] = 'Expire Seconds'; $text['label-expire_seconds']['pt-pt'] = ''; - $text['label-expire_seconds']['pt-pt'] = "Tempo d'expiration"; + $text['label-expire_seconds']['fr'] = "Tempo d'expiration"; $text['description-expire_seconds']['en-us'] = 'Enter the expire-seconds here.'; $text['description-expire_seconds']['pt-pt'] = ''; @@ -165,7 +165,7 @@ $text['label-supress_cng']['fr'] = 'suppression du silence'; $text['description-supress_cng']['en-us'] = 'Enter the supress-cng'; - $text['description-supress_cng']['pt-pt'] = "Afin de sauvegarder de la bande passante RTP, on n'envoit pas de RTP pour le silence."; + $text['description-supress_cng']['fr'] = "Afin de sauvegarder de la bande passante RTP, on n'envoit pas de RTP pour le silence."; $text['label-sip_cid_type']['en-us'] = 'Sip CID Type'; $text['label-sip_cid_type']['pt-pt'] = ''; @@ -315,4 +315,4 @@ $text['message-required']['pt-pt'] = ''; $text['message-required']['fr'] = "Merci d'indiquer: "; -?> \ No newline at end of file +?> diff --git a/app/ring_groups/app_languages.php b/app/ring_groups/app_languages.php index 7d0a80a19a..819d9b80b2 100644 --- a/app/ring_groups/app_languages.php +++ b/app/ring_groups/app_languages.php @@ -100,7 +100,7 @@ $text['message-enabled']['en-us'] = 'Please provide: Enabled'; $text['message-enabled']['pt-pt'] = ''; - $text['message-enabled']['pt-pt'] = "Merci d'indiquer: Actif"; + $text['message-enabled']['fr'] = "Merci d'indiquer: Actif"; $text['message-add']['en-us'] = 'Add Complete'; $text['message-add']['pt-pt'] = ''; @@ -290,4 +290,4 @@ $text['option-disabled']['pt-pt'] = ''; $text['option-disabled']['fr'] = 'Désactivé'; -?> \ No newline at end of file +?> diff --git a/app/voicemails/app_languages.php b/app/voicemails/app_languages.php index 5285f40009..1fcc679003 100644 --- a/app/voicemails/app_languages.php +++ b/app/voicemails/app_languages.php @@ -11,7 +11,7 @@ $text['description-voicemail']['en-us'] = 'Voicemail settings.'; $text['description-voicemail']['pt-pt'] = ''; - $text['description-voicemail']['pt-pt'] = 'Configuration messagerie.'; + $text['description-voicemail']['fr'] = 'Configuration messagerie.'; $text['label-voicemail_id']['en-us'] = 'Voicemail ID'; $text['label-voicemail_id']['pt-pt'] = ''; @@ -19,7 +19,7 @@ $text['description-voicemail_id']['en-us'] = 'Enter the Voicemail ID'; $text['description-voicemail_id']['pt-pt'] = ''; - $text['description-voicemail_id']['pt-pt'] = "Choisir l'indentifiant de la messagerie vocale."; + $text['description-voicemail_id']['fr'] = "Choisir l'indentifiant de la messagerie vocale."; $text['label-voicemail_password']['en-us'] = 'Password'; $text['label-voicemail_password']['pt-pt'] = ''; @@ -29,7 +29,6 @@ $text['description-voicemail_password']['pt-pt'] = ''; $text['description-voicemail_password']['fr'] = ''; - $text['label-greeting_id']['en-us'] = 'Greeting ID'; $text['label-greeting_id']['pt-pt'] = ''; $text['label-greeting_id']['fr'] = 'ID de Salutation'; @@ -236,6 +235,7 @@ $text['label-message_status']['fr'] = 'Etat'; $text['description-message_status']['en-us'] = 'Status'; + $text['description-message_status']['pt-pt'] = 'Estado'; $text['description-message_status']['fr'] = 'Etat'; $text['label-message_priority']['en-us'] = 'Priority'; @@ -246,4 +246,4 @@ $text['description-message_priority']['pt-pt'] = ''; $text['description-message_priority']['fr'] = 'Priorité'; -?> \ No newline at end of file +?> diff --git a/core/user_settings/app_languages.php b/core/user_settings/app_languages.php index a93c71008d..ef73b52605 100644 --- a/core/user_settings/app_languages.php +++ b/core/user_settings/app_languages.php @@ -102,7 +102,7 @@ $text['label-view-messages']['en-us'] = 'View Messages'; $text['label-view-messages']['pt-pt'] = 'Ver Mensagens'; - $text['label-view-messages']['fr-fr'] = 'Voir les messages'; + $text['label-view-messages']['fr'] = 'Voir les messages'; $text['table-extension']['en-us'] = 'Extension'; $text['table-extension']['pt-pt'] = 'Extensão'; @@ -127,4 +127,4 @@ $text['label-dnd']['en-us'] = 'Do Not Disturb'; $text['label-dnd']['pt-pt'] = 'Não Perturbar'; $text['label-dnd']['fr'] = 'Ne Pas Déranger'; -?> \ No newline at end of file +?>