lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Regis Houssin 2012-07-08 12:19:12 +02:00
commit 3ca844b3df
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/exe/doliwamp/doliwamp.iss
View File

@ -22,8 +22,8 @@ AppVerName=DoliWamp-3.3.0-alpha
OutputBaseFilename=DoliWamp-3.3.0-alpha OutputBaseFilename=DoliWamp-3.3.0-alpha
; Define full path from wich all relative path are defined ; Define full path from wich all relative path are defined
; You must modify this to put here your dolibarr root directory ; You must modify this to put here your dolibarr root directory
;SourceDir=C:\Documents and Settings\ldestail\git\dolibarrold ;SourceDir=C:\Documents and Settings\ldestail\git\dolibarr_old
SourceDir=Z:\home\ldestail\git\dolibarrold SourceDir=Z:\home\ldestail\git\dolibarr_old
; ----- End of change ; ----- End of change
;OutputManifestFile=build\doliwampbuild.log ;OutputManifestFile=build\doliwampbuild.log
AppId=doliwamp AppId=doliwamp

3
htdocs/langs/de_DE/dict.lang
View File

@ -257,8 +257,9 @@ CountryMF=Saint Martin
##### Civilities ##### ##### Civilities #####
CivilityMME=Frau CivilityMME=Frau
CivilityMR=Herr CivilityMR=Herr
CivilityMLE=Frau CivilityMLE=Fräulein
CivilityMTRE=Professor CivilityMTRE=Professor
CivilityDR=Doktor
##### Currencies ##### ##### Currencies #####
Currencyeuros=Euro Currencyeuros=Euro