git push origin developMerge branch 'Diciannove-langtool' into develop

dev/translation/sanity_check_en_langfiles.php

@@ -0,0 +1,60 @@
+<?php
+/* Copyright (c) 2015 Lorenzo Novaro <novalore@19.coop>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// directory containing the english lang files
+$workdir = "../../htdocs/langs/en_US/";
+
+$files = scandir($workdir);
+$exludefiles = array('.','..','README');
+$files = array_diff($files,$exludefiles);
+$langstrings_3d = array();
+$langstrings_full = array();
+foreach ($files AS $file) {
+	$path_file = pathinfo($file);
+	// we're only interested in .lang files
+	if ($path_file['extension']=='lang') {
+		$content = file($workdir.$file);
+		foreach ($content AS $line => $row) {
+			// don't want comment lines
+			if (substr($row,0,1) !== '#') {
+				// don't want lines without the separator (why should those even be here, anyway...)
+				if (strpos($row,'=')!==false) {
+					$row_array = explode('=',$row);
+					$langstrings_3d[$path_file['basename']][$line+1]=$row_array[0];
+					$langstrings_full[]=$row_array[0];
+				}				
+			}
+		}
+	}
+}
+
+foreach ($langstrings_3d AS $filename => $file) {
+	foreach ($file AS $linenum => $value) {
+		$keys = array_keys($langstrings_full, $value);
+		if (count($keys)>1) {
+				foreach ($keys AS $key) {
+					$dups[$value][$filename][$linenum] = '';
+				}
+		}
+	}
+}
+
+echo "<h2>Duplicate strings in lang files in $workdir</h2>";
+echo "<pre>";
+print_r($dups);
+
+?>

htdocs/langs/en_US/admin.lang

@@ -1077,7 +1077,7 @@ TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
+OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
 ConditionIsCurrently=Condition is currently %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
@@ -1594,7 +1594,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
+Opened=Open
 Closed=Closed
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)

htdocs/langs/en_US/agenda.lang

@@ -55,7 +55,6 @@ OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
-OrderCanceledInDolibarr=Order %s canceled
 ProposalSentByEMail=Commercial proposal %s sent by EMail
 OrderSentByEMail=Customer order %s sent by EMail
 InvoiceSentByEMail=Customer invoice %s sent by EMail

htdocs/langs/en_US/askpricesupplier.lang

@@ -9,7 +9,7 @@ CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
 LastModifiedRequests=Last %s modified price requests
-RequestsOpened=Opened price requests
+RequestsOpened=Open price requests
 AskPriceSupplierArea=Area price requests suppliers
 Askpricesupplier=Price request supplier
 NewAskPrice=New price request
@@ -26,7 +26,7 @@ DeleteAsk=Delete request
 ValidateAsk=Validate request
 AddAsk=Create a request
 AskpricesupplierDraft=Drafts
-AskpricesupplierOpened=Opened
+AskpricesupplierOpened=Open
 AskpricesupplierStatusDraft=Draft (needs to be validated)
 AskpricesupplierStatusValidated=Validated (request is open)
 AskpricesupplierStatusOpened=Validated (request is open)
@@ -35,7 +35,7 @@ AskpricesupplierStatusSigned=Accepted
 AskpricesupplierStatusNotSigned=Refused
 AskpricesupplierStatusDraftShort=Draft
 AskpricesupplierStatusValidatedShort=Validated
-AskpricesupplierStatusOpenedShort=Opened
+AskpricesupplierStatusOpenedShort=Open
 AskpricesupplierStatusClosedShort=Closed
 AskpricesupplierStatusSignedShort=Accepted
 AskpricesupplierStatusNotSignedShort=Refused

htdocs/langs/en_US/banks.lang

@@ -94,12 +94,12 @@ Conciliate=Reconcile
 Conciliation=Reconciliation
 ConciliationForAccount=Reconcile this account
 IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only opened accounts
+OnlyOpenedAccount=Only open accounts
 AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
-StatusAccountOpened=Opened
+StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
 EditBankRecord=Edit record

htdocs/langs/en_US/bills.lang

@@ -430,5 +430,5 @@ NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=No open situations
 InvoiceSituationLast=Final and general invoice

htdocs/langs/en_US/boxes.lang

@@ -19,7 +19,7 @@ BoxLastContracts=Last contracts
 BoxLastContacts=Last contacts/addresses
 BoxLastMembers=Last members
 BoxFicheInter=Last interventions
-BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Open accounts balance
 BoxSalesTurnover=Sales turnover
 BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices
 BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Last %s modified intervention
 BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
 BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleCurrentAccounts=Open accounts balances
 BoxTitleSalesTurnover=Sales turnover
 BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
 BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices

htdocs/langs/en_US/categories.lang

@@ -42,19 +42,19 @@ ImpossibleAddCat=Impossible to add the tag/category
 ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=<b>%s</b> was added successfully.
 ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added with success.  
+CategorySuccessfullyCreated=This tag/category %s has been added successfully.
-ProductIsInCategories=Product/service owns to following tags/categories
+ProductIsInCategories=Product/service is linked to following tags/categories
-SupplierIsInCategories=Third party owns to following suppliers tags/categories
+SupplierIsInCategories=Third party is linked to following suppliers tags/categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
-MemberIsInCategories=This member owns to following members tags/categories 
+MemberIsInCategories=This member is linked to following members tags/categories
-ContactIsInCategories=This contact owns to following contacts tags/categories
+ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
 SupplierHasNoCategory=This supplier is not in any tags/categories
 CompanyHasNoCategory=This company is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Classify in tag/category
+ClassifyInCategory=Add to tag/category
 NoneCategory=None
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -67,13 +67,13 @@ ContentsNotVisibleByAllShort=Contents not visible by all
 CategoriesTree=Tags/categories tree
 DeleteCategory=Delete tag/category
 ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategory=Remove link with tag/category
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
 NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tags/category
+SuppliersCategoryShort=Suppliers tag/category
-CustomersCategoryShort=Customers tags/category
+CustomersCategoryShort=Customers tag/category
-ProductsCategoryShort=Products tags/category
+ProductsCategoryShort=Products tag/category
-MembersCategoryShort=Members tags/category
+MembersCategoryShort=Members tag/category
 SuppliersCategoriesShort=Suppliers tags/categories
 CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories

htdocs/langs/en_US/cron.lang

@@ -26,11 +26,11 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Scheduled job
+CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
 CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronWaitingJobs=Waiting jobs
 CronTask=Job
@@ -39,8 +39,8 @@ CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
 CronDtLastLaunch=Last execution
-CronFrequency=Frequancy
+CronFrequency=Frequency
-CronClass=Classe
+CronClass=Class
 CronMethod=Method
 CronModule=Module
 CronAction=Action
@@ -55,7 +55,7 @@ CronEach=Every
 JobFinished=Job launched and finished
 #Page card
 CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
+CronHourStart= Start hour and date of task
 CronEvery= And execute task each
 CronObject= Instance/Object to create
 CronArgs=Parameters
@@ -79,10 +79,10 @@ CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
-CronType=Task type
+CronType=Job type
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
 CronMenu=Cron
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+TaskDisabled=Job disabled

htdocs/langs/en_US/main.lang

@@ -421,7 +421,7 @@ Reportings=Reporting
 Draft=Draft
 Drafts=Drafts
 Validated=Validated
-Opened=Opened
+Opened=Open
 New=New
 Discount=Discount
 Unknown=Unknown

htdocs/langs/en_US/orders.lang

@@ -75,8 +75,8 @@ AddToMyOrders=Add to my orders
 AddToOtherOrders=Add to other orders
 AddToDraftOrders=Add to draft order
 ShowOrder=Show order
-NoOpenedOrders=No opened orders
+NoOpenedOrders=No open orders
-NoOtherOpenedOrders=No other opened orders
+NoOtherOpenedOrders=No other open orders
 NoDraftOrders=No draft orders
 OtherOrders=Other orders
 LastOrders=Last %s customer orders

htdocs/langs/en_US/printing.lang

@@ -49,7 +49,6 @@ PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
 PRINTIPP_PASSWORD=Password
 NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer

htdocs/langs/en_US/products.lang

@@ -44,7 +44,7 @@ CardProduct1=Service card
 CardContract=Contract card
 Warehouse=Warehouse
 Warehouses=Warehouses
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 Stock=Stock
 Stocks=Stocks

htdocs/langs/en_US/projects.lang

@@ -11,7 +11,7 @@ ProjectsPublicDesc=This view presents all projects you are allowed to read.
 ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
 ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
 MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
 TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
 TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on.
@@ -29,7 +29,7 @@ ProjectsList=List of projects
 ShowProject=Show project
 SetProject=Set project
 NoProject=No project defined or owned
-NbOpenTasks=Nb of opened tasks
+NbOpenTasks=Nb of open tasks
 NbOfProjects=Nb of projects
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
@@ -41,7 +41,7 @@ TaskTimeSpent=Time spent on tasks
 TaskTimeUser=User
 TaskTimeNote=Note
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
+TasksOnOpenedProject=Tasks on open projects
 WorkloadNotDefined=Workload not defined
 NewTimeSpent=New time spent
 MyTimeSpent=My time spent
@@ -95,7 +95,7 @@ DeleteATimeSpent=Delete time spent
 ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
 DoNotShowMyTasksOnly=See also tasks not assigned to me
 ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Ressources
+TaskRessourceLinks=Resources
 ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
 NoTasks=No tasks for this project
 LinkedToAnotherCompany=Linked to other third party
@@ -139,7 +139,7 @@ ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+FirstAddRessourceToAllocateTime=Associate a resource to allocate time
 InputPerDay=Input per day 
 InputPerWeek=Input per week 
 InputPerAction=Input per action

htdocs/langs/en_US/propal.lang

@@ -4,7 +4,7 @@ Proposal=Commercial proposal
 ProposalShort=Proposal
 ProposalsDraft=Draft commercial proposals
 ProposalDraft=Draft commercial proposal
-ProposalsOpened=Opened commercial proposals
+ProposalsOpened=Open commercial proposals
 Prop=Commercial proposals
 CommercialProposal=Commercial proposal
 CommercialProposals=Commercial proposals
@@ -31,7 +31,7 @@ AmountOfProposalsByMonthHT=Amount by month (net of tax)
 NbOfProposals=Number of commercial proposals
 ShowPropal=Show proposal
 PropalsDraft=Drafts
-PropalsOpened=Opened
+PropalsOpened=Open
 PropalsNotBilled=Closed not billed
 PropalStatusDraft=Draft (needs to be validated)
 PropalStatusValidated=Validated (proposal is open)
@@ -42,7 +42,7 @@ PropalStatusNotSigned=Not signed (closed)
 PropalStatusBilled=Billed
 PropalStatusDraftShort=Draft
 PropalStatusValidatedShort=Validated
-PropalStatusOpenedShort=Opened
+PropalStatusOpenedShort=Open
 PropalStatusClosedShort=Closed
 PropalStatusSignedShort=Signed
 PropalStatusNotSignedShort=Not signed
@@ -51,8 +51,8 @@ PropalsToClose=Commercial proposals to close
 PropalsToBill=Signed commercial proposals to bill
 ListOfProposals=List of commercial proposals
 ActionsOnPropal=Events on proposal
-NoOpenedPropals=No opened commercial proposals
+NoOpenedPropals=No open commercial proposals
-NoOtherOpenedPropals=No other opened commercial proposals
+NoOtherOpenedPropals=No other open commercial proposals
 RefProposal=Commercial proposal ref
 SendPropalByMail=Send commercial proposal by mail
 AssociatedDocuments=Documents associated with the proposal:

htdocs/langs/en_US/sendings.lang

@@ -65,10 +65,10 @@ ShipmentLine=Shipment line
 CarrierList=List of transporters
 SendingRunning=Product from ordered customer orders
 SuppliersReceiptRunning=Product from ordered supplier orders
-ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
+ProductQtyInCustomersOrdersRunning=Product quantity into open customers orders
-ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
+ProductQtyInSuppliersOrdersRunning=Product quantity into open suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
+ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open supplier order already received
 
 # Sending methods
 SendingMethodCATCH=Catch by customer

htdocs/langs/en_US/stocks.lang

@@ -5,7 +5,7 @@ Warehouses=Warehouses
 NewWarehouse=New warehouse / Stock area
 WarehouseEdit=Modify warehouse
 MenuNewWarehouse=New warehouse
-WarehouseOpened=Warehouse opened
+WarehouseOpened=Warehouse open
 WarehouseClosed=Warehouse closed
 WarehouseSource=Source warehouse
 WarehouseSourceNotDefined=No warehouse defined,
@@ -135,5 +135,5 @@ MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
 InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order
+NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).

htdocs/langs/en_US/trips.lang

@@ -44,7 +44,6 @@ TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
 AucuneNDF=No expense reports found for this criteria
 AucuneLigne=There is no expense report declared yet
 AddLine=Add a line

htdocs/langs/en_US/workflow.lang

@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin 
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interested in.
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow to modify for the activated module.
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICEAutomatically create a customer invoice after a commercial proposal is signed