Skip to content
Snippets Groups Projects
Commit ef4bdcdb authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge remote-tracking branch 'origin/3.7' into develop

parents 01209ff8 86e04cb6
No related branches found
No related tags found
No related merge requests found
Showing
with 129 additions and 88 deletions
#!/bin/sh
# Helps find duplicate translation keys in language files
#
# Copyright (C) 2014 Raphaël Doursenaud - rdoursenaud@gpcsolutions.fr
for file in `find . -type f`
do
dupes=$(
sed "s/^\s*//" "$file" | # Remove any leading whitespace
sed "s/\s*\=/=/" | # Remove any whitespace before =
grep -Po "(^.*?)=" | # Non greedeely match everything before =
sed "s/\=//" | # Remove trailing = so we get the key
sort | uniq -d # Find duplicates
)
if [ -n "$dupes" ]
then
echo "Duplicates found in $file"
echo "$dupes"
fi
done
#!/bin/sh #!/bin/sh
#------------------------------------------------------ #------------------------------------------------------
# Script to find files that are not Unix encoded # Detect files that does not contains any tab inside
# #
# Laurent Destailleur - eldy@users.sourceforge.net # Laurent Destailleur - eldy@users.sourceforge.net
#------------------------------------------------------ #------------------------------------------------------
......
#!/bin/sh
# Helps find duplicate translation keys in language files
#
# Copyright (C) 2014 Raphaël Doursenaud - rdoursenaud@gpcsolutions.fr
# Syntax
if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
then
echo "Usage: detectduplicatelangkey.sh (list|fix)"
fi
if [ "x$1" = "xlist" ]
then
for file in `find htdocs/langs/en_US -name *.lang -type f`
do
dupes=$(
sed "s/^\s*//" "$file" | # Remove any leading whitespace
sed "s/\s*\=/=/" | # Remove any whitespace before =
grep -Po "(^.*?)=" | # Non greedeely match everything before =
sed "s/\=//" | # Remove trailing = so we get the key
sort | uniq -d # Find duplicates
)
if [ -n "$dupes" ]
then
echo "Duplicates found in $file"
echo "$dupes"
fi
done
fi
# To convert
if [ "x$1" = "xfix" ]
then
echo Feature not implemented. Please fix files manually.
fi
...@@ -10,6 +10,7 @@ INPLACE='0' ...@@ -10,6 +10,7 @@ INPLACE='0'
max_input_size=0 max_input_size=0
max_output_size=0 max_output_size=0
usage() usage()
{ {
cat <<EO cat <<EO
...@@ -37,7 +38,8 @@ optimize_image() ...@@ -37,7 +38,8 @@ optimize_image()
max_input_size=$(expr $max_input_size + $input_file_size) max_input_size=$(expr $max_input_size + $input_file_size)
if [ "${1##*.}" = "png" ]; then if [ "${1##*.}" = "png" ]; then
optipng -o1 -clobber -quiet $1 -out $2.firstpass #optipng -o1 -clobber -quiet $1 -out $2.firstpass
optipng -o1 -quiet $1 -out $2.firstpass
pngcrush -q -rem alla -reduce $2.firstpass $2 >/dev/null pngcrush -q -rem alla -reduce $2.firstpass $2 >/dev/null
rm -fr $2.firstpass rm -fr $2.firstpass
fi fi
...@@ -67,6 +69,25 @@ get_max_file_length() ...@@ -67,6 +69,25 @@ get_max_file_length()
main() main()
{ {
test=`type pngcrush >/dev/null 2>&1`
result=$?
if [ "x$result" == "x1" ]; then
echo "Tool pngcrush not found" && exit
fi
test=`type optipng >/dev/null 2>&1`
result=$?
if [ "x$result" == "x1" ]; then
echo "Tool optipng not found" && exit
fi
test=`type jpegtran >/dev/null 2>&1`
result=$?
if [ "x$result" == "x1" ]; then
echo "Tool jpegtran not found" && exit
fi
# If $INPUT is empty, then we use current directory # If $INPUT is empty, then we use current directory
if [[ "$INPUT" == "" ]]; then if [[ "$INPUT" == "" ]]; then
INPUT=$(pwd) INPUT=$(pwd)
...@@ -81,6 +102,8 @@ main() ...@@ -81,6 +102,8 @@ main()
OUTPUT='/tmp/optimize' OUTPUT='/tmp/optimize'
fi fi
echo "Mode is $INPLACE (1=Images are replaced, 0=New images are stored into $OUTPUT)"
# We create the output directory # We create the output directory
mkdir -p $OUTPUT mkdir -p $OUTPUT
...@@ -96,6 +119,7 @@ main() ...@@ -96,6 +119,7 @@ main()
# Search of all jpg/jpeg/png in $INPUT # Search of all jpg/jpeg/png in $INPUT
# We remove images from $OUTPUT if $OUTPUT is a subdirectory of $INPUT # We remove images from $OUTPUT if $OUTPUT is a subdirectory of $INPUT
echo "Scan $INPUT to find images"
IMAGES=$(find $INPUT -regextype posix-extended -regex '.*\.(jpg|jpeg|png)' | grep -v $OUTPUT) IMAGES=$(find $INPUT -regextype posix-extended -regex '.*\.(jpg|jpeg|png)' | grep -v $OUTPUT)
if [ "$QUIET" == "0" ]; then if [ "$QUIET" == "0" ]; then
...@@ -103,6 +127,7 @@ main() ...@@ -103,6 +127,7 @@ main()
echo echo
fi fi
for CURRENT_IMAGE in $IMAGES; do for CURRENT_IMAGE in $IMAGES; do
echo "Process $CURRENT_IMAGE"
filename=$(basename $CURRENT_IMAGE) filename=$(basename $CURRENT_IMAGE)
if [ "$QUIET" == "0" ]; then if [ "$QUIET" == "0" ]; then
printf '%s ' "$filename" printf '%s ' "$filename"
...@@ -155,6 +180,13 @@ SHORTOPTS="h,i:,o:,q,s,p" ...@@ -155,6 +180,13 @@ SHORTOPTS="h,i:,o:,q,s,p"
LONGOPTS="help,input:,output:,quiet,no-stats,inplace" LONGOPTS="help,input:,output:,quiet,no-stats,inplace"
ARGS=$(getopt -s bash --options $SHORTOPTS --longoptions $LONGOPTS --name $PROGNAME -- "$@") ARGS=$(getopt -s bash --options $SHORTOPTS --longoptions $LONGOPTS --name $PROGNAME -- "$@")
# Syntax
if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
then
echo "Usage: optimize_images.sh (list|fix) -i dirtoscan"
exit
fi
eval set -- "$ARGS" eval set -- "$ARGS"
while true; do while true; do
case $1 in case $1 in
...@@ -191,5 +223,11 @@ while true; do ...@@ -191,5 +223,11 @@ while true; do
shift shift
done done
# To convert
if [ "x$1" = "xlist" ]
then
INPLACE=0
fi
main main
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
...@@ -1039,7 +1039,6 @@ YesInSummer=Yes in summer ...@@ -1039,7 +1039,6 @@ 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 opened to external users (whatever are permission of such users):
SuhosinSessionEncrypt=Session storage encrypted by Suhosin SuhosinSessionEncrypt=Session storage encrypted by Suhosin
ConditionIsCurrently=Condition is currently %s ConditionIsCurrently=Condition is currently %s
TestNotPossibleWithCurrentBrowsers=Automatic detection not possible
YouUseBestDriver=You use driver %s that is best driver available currently. YouUseBestDriver=You use driver %s that is best driver available currently.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
...@@ -1548,7 +1547,6 @@ MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your ...@@ -1548,7 +1547,6 @@ MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your
NbMajMin=Minimum number of uppercase characters NbMajMin=Minimum number of uppercase characters
NbNumMin=Minimum number of numeric characters NbNumMin=Minimum number of numeric characters
NbSpeMin=Minimum number of special characters NbSpeMin=Minimum number of special characters
NbSpeMin=Minimum number of special characters
NbIteConsecutive=Maximum number of repeating same characters NbIteConsecutive=Maximum number of repeating same characters
NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
SalariesSetup=Setup of module salaries SalariesSetup=Setup of module salaries
......
...@@ -137,8 +137,6 @@ BillFrom=From ...@@ -137,8 +137,6 @@ BillFrom=From
BillTo=To BillTo=To
ActionsOnBill=Actions on invoice ActionsOnBill=Actions on invoice
NewBill=New invoice NewBill=New invoice
Prélèvements=Standing order
Prélèvements=Standing orders
LastBills=Last %s invoices LastBills=Last %s invoices
LastCustomersBills=Last %s customers invoices LastCustomersBills=Last %s customers invoices
LastSuppliersBills=Last %s suppliers invoices LastSuppliersBills=Last %s suppliers invoices
...@@ -219,7 +217,6 @@ NoInvoice=No invoice ...@@ -219,7 +217,6 @@ NoInvoice=No invoice
ClassifyBill=Classify invoice ClassifyBill=Classify invoice
SupplierBillsToPay=Suppliers invoices to pay SupplierBillsToPay=Suppliers invoices to pay
CustomerBillsUnpaid=Unpaid customers invoices CustomerBillsUnpaid=Unpaid customers invoices
DispenseMontantLettres=The bill drafted by mechanographical are exempt from the order in letters
DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
NonPercuRecuperable=Non-recoverable NonPercuRecuperable=Non-recoverable
SetConditions=Set payment terms SetConditions=Set payment terms
......
...@@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories ...@@ -101,9 +101,6 @@ CatSupLinks=Links between suppliers and categories
CatCusLinks=Links between customers/prospects and categories CatCusLinks=Links between customers/prospects and categories
CatProdLinks=Links between products/services and categories CatProdLinks=Links between products/services and categories
CatMemberLinks=Links between members and categories CatMemberLinks=Links between members and categories
CatProdLinks=Products
CatCusLinks=Customer/Prospects
CatSupLinks=Suppliers
DeleteFromCat=Remove from category DeleteFromCat=Remove from category
DeletePicture=Picture delete DeletePicture=Picture delete
ConfirmDeletePicture=Confirm picture deletion? ConfirmDeletePicture=Confirm picture deletion?
......
# Dolibarr language file - Source file is en_US - contracts # Dolibarr language file - Source file is en_US - contracts
ContractsArea=Contracts area ContractsArea=Contracts area
ListOfContracts=List of contracts ListOfContracts=List of contracts
LastContracts=Last %s modified contracts LastModifiedContracts=Last %s modified contracts
AllContracts=All contracts AllContracts=All contracts
ContractCard=Contract card ContractCard=Contract card
ContractStatus=Contract status ContractStatus=Contract status
......
...@@ -18,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman ...@@ -18,9 +18,8 @@ CronExplainHowToRunUnix=On Unix environment you should use crontab to run Comman
CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run Command line each minutes
# Menu # Menu
CronJobs=Scheduled jobs CronJobs=Scheduled jobs
CronListActive= List of active jobs CronListActive=List of active/scheduled jobs
CronListInactive=List of disabled jobs CronListInactive=List of disabled jobs
CronListActive= List of scheduled jobs
# Page list # Page list
CronDateLastRun=Last run CronDateLastRun=Last run
CronLastOutput=Last run output CronLastOutput=Last run output
......
...@@ -53,7 +53,7 @@ ShippingExist=A shipment exists ...@@ -53,7 +53,7 @@ ShippingExist=A shipment exists
DraftOrWaitingApproved=Draft or approved not yet ordered DraftOrWaitingApproved=Draft or approved not yet ordered
DraftOrWaitingShipped=Draft or validated not yet shipped DraftOrWaitingShipped=Draft or validated not yet shipped
MenuOrdersToBill=Orders delivered MenuOrdersToBill=Orders delivered
MenuOrdersToBill2=Orders to bill MenuOrdersToBill2=Billable orders
SearchOrder=Search order SearchOrder=Search order
SearchACustomerOrder=Search a customer order SearchACustomerOrder=Search a customer order
ShipProduct=Ship product ShipProduct=Ship product
...@@ -154,7 +154,6 @@ OrderByPhone=Phone ...@@ -154,7 +154,6 @@ OrderByPhone=Phone
CreateInvoiceForThisCustomer=Bill orders CreateInvoiceForThisCustomer=Bill orders
NoOrdersToInvoice=No orders billable NoOrdersToInvoice=No orders billable
CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
MenuOrdersToBill2=Billables orders
OrderCreation=Order creation OrderCreation=Order creation
Ordered=Ordered Ordered=Ordered
OrderCreated=Your orders have been created OrderCreated=Your orders have been created
......
...@@ -16,11 +16,8 @@ ResourceType=Resource type ...@@ -16,11 +16,8 @@ ResourceType=Resource type
ResourceFormLabel_description=Resource description ResourceFormLabel_description=Resource description
ResourcesLinkedToElement=Resources linked to element ResourcesLinkedToElement=Resources linked to element
RessourceLineSuccessfullyUpdated=Resource successfully updated
RessourceLineSuccessfullyDeleted=Resource successfully deleted
ShowResourcePlanning=Show resource planning ShowResourcePlanning=Show resource planning
NoResourceInDatabase=No resource in database
GotoDate=Go to date GotoDate=Go to date
ResourceElementPage=Element resources ResourceElementPage=Element resources
......
...@@ -63,7 +63,6 @@ ShowGroup=Show group ...@@ -63,7 +63,6 @@ ShowGroup=Show group
ShowUser=Show user ShowUser=Show user
NonAffectedUsers=Non assigned users NonAffectedUsers=Non assigned users
UserModified=User modified successfully UserModified=User modified successfully
GroupModified=Group modified successfully
PhotoFile=Photo file PhotoFile=Photo file
UserWithDolibarrAccess=User with Dolibarr access UserWithDolibarrAccess=User with Dolibarr access
ListOfUsersInGroup=List of users in this group ListOfUsersInGroup=List of users in this group
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment