Merge branch 'master' of https://github.com/supertuxkart/stk-code

src/main.cpp

@@ -396,7 +396,6 @@ void handleXmasMode()
  */
 bool isEasterMode(int day, int month, int year, int before_after_days)
 {
-    bool ears = false;
     switch (UserConfigParams::m_easter_ear_mode)
     {
     case 0:
@@ -1202,6 +1201,7 @@ void askForInternetPermission()
     new MessageDialog(_("SuperTuxKart may connect to a server "
         "to download add-ons and notify you of updates. We also collect "
         "anonymous hardware statistics to help with the development of STK. "
+        "Please read our privacy policy at http://privacy.supertuxkart.net. "
         "Would you like this feature to be enabled? (To change this setting "
         "at a later time, go to options, select tab "
         "'User Interface', and edit \"Connect to the "
@@ -1660,4 +1660,4 @@ void runUnitTests()
     assert( isEasterMode(22, 3, 2016, 5));
     assert(!isEasterMode(21, 3, 2016, 5));
     UserConfigParams::m_easter_ear_mode = saved_easter_mode;
-}   // unitTesting
+}   // unitTesting

src/states_screens/dialogs/registration_dialog.cpp

@@ -46,7 +46,7 @@ RegistrationDialog::RegistrationDialog() :
         L"these terms. If you have any questions or comments regarding these "
         L"terms, one of the members of the development team would gladly "
         L"assist you.",
-        L"http://supertuxkart.net/terms");
+        L"http://terms.supertuxkart.net");
     terms_widget->setText(terms, false);
 
    // showRegistrationTerms();