Merge remote-tracking branch 'origin/3.3' into 3.4

2013-11-04 15:01:31 +01:00
parent b2df689669 8653f3f026
commit c41ac34356
2 changed files with 3 additions and 1 deletions
--- a/htdocs/langs/en_US/dict.lang
+++ b/htdocs/langs/en_US/dict.lang
@@ -7,6 +7,7 @@ CountryES=Spain
 CountryDE=Germany
 CountryCH=Switzerland
 CountryGB=Great Britain
+CountryUK=United Kingdom
 CountryIE=Ireland
 CountryCN=China
 CountryTN=Tunisia
--- a/htdocs/langs/fr_FR/dict.lang
+++ b/htdocs/langs/fr_FR/dict.lang
@@ -6,7 +6,8 @@ CountryIT=Italie
 CountryES=Espagne
 CountryDE=Allemagne
 CountryCH=Suisse
-CountryGB=Royaume-Uni
+CountryGB=Grande-Bretagne
+CountryUK=Royaume-Uni
 CountryIE=Irlande
 CountryCN=Chine
 CountryTN=Tunisie