diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index b9f8076e026..fd0f4d12d0e 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,4 @@
-#Wed Mar 11 19:32:00 CET 2009
+#Fri May 08 17:10:28 CEST 2009
 eclipse.preferences.version=1
 encoding//dev/initdemo/initdemo.sql=UTF-8
 encoding//dev/skeletons/modMyModule.class.php=ISO-8859-1
@@ -356,6 +356,42 @@ encoding//htdocs/langs/fr_FR/suppliers.lang=UTF-8
 encoding//htdocs/langs/fr_FR/trips.lang=UTF-8
 encoding//htdocs/langs/fr_FR/users.lang=UTF-8
 encoding//htdocs/langs/fr_FR/withdrawals.lang=UTF-8
+encoding//htdocs/langs/nb_NO/admin.lang=UTF-8
+encoding//htdocs/langs/nb_NO/agenda.lang=UTF-8
+encoding//htdocs/langs/nb_NO/banks.lang=UTF-8
+encoding//htdocs/langs/nb_NO/bills.lang=UTF-8
+encoding//htdocs/langs/nb_NO/boxes.lang=UTF-8
+encoding//htdocs/langs/nb_NO/categories.lang=UTF-8
+encoding//htdocs/langs/nb_NO/commercial.lang=UTF-8
+encoding//htdocs/langs/nb_NO/companies.lang=UTF-8
+encoding//htdocs/langs/nb_NO/compta.lang=UTF-8
+encoding//htdocs/langs/nb_NO/contracts.lang=UTF-8
+encoding//htdocs/langs/nb_NO/deliveries.lang=UTF-8
+encoding//htdocs/langs/nb_NO/dict.lang=UTF-8
+encoding//htdocs/langs/nb_NO/domains.lang=UTF-8
+encoding//htdocs/langs/nb_NO/donations.lang=UTF-8
+encoding//htdocs/langs/nb_NO/ecm.lang=UTF-8
+encoding//htdocs/langs/nb_NO/errors.lang=UTF-8
+encoding//htdocs/langs/nb_NO/exports.lang=UTF-8
+encoding//htdocs/langs/nb_NO/install.lang=UTF-8
+encoding//htdocs/langs/nb_NO/interventions.lang=UTF-8
+encoding//htdocs/langs/nb_NO/ldap.lang=UTF-8
+encoding//htdocs/langs/nb_NO/mails.lang=UTF-8
+encoding//htdocs/langs/nb_NO/main.lang=UTF-8
+encoding//htdocs/langs/nb_NO/members.lang=UTF-8
+encoding//htdocs/langs/nb_NO/orders.lang=UTF-8
+encoding//htdocs/langs/nb_NO/oscommerce.lang=UTF-8
+encoding//htdocs/langs/nb_NO/other.lang=UTF-8
+encoding//htdocs/langs/nb_NO/products.lang=UTF-8
+encoding//htdocs/langs/nb_NO/projects.lang=UTF-8
+encoding//htdocs/langs/nb_NO/propal.lang=UTF-8
+encoding//htdocs/langs/nb_NO/sendings.lang=UTF-8
+encoding//htdocs/langs/nb_NO/shop.lang=UTF-8
+encoding//htdocs/langs/nb_NO/stocks.lang=UTF-8
+encoding//htdocs/langs/nb_NO/suppliers.lang=UTF-8
+encoding//htdocs/langs/nb_NO/trips.lang=UTF-8
+encoding//htdocs/langs/nb_NO/users.lang=UTF-8
+encoding//htdocs/langs/nb_NO/withdrawals.lang=UTF-8
 encoding//htdocs/langs/nl_BE/admin.lang=UTF-8
 encoding//htdocs/langs/nl_BE/agenda.lang=UTF-8
 encoding//htdocs/langs/nl_BE/banks.lang=UTF-8
@@ -428,42 +464,6 @@ encoding//htdocs/langs/nl_NL/suppliers.lang=UTF-8
 encoding//htdocs/langs/nl_NL/trips.lang=UTF-8
 encoding//htdocs/langs/nl_NL/users.lang=UTF-8
 encoding//htdocs/langs/nl_NL/withdrawals.lang=UTF-8
