2
0
forked from Wavyzz/dolibarr
Commit Graph

57 Commits

Author SHA1 Message Date
Laurent Destailleur
f44a45feb2 Fix: Missing some languages into the transifex sync script.
Trans: Sync language files from transifex.
2013-12-31 12:03:37 +01:00
Laurent Destailleur
0ed2f4b891 Trans: Add usbek language 2013-11-11 22:25:32 +01:00
Laurent Destailleur
94716c5314 Removed not used key 2013-10-23 14:05:26 +02:00
Ricardo Sequeira
4572ff5af5 Improved translation 2013-08-01 23:09:03 +01:00
Laurent Destailleur
012228aca7 Another try to sync with transifex 2013-07-31 16:35:57 +02:00
Laurent Destailleur
314d45a9ee Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/it_IT/admin.lang
	htdocs/langs/nb_NO/admin.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/pt_BR/admin.lang
	htdocs/langs/pt_PT/admin.lang
	htdocs/langs/sl_SI/admin.lang
	htdocs/langs/zh_TW/admin.lang
2013-06-28 00:52:09 +02:00
Laurent Destailleur
b3bdc76da3 Trans: More complete examples 2013-06-26 00:05:00 +02:00
Laurent Destailleur
4c3dcec7b8 Sync with transifex: After this commit, all langs files use same order
of keys than source file (en_US).
Note: Please continue to prefer commiting your change into language
files into git. For the moment transifex does not support conflict
management, diff, versionning, ...
2013-05-27 23:53:06 +02:00
Marcos García
5784cb120a Moved GenbarcodeLocation from products.lang to admin.lang 2013-04-27 12:32:20 +02:00
Laurent Destailleur
e5a945ba5b Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	ChangeLog
	htdocs/admin/propal.php
	htdocs/compta/journal/purchasesjournal.php
	htdocs/compta/journal/sellsjournal.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/modules/mailings/contacts2.modules.php
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/en_US/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/public/demo/index.php
2013-04-14 01:46:33 +02:00
Laurent Destailleur
72f0ca194c Fix: Solve conflict of translation 2013-04-10 19:28:54 +02:00
Laurent Destailleur
4208f11d87 Enhance fixutf8bomfiles and fixdosfiles tools. 2013-03-30 15:57:54 +01:00
Grand Philippe
c5e742278e fix : trad error 2013-03-24 07:11:44 +01:00
Laurent Destailleur
277784af25 New: Start to work on a cron module 2013-03-13 19:55:21 +01:00
Marcos García
ae98ebc793 There is no need to warn the user as the picto already does 2013-01-08 12:14:11 +01:00
Laurent Destailleur
26d3234dc8 Update pt_PT 2012-09-08 15:12:12 +02:00
Laurent Destailleur
d57a54fd04 Fix: Removed deprecated string key 2012-08-10 03:03:52 +02:00
Raphaël Doursenaud
d34c4518d2 Removed BOM from UTF-8 files
Fix: convert line delimiters (regis)

Conflicts:
	htdocs/core/filemanagerdol/browser/default/js/common.js
	htdocs/core/filemanagerdol/browser/default/js/fckxml.js
2012-07-28 19:04:50 +02:00
Marcos García
2204c09e5a Applied commits 16-22 2012-07-27 23:04:05 +02:00
Marcos García
5fd7fcb6c4 Applied commits 1-8 2012-07-27 18:40:06 +02:00
Laurent Destailleur
66ea44886b Fix: Permissions when using web services. 2012-07-22 02:33:21 +02:00
Regis Houssin
6935598ced Fix: optimization 2012-07-11 12:05:43 +02:00
Regis Houssin
d1e80afe62 Fix: move "classify billed propal with order" in workflow manager 2012-07-08 13:19:13 +02:00
Laurent Destailleur
b08848eb5b New: Add a page to explain how to make translations (only on not
complete translation languages)
2012-03-07 14:27:17 +01:00
Laurent Destailleur
e4a5a67b47 Update languages files 2012-02-29 17:51:21 +01:00
Laurent Destailleur
f32733b1df Move NumberWord module translation into module. 2012-01-25 23:16:17 +01:00
Regis Houssin
3338649316 [task #217] Move core files in core directory 2011-10-24 14:11:49 +02:00
eldy
6207b9262b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	dev/translation/langAutoParser.class.php
	htdocs/langs/tr_TR/agenda.lang
	htdocs/langs/tr_TR/boxes.lang
	htdocs/langs/tr_TR/install.lang
	htdocs/langs/tr_TR/other.lang
2011-10-10 15:10:14 +02:00
Laurent Destailleur
22cafc4ed1 New: Can edit prefix of accountancy code 2011-08-27 16:03:47 +00:00
Laurent Destailleur
3ab4e40f3d Fix: focus on login
Fix: Permission number for some modules
2010-10-01 17:59:02 +00:00
Regis Houssin
62927dbbc0 Works on multi-company module
Fix: move language files
2010-09-24 17:06:59 +00:00
Laurent Destailleur
b45c3a3ded Update trad 2010-09-04 00:31:30 +00:00
Laurent Destailleur
849179cb58 Trad: Remove nb_NO translation in non nb_NO files. 2010-09-01 12:47:47 +00:00
Laurent Destailleur
cf21f13ed0 Trad: Update translation files 2010-07-17 11:42:47 +00:00
Laurent Destailleur
abc6e4402f Trad: Update translation files 2010-07-17 10:50:06 +00:00
Laurent Destailleur
86998fa382 Trad: Update translation files 2010-07-17 10:13:00 +00:00
Laurent Destailleur
6f2017e45e Fix: A lot of fix in translations 2010-07-15 20:50:58 +00:00
Laurent Destailleur
83aebbb2ce Fix: Removed a duplicate permission 2010-05-12 12:41:38 +00:00
Laurent Destailleur
d26083e8fe Fix: A lot of fix in translations 2009-12-15 09:27:46 +00:00
Laurent Destailleur
4b1adb053e Fix: Rename protocol SMTPS into SMTP-AUTH as the class SMTPS is not a SSL/TLS class but a SMTP-AUTH class. 2009-10-29 17:43:31 +00:00
Laurent Destailleur
dbfb25379a Trad 2009-09-28 02:53:19 +00:00
Laurent Destailleur
73a4dbd21f Trad: The war against typo errors 2009-08-19 19:18:26 +00:00
Laurent Destailleur
f25e136db8 Fix: Fix global typo error 2009-08-19 17:07:48 +00:00
Laurent Destailleur
4cd2c1ad9e Update translation files 2009-08-13 19:16:43 +00:00
Laurent Destailleur
382fd3054a Renamed a development module in english 2009-06-16 23:47:49 +00:00
Laurent Destailleur
28dd72e17a New: Prepare correct management of timezones
Fix: Bad support of timeouts.
2009-06-14 16:25:23 +00:00
Laurent Destailleur
215ac8fa30 Fix: Correct link to forum in help center 2009-05-11 16:26:54 +00:00
Laurent Destailleur
cd78a8db7b Minor changes 2009-03-13 13:12:43 +00:00
Juanjo Menent
55147eaf5c Improve translations 2009-02-25 20:41:49 +00:00
Juanjo Menent
f85981fb34 Improved translation 2009-02-24 18:47:19 +00:00