rename license parameters

Rakefile

@@ -80,7 +80,7 @@ namespace "framework" do
 end
 
 
-$application_build_configs_keys = ['security_token', 'encrypt_database', 'android_title', 'iphone_db_in_approot', 'iphone_set_approot', 'iphone_userpath_in_approot', "motorola_licence", "motorola_licence_company"]
+$application_build_configs_keys = ['security_token', 'encrypt_database', 'android_title', 'iphone_db_in_approot', 'iphone_set_approot', 'iphone_userpath_in_approot', "motorola_license", "motorola_license_company"]
 
 def make_application_build_config_header_file
   f = StringIO.new("", "w+")      
@@ -376,7 +376,7 @@ namespace "config" do
 
             if (!is_ET1) and (!is_win_platform)
                  # check the license parameter
-                 if (!$application_build_configs["motorola_licence"]) or (!$application_build_configs["motorola_licence_company"])
+                 if (!$application_build_configs["motorola_license"]) or (!$application_build_configs["motorola_license_company"])
                     $invalid_license = true
                  end
             end
@@ -399,8 +399,8 @@ namespace "config" do
     $app_config['capabilities'].uniq!() if $app_config['capabilities']
 
     if $invalid_license
-        $application_build_configs["motorola_licence"] = '123' if !$application_build_configs["motorola_licence"]
-        $application_build_configs["motorola_licence_company"] = 'WRONG' if !$application_build_configs["motorola_licence_company"]
+        $application_build_configs["motorola_license"] = '123' if !$application_build_configs["motorola_license"]
+        $application_build_configs["motorola_license_company"] = 'WRONG' if !$application_build_configs["motorola_license_company"]
     end
 
     puts "$app_config['extensions'] : #{$app_config['extensions'].inspect}"   
@@ -1508,7 +1508,7 @@ at_exit do
   if $invalid_license
     puts '********* WARNING ************************************************************************'
     puts ' License is required to run RhoElements application.'
-    puts ' Please, provide  "motorola_licence" and "motorola_licence_company" parameters in build.yml.'
+    puts ' Please, provide  "motorola_license" and "motorola_license_company" parameters in build.yml.'
     puts '**************************************************************************************'
   end
 

platform/shared/common/RhodesApp.cpp

@@ -2096,8 +2096,8 @@ int rho_rhodesapp_canstartapp(const char* szCmdLine, const char* szSeparators)
 }
 
 int rho_is_motorola_licence_checked() {
-	const char* szMotorolaLicence = get_app_build_config_item("motorola_licence");
-	const char* szMotorolaLicenceCompany = get_app_build_config_item("motorola_licence_company");
+	const char* szMotorolaLicence = get_app_build_config_item("motorola_license");
+	const char* szMotorolaLicenceCompany = get_app_build_config_item("motorola_license_company");
 
     if ((szMotorolaLicence == NULL) || (szMotorolaLicenceCompany == NULL)) {
         return 0;
@@ -2133,8 +2133,8 @@ int rho_is_rho_elements_extension_can_be_used() {
 }
 
 int rho_can_app_started_with_current_licence() {
-	const char* szMotorolaLicence = get_app_build_config_item("motorola_licence");
-	const char* szMotorolaLicenceCompany = get_app_build_config_item("motorola_licence_company");
+	const char* szMotorolaLicence = get_app_build_config_item("motorola_license");
+	const char* szMotorolaLicenceCompany = get_app_build_config_item("motorola_license_company");
 
     if ((szMotorolaLicence == NULL) || (szMotorolaLicenceCompany == NULL)) {
         return 1;