-encoding//htdocs/langs/no_NO/admin.lang=UTF-8
-encoding//htdocs/langs/no_NO/agenda.lang=UTF-8
-encoding//htdocs/langs/no_NO/banks.lang=UTF-8
-encoding//htdocs/langs/no_NO/bills.lang=UTF-8
-encoding//htdocs/langs/no_NO/boxes.lang=UTF-8
-encoding//htdocs/langs/no_NO/categories.lang=UTF-8
-encoding//htdocs/langs/no_NO/commercial.lang=UTF-8
-encoding//htdocs/langs/no_NO/companies.lang=UTF-8
-encoding//htdocs/langs/no_NO/compta.lang=UTF-8
-encoding//htdocs/langs/no_NO/contracts.lang=UTF-8
-encoding//htdocs/langs/no_NO/deliveries.lang=UTF-8
-encoding//htdocs/langs/no_NO/dict.lang=UTF-8
-encoding//htdocs/langs/no_NO/domains.lang=UTF-8
-encoding//htdocs/langs/no_NO/donations.lang=UTF-8
-encoding//htdocs/langs/no_NO/ecm.lang=UTF-8
-encoding//htdocs/langs/no_NO/errors.lang=UTF-8
-encoding//htdocs/langs/no_NO/exports.lang=UTF-8
-encoding//htdocs/langs/no_NO/install.lang=UTF-8
-encoding//htdocs/langs/no_NO/interventions.lang=UTF-8
-encoding//htdocs/langs/no_NO/ldap.lang=UTF-8
-encoding//htdocs/langs/no_NO/mails.lang=UTF-8
-encoding//htdocs/langs/no_NO/main.lang=UTF-8
-encoding//htdocs/langs/no_NO/members.lang=UTF-8
-encoding//htdocs/langs/no_NO/orders.lang=UTF-8
-encoding//htdocs/langs/no_NO/oscommerce.lang=UTF-8
-encoding//htdocs/langs/no_NO/other.lang=UTF-8
-encoding//htdocs/langs/no_NO/products.lang=UTF-8
-encoding//htdocs/langs/no_NO/projects.lang=UTF-8
-encoding//htdocs/langs/no_NO/propal.lang=UTF-8
-encoding//htdocs/langs/no_NO/sendings.lang=UTF-8
-encoding//htdocs/langs/no_NO/shop.lang=UTF-8
-encoding//htdocs/langs/no_NO/stocks.lang=UTF-8
-encoding//htdocs/langs/no_NO/suppliers.lang=UTF-8
-encoding//htdocs/langs/no_NO/trips.lang=UTF-8
-encoding//htdocs/langs/no_NO/users.lang=UTF-8
-encoding//htdocs/langs/no_NO/withdrawals.lang=UTF-8
 encoding//htdocs/langs/pl_PL/admin.lang=UTF-8
 encoding//htdocs/langs/pl_PL/agenda.lang=UTF-8
 encoding//htdocs/langs/pl_PL/banks.lang=UTF-8
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 20ac3dc93bb..8d344dbff10 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -503,18 +503,22 @@ if (isset($user->conf->PRODUIT_LIMIT_SIZE))		// Can be 0
 	$conf->produit->limit_size = $user->conf->PRODUIT_LIMIT_SIZE;
 }
 
-// If user has choosed its own language
-if (! empty($user->conf->MAIN_LANG_DEFAULT))
+
+if (empty($_GET["lang"]))	// If language was not forced on URL
 {
-	// If different than current language
-	if ($langs->getDefaultLang() != $user->conf->MAIN_LANG_DEFAULT)
+	// If user has choosed its own language
+	if (! empty($user->conf->MAIN_LANG_DEFAULT))
 	{
-		$langs->setDefaultLang($user->conf->MAIN_LANG_DEFAULT);
-		$langs->setPhpLang();
+		// If different than current language
+		//print ">>>".$langs->getDefaultLang()."-".$user->conf->MAIN_LANG_DEFAULT;
+		if ($langs->getDefaultLang() != $user->conf->MAIN_LANG_DEFAULT)
+		{
+			$langs->setDefaultLang($user->conf->MAIN_LANG_DEFAULT);
+			$langs->setPhpLang();
+		}
 	}
 }
-// If language was forced on URL
-if (! empty($_GET["lang"]))
+else	// If language was forced on URL
 {
 	$langs->setDefaultLang($_GET["lang"]);
 	$langs->setPhpLang();