dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,656 Commits 3 Branches 10 Tags
b99e6e72ea830ebb39e0a86c2bf33ef3b8e5abeb
Commit Graph
6 Commits
Author SHA1 Message Date
Nuno Miguel Reis 330f008a95 fixed some typos 
Conflicts:
	fusionpbx/app/adminer/app_config.php
	fusionpbx/app/gateways/app_languages.php
	fusionpbx/app/ring_groups/app_languages.php
	fusionpbx/app/voicemails/app_languages.php
	fusionpbx/core/user_settings/app_languages.php
 2013-09-17 16:48:23 +00:00
Mark Crane f61de19169 Move the French translations into the development branch. 
Translation work done thanks to by bhouba for his work on the translations.
 2013-09-13 21:04:53 +00:00
Mark Crane c6fa71125d Make the login.php use the correct app_languages.php file. Reason to do this is because login.php in the root is put in a position as being part of the core so I wanted the translations to be part of the core as well. And user settings is related to the user login. App/login is in the app directory to make the login and logout as an optional part of the menu since they could be incorporated in the theme. 2013-01-05 10:06:32 +00:00
Mark Crane 9ba7e2f6e2 Remove change $content_user to $text to be more consistent with the other app_languages.php files. 2013-01-05 09:59:27 +00:00
Mark Crane 7f8acc43c7 Fix the link in user_settings, and fix some of the variable names used in the app_languages.php. 2013-01-05 07:44:54 +00:00
Mark Crane 0a0df9f343 Move user_settings to the core directory. 2013-01-05 07:02:03 +00:00