Merge pull request #945 from zcattacz/translation

zh_cn/admin.lang reworkred

htdocs/langs/en_US/admin.lang

@@ -108,16 +108,16 @@ ParameterInDolibarr=Parameter %s
 LanguageParameter=Language parameter %s
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Localisation parameters
-ClientTZ=Time Zone client (user)
-ClientHour=Hour client (user)
-OSTZ=Time Zone OS server
-PHPTZ=Time Zone PHP server
+ClientTZ=Client Time Zone(user)
+ClientHour=Client time(user)
+OSTZ=Servre OS Time Zone
+PHPTZ=PHP server Time Zone
 PHPServerOffsetWithGreenwich=PHP server offset width Greenwich (seconds)
 ClientOffsetWithGreenwich=Client/Browser offset width Greenwich (seconds)
 DaylingSavingTime=Daylight saving time
-CurrentHour=Hour PHP (server)
-CompanyTZ= Time Zone company (main company)
-CompanyHour= Hour company (main company)
+CurrentHour=PHP Time (server)
+CompanyTZ=Company Time Zone (main company)
+CompanyHour=Company Time(main company)
 CurrentSessionTimeOut=Current session timeout
 OSEnv=OS Environment
 Box=Box
@@ -128,7 +128,7 @@ Position=Order
 MenusDesc=Menus managers define content of the 2 menu bars (horizontal bar and vertical bar). 
 MenusEditorDesc=The menu editor allow you to define personalized entries in menus. Use it carefully to avoid making dolibarr unstable and menu entries permanently unreachable.<br>Some modules add entries in the menus (in menu <b>All</b> in most cases). If you removed some of these entries by mistake, you can restore them by disabling and reenabling the module.
 MenuForUsers=Menu for users
-LangFile=File .lang
+LangFile=.lang file
 System=System
 SystemInfo=System information
 SystemTools=System tools

htdocs/langs/en_US/products.lang

@@ -106,9 +106,9 @@ NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
 CreateCopy=Create copy
 ServiceLimitedDuration=If product is a service with limited duration:
 MultiPricesAbility=Activate the multi-prices
-MultiPricesNumPrices=Number of price
+MultiPricesNumPrices=Number of prices
 MultiPriceLevelsName=Price categories
-AssociatedProductsAbility=Activate the virtual products feature 
+AssociatedProductsAbility=Activate the virtual products feature
 AssociatedProducts=Virtual product
 AssociatedProductsNumber=Number of products composing this virtual product
 ParentProductsNumber=Number of parent virtual product
@@ -142,11 +142,11 @@ NoStockForThisProduct=No stock for this product
 NoStock=No Stock
 Restock=Restock
 ProductSpecial=Special
-QtyMin=Quantity minimum
+QtyMin=Min. Order Qty.
 PriceQty=Price for this quantity
-PriceQtyMin=Price quantity min. (without discount)
+PriceQtyMin=MOQ Price (w/o discount)
 VATRateForSupplierProduct=VAT Rate (for this supplier/product)
-DiscountQtyMin=Discount quantity min. (by default)
+DiscountQtyMin=MOQ Discount (by default)
 NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product
 NoSupplierPriceDefinedForThisProduct=No supplier price/qty defined for this product
 RecordedProducts=Products recorded
@@ -159,7 +159,7 @@ ListProductServiceByPopularity=List of products/services by popularity
 ListProductByPopularity=List of products by popularity
 ListServiceByPopularity=List of services by popularity
 Finished=Manufactured product
-RowMaterial=First material
+RowMaterial=Raw Material
 CloneProduct=Clone product or service
 ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
 CloneContentProduct=Clone all main informations of product/service
@@ -172,8 +172,8 @@ CustomCode=Customs code
 CountryOrigin=Origin country
 HiddenIntoCombo=Hidden into select lists
 Nature=Nature
-ProductCodeModel=Product code model
-ServiceCodeModel=Service code model
+ProductCodeModel=Product code template
+ServiceCodeModel=Service code template
 AddThisProductCard=Create product card
 HelpAddThisProductCard=This option allows you to create or clone a product if it does not exist.
 AddThisServiceCard=Create service card