Applied patch from Jean-Marc.

  * Fixes size of Today button in drowdown calendar combo.
  * Updated French translation file.

2 files changed, 12 insertions, 12 deletions

diff --git a/languages/fpgui.fr.po b/languages/fpgui.fr.po
index 541606f7..b340133f 100644
--- a/languages/fpgui.fr.po
+++ b/languages/fpgui.fr.po
@@ -174,7 +174,7 @@ msgstr "Le répertoire <%s> n''a pas pu être ouvert"
 
 #: fpg_constants:rscollectionfavourites
 msgid "Favourites"
-msgstr "Favorites"
+msgstr "Favoris"
 
 #: fpg_constants:rsshortfeb
 msgid "Feb"
@@ -286,7 +286,7 @@ msgstr "Mai"
 
 #: fpg_constants:rsmessage
 msgid "Message"
-msgstr "Messagev"
+msgstr "Message"
 
 #: fpg_constants:rsfilemodifiedtime
 msgid "Mod. Time"
@@ -326,11 +326,11 @@ msgstr "OK"
 
 #: fpg_constants:rsshortoct
 msgid "Oct"
-msgstr ""
+msgstr "Oct"
 
 #: fpg_constants:rslongoct
 msgid "October"
-msgstr "Oct"
+msgstr "Octobre"
 
 #: fpg_constants:rsopen
 msgid "Open"
@@ -390,7 +390,7 @@ msgstr "Sauver sous"
 
 #: fpg_constants:rssearch
 msgid "Search"
-msgstr "Sauver"
+msgstr "Chercher"
 
 #: fpg_constants:rsselect
 msgid "Select"
diff --git a/src/gui/fpg_popupcalendar.pas b/src/gui/fpg_popupcalendar.pas
index 426ec849..fc8a0393 100644
--- a/src/gui/fpg_popupcalendar.pas
+++ b/src/gui/fpg_popupcalendar.pas
@@ -689,7 +689,7 @@ begin
   with edtYear do
   begin
     Name := 'edtYear';
-    SetPosition(0, 0, 52, 22);
+    SetPosition(0, 0, 37, 22);
     Text := '';
     FontDesc := '#Edit1';
     Focusable := False;
@@ -700,7 +700,7 @@ begin
   with btnYearUp do
   begin
     Name := 'btnYearUp';
-    SetPosition(52, 0, 13, 11);
+    SetPosition(37, 0, 13, 11);
     Text := '';
     Embedded := True;
     FontDesc := '#Label1';
@@ -714,7 +714,7 @@ begin
   with btnYearDown do
   begin
     Name := 'btnYearDown';
-    SetPosition(52, 11, 13, 11);
+    SetPosition(37, 11, 13, 11);
     Text := '';
     Embedded := True;
     FontDesc := '#Label1';
@@ -728,7 +728,7 @@ begin
   with edtMonth do
   begin
     Name := 'edtMonth';
-    SetPosition(65, 0, 115, 22);
+    SetPosition(50, 0, 100, 22);
     Text := '';
     FontDesc := '#Edit1';
     Focusable := False;
@@ -739,7 +739,7 @@ begin
   with btnMonthUp do
   begin
     Name := 'btnMonthUp';
-    SetPosition(180, 0, 13, 11);
+    SetPosition(150, 0, 13, 11);
     Text := '';
     Embedded := True;
     FontDesc := '#Label1';
@@ -753,7 +753,7 @@ begin
   with btnMonthDown do
   begin
     Name := 'btnMonthDown';
-    SetPosition(180, 11, 13, 11);
+    SetPosition(150, 11, 13, 11);
     Text := '';
     Embedded := True;
     FontDesc := '#Label1';
@@ -767,7 +767,7 @@ begin
   with btnToday do
   begin
     Name := 'btnToday';
-    SetPosition(194, 0, 40, 22);
+    SetPosition(164, 0, 70, 22);
     Text := 'Today';
     FontDesc := '#Label1';
     Focusable := True;