From 458be3c814120ef60106f77391d8db83bb0f70ea Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Nov 2017 14:38:00 +0100 Subject: [PATCH] Clean translation files --- htdocs/collab/index.php | 2 +- htdocs/langs/en_US/main.lang | 3 +-- htdocs/langs/en_US/other.lang | 2 ++ htdocs/website/index.php | 8 ++++---- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/htdocs/collab/index.php b/htdocs/collab/index.php index c356db8625b..2c056cd0e07 100644 --- a/htdocs/collab/index.php +++ b/htdocs/collab/index.php @@ -177,7 +177,7 @@ if (count($object->records) > 0) // ***** Part for web sites print '
'; - print $langs->trans("Website").': '; + print $langs->trans("WebSite").': '; print '
'; // List of websites diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 979a601fa91..67705d2686d 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -813,7 +813,7 @@ ModuleBuilder=Module Builder SetMultiCurrencyCode=Set currency BulkActions=Bulk actions ClickToShowHelp=Click to show tooltip help -Website=Web site +WebSite=Web site WebSites=Web sites ExpenseReport=Expense report ExpenseReports=Expense reports @@ -823,7 +823,6 @@ AutomaticallyCalculated=Automatically calculated TitleSetToDraft=Go back to draft ConfirmSetToDraft=Are you sure you want to go back to Draft status ? ImportId=Import id -Websites=Web sites Events=Events EMailTemplates=Emails templates FileNotShared=File not shared to exernal public diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index e8ef03d86fb..0d9d1cfbd85 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -214,6 +214,7 @@ StartUpload=Start upload CancelUpload=Cancel upload FileIsTooBig=Files is too big PleaseBePatient=Please be patient... +ResetPassword=Reset password RequestToResetPasswordReceived=A request to change your Dolibarr password has been received NewKeyIs=This is your new keys to login NewKeyWillBe=Your new key to login to software will be @@ -223,6 +224,7 @@ ForgetIfNothing=If you didn't request this change, just forget this email. Your IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart +PassEncoding=Password encoding ##### Export ##### ExportsArea=Exports area diff --git a/htdocs/website/index.php b/htdocs/website/index.php index 2ecd13dbb71..1065a811047 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -1152,7 +1152,7 @@ if (count($object->records) > 0) print ''; print '
'; - print $langs->trans("Website").': '; + print $langs->trans("WebSite").': '; print '
'; // List of website @@ -1306,10 +1306,10 @@ if (count($object->records) > 0) if ($action == 'createfromclone') { // Create an array for form $formquestion = array( - array('type' => 'text', 'name' => 'siteref', 'label'=> $langs->trans("Website") ,'value'=> 'copy_of_'.$object->ref), + array('type' => 'text', 'name' => 'siteref', 'label'=> $langs->trans("WebSite") ,'value'=> 'copy_of_'.$object->ref), //array('type' => 'checkbox', 'name' => 'is_a_translation', 'label' => $langs->trans("SiteIsANewTranslation"), 'value' => 0), //array('type' => 'other','name' => 'newlang','label' => $langs->trans("Language"), 'value' => $formadmin->select_language(GETPOST('newlang', 'az09')?GETPOST('newlang', 'az09'):$langs->defaultlang, 'newlang', 0, null, '', 0, 0, 'minwidth200')), - //array('type' => 'other','name' => 'newwebsite','label' => $langs->trans("Website"), 'value' => $formwebsite->selectWebsite($object->id, 'newwebsite', 0)) + //array('type' => 'other','name' => 'newwebsite','label' => $langs->trans("WebSite"), 'value' => $formwebsite->selectWebsite($object->id, 'newwebsite', 0)) ); $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id='.$object->id, $langs->trans('CloneSite'), '', 'confirm_createfromclone', $formquestion, 0, 1, 200); @@ -1326,7 +1326,7 @@ if (count($object->records) > 0) array('type' => 'text', 'name' => 'pageurl', 'label'=> $langs->trans("WEBSITE_PAGENAME") ,'value'=> 'copy_of_'.$objectpage->pageurl), array('type' => 'checkbox', 'name' => 'is_a_translation', 'label' => $langs->trans("PageIsANewTranslation"), 'value' => 0), array('type' => 'other','name' => 'newlang','label' => $langs->trans("Language"), 'value' => $formadmin->select_language(GETPOST('newlang', 'az09')?GETPOST('newlang', 'az09'):$langs->defaultlang, 'newlang', 0, null, 1, 0, 0, 'minwidth200')), - array('type' => 'other','name' => 'newwebsite','label' => $langs->trans("Website"), 'value' => $formwebsite->selectWebsite($object->id, 'newwebsite', 0)), + array('type' => 'other','name' => 'newwebsite','label' => $langs->trans("WebSite"), 'value' => $formwebsite->selectWebsite($object->id, 'newwebsite', 0)), ); $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?website='.$object->ref.'&pageid=' . $pageid, $langs->trans('ClonePage'), '', 'confirm_createpagefromclone', $formquestion, 0, 1, 300, 550);