fusionpbx

Author	SHA1	Message	Date
Nuno Miguel Reis	1ef7fb3706	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	f077840883	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	6d6edca0bf	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	9d3a58c26e	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	53cefe184b	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	860d4bb5cc	Move user_settings to the core directory.	2013-01-05 07:02:03 +00:00