update french translations

CVS version numbers

english/template/debian/common_translation.wml: 1.19 -> 1.20 
english/template/debian/countries.wml: 1.28 -> 1.29 
english/template/debian/ctime.wml: 1.13 -> 1.14 
english/template/debian/footer.wml: 1.23 -> 1.24 
english/template/debian/language_names.wml: 1.18 -> 1.19 
english/template/debian/menubar.wml: 1.60 -> 1.61 
english/template/debian/recent_list.wml: 1.21 -> 1.22

7 files changed, 14 insertions, 9 deletions

diff --git a/english/template/debian/common_translation.wml b/english/template/debian/common_translation.wml
index 63ced5ce3fb..4bcd52133cb 100644
--- a/english/template/debian/common_translation.wml
+++ b/english/template/debian/common_translation.wml
@@ -131,7 +131,7 @@
 	[FI:Tapahtumia:]
 	[PT:Eventos:]
 	[HR:Zbivanja:]
-	[FR:Evènements:]
+	[FR:Événements:]
 	[DE:Ereignisse:]
 	[IT:Events:]
 	[JA:¥¤¥Ù¥ó¥È:]
@@ -181,7 +181,6 @@
 	[HR:Najnovije vijesti:]
 	[FR:Dernières nouvelles:]
 	[DE:Neuste Nachrichten:]
-	[FR:Latest News:]
 	[JA:ºÇ¿·¥Ë¥å¡¼¥¹:]
 	[PL:Najnowsze wiadomo¶ci:]
 	[ES:Latest News:]
diff --git a/english/template/debian/countries.wml b/english/template/debian/countries.wml
index 214153c84d8..c7858687c45 100644
--- a/english/template/debian/countries.wml
+++ b/english/template/debian/countries.wml
@@ -157,8 +157,13 @@
 	[FI:Kreikka:]
 	[PT:Greece:]
 	[ES:Greece:]
+<<<<<<< countries.wml
+	[FR:Grèce:]
+	[HR:Greece:]
+=======
 	[FR:Greece:]
 	[HR:Grèka:]
+>>>>>>> 1.27
 	[DE:Greece:]
 	[DA:Greece:]
 	[JA:¥®¥ê¥·¥ã:]
@@ -311,7 +316,7 @@
 	[FI:Norja:]
 	[PT:Norway:]
 	[ES:Norway:]
-	[FR:Norway:]
+	[FR:Norvège:]
 	[HR:Norve¹ka:]
 	[DE:Norway:]
 	[DA:Norway:]
diff --git a/english/template/debian/ctime.wml b/english/template/debian/ctime.wml
index 433c757bd1f..64e175a3e5b 100644
--- a/english/template/debian/ctime.wml
+++ b/english/template/debian/ctime.wml
@@ -48,6 +48,7 @@ use Time::Local;
 );
 %dateform = (
 	hr => '"%s, %2d. %s %s., %02d:%02d:%02d %s", $wday, $mday, $mon, 1900+$year, $hour, $min, $sec, "UTC"',
+	fr => '"%s, %2d. %s %s., %02d:%02d:%02d %s", $wday, $mday, $mon, 1900+$year, $hour, $min, $sec, "UTC"',
 	zh => '"%s ¦~ %s ¤ë %s ¤é ¬P´Á%s %02d:%02d:%02d %s", 1900+$year, $mon, $mday, $wday, $hour, $min, $sec, "UTC"',
 	sv => '"%s %2d %s %s %02d.%02d.%02d %s", $wday, $mday, $mon, 1900+$year, $hour, $min, $sec, "UTC"',
 	ja => '"%s ǯ %s ·î %s Æü %s %02d:%02d:%02d %s", 1900+$year, $mon, $mday, $wday, $hour, $min, $sec, "UTC"',
diff --git a/english/template/debian/footer.wml b/english/template/debian/footer.wml
index db64a9dd737..ed0f985d6a5 100644
--- a/english/template/debian/footer.wml
+++ b/english/template/debian/footer.wml
@@ -6,7 +6,7 @@
 	[PT:See the Debian <A href="$(HOME)/contact">contact page</A> for information on contacting us.:]
 	[HR:Pogledajte Debianovu <A href="$(HOME)/contact">kontaktnu stranicu</A> za 
 		informacije o tome kako nas kontaktirati.:]
-	[FR:See the Debian <A href="$(HOME)/contact">contact page</A> for information on contacting us.:]
+	[FR:Voir la <A href="$(HOME)/contact">page contact</A> de Debian pour plus d'information pour nous contacter.:]
 	[DE:Falls Sie Informationen dar&uuml;ber suchen, wie Sie sich mit uns in 
 		Verbindung setzen k&ouml;nnen, klicken Sie bitte <A href="$(HOME)/contact">hier</A>.:]
 	[IT:See the Debian <A href="$(HOME)/contact">contact page</A> for information on contacting us.:]
diff --git a/english/template/debian/language_names.wml b/english/template/debian/language_names.wml
index a82731f3e5d..fb8b5482e87 100644
--- a/english/template/debian/language_names.wml
+++ b/english/template/debian/language_names.wml
@@ -86,7 +86,7 @@ my %trans = (
 		swedish    => "Svensk",
 	},
 	fr => {
-		finnish    => "Finnish",
+		finnish    => "finlandais",
 		croatian => "croate",
 		english  => "anglais",
 		danish   => "danois",
@@ -97,9 +97,9 @@ my %trans = (
 		korean   => "coréen",
 		spanish  => "espagnol",
 		portuguese  => "portugais",
-		dutch      => "Dutch",
+		dutch      => "hollandais",
 		chinese  => "chinois",
-		swedish    => "Swedish",
+		swedish    => "suédois",
 	},
 	de => {
 		finnish    => "Finnish",
diff --git a/english/template/debian/menubar.wml b/english/template/debian/menubar.wml
index 788f6fac9dd..37b2db2f354 100644
--- a/english/template/debian/menubar.wml
+++ b/english/template/debian/menubar.wml
@@ -132,7 +132,7 @@
 	[FI:Debian-kirjallisuutta:]
 	[PT:Debian&nbsp;Books:]
 	[HR:Knjige&nbsp;o&nbsp;Debianu:]
-	[FR:Debian&nbsp;Books:]
+	[FR:Livres&nbsp;Debian:]
 	[DE:Debian&nbsp;Books:]
 	[IT:Debian&nbsp;Books:]
 	[JA:Debian ¤Ë´Ø¤¹¤ë½ñÀÒ:]
diff --git a/english/template/debian/recent_list.wml b/english/template/debian/recent_list.wml
index 79d62768fb6..dff0b76acab 100644
--- a/english/template/debian/recent_list.wml
+++ b/english/template/debian/recent_list.wml
@@ -3,7 +3,7 @@
 	[FI:Ei otsikoita tältä vuodelta:]
 	[PT:Sem itens neste ano.:]
 	[HR:Za ovu godinu nema èlanaka.:]
-	[FR:No items for this year.:]
+	[FR:Pas d'éléments cette année.:]
 	[DE:No items for this year.:]
 	[IT:No items for this year.:]
 	[JA:No items for this year.:]