diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch
index f7beb5254..2e2ef251f 100644
--- a/rtdata/languages/Deutsch
+++ b/rtdata/languages/Deutsch
@@ -1,13 +1,13 @@
 # Deutsch: Deutschland
-# 20.12.2007
-# (phberlin; basiert auf keenonkites' Erstübersetzung)
-# 22.12.2007
 # (keenonkites; Aktualisierte Version für 2.3 beta2)
+# (phberlin; basiert auf keenonkites' Erstübersetzung)
 # 08.01.2008/15.01.2008/20.02.2008
-# Leichte Anpassungen (keenonkites/klonk)
-# 4.4.2008: Anpassungen für 2.4
-# 20.9.2008: keenonkites, Anpassungen für 2.4m2
 # 19.12.2008: keenonkites, Anpassungen für 2.4beta4
+# 20.12.2007
+# 20.9.2008: keenonkites, Anpassungen für 2.4m2
+# 22.12.2007
+# 4.4.2008: Anpassungen für 2.4
+# Leichte Anpassungen (keenonkites/klonk)
 ADJUSTER_RESET_TO_DEFAULT;Zurück zum Standard
 CURVEEDITOR_FILEDLGFILTERANY;Alle Dateien
 CURVEEDITOR_FILEDLGFILTERCURVE;Kurvendateien
@@ -257,10 +257,19 @@ IPTCPANEL_TITLE;Titel
 IPTCPANEL_TITLEHINT;Kurztitel des Bildes (Object Name).
 IPTCPANEL_TRANSREFERENCE;Übertragungs Referenz
 IPTCPANEL_TRANSREFERENCEHINT;Ein Code, der den ursprünglichen Ort der Übertragung definiert (Original Transmission Reference).
+MAIN_BUTTON_EXIT;Verlassen
+MAIN_BUTTON_EXIT;Verlassen
 MAIN_BUTTON_PREFERENCES;Einstellungen
+MAIN_BUTTON_QUEUE;Auf die Warteschlange
 MAIN_BUTTON_SAVE;Bild speichern
 MAIN_BUTTON_SAVEAS;unter...
 MAIN_BUTTON_SENDTOEDITOR;Im Editor laden
+MAIN_FRAME_BATCHQUEUE;Warteschlange 
+MAIN_FRAME_FILEBROWSER;Dateiverwaltung  
+MAIN_FRAME_PLACES;Orte
+MAIN_FRAME_PLACES_ADD;Hinzu
+MAIN_FRAME_PLACES_DEL;Löschen
+MAIN_FRAME_RECENT;Verwendete Ordner
 MAIN_MSG_ALREADYEXISTS;Diese Datei existiert schon.
 MAIN_MSG_CANNOTLOAD;Bild kann nicht geladen werden
 MAIN_MSG_CANNOTSAVE;Fehler beim Speichern
@@ -273,11 +282,14 @@ MAIN_MSG_QOVERWRITE;Wollen sie die Datei überschreiben ?
 MAIN_TAB_BASIC;Basis
 MAIN_TAB_COLOR;Farbe
 MAIN_TAB_DETAIL;Detail
+MAIN_TAB_DEVELOP;Entwickeln
 MAIN_TAB_EXIF;Exif
 MAIN_TAB_EXPOSURE;Belichtung
+MAIN_TAB_FILTER;Metadaten-Filter
 MAIN_TAB_ICM;ICM
 MAIN_TAB_IPTC;IPTC
 MAIN_TAB_METADATA;Metadata
+MAIN_TAB_TAGGING;Tagging
 MAIN_TAB_TRANSFORM;Verändern
 MAIN_TOOLTIP_HIDEFP;Zeigen/Verstecken von Verzeichnis- und Datei-Browser (Taste F)
 MAIN_TOOLTIP_HIDEHP;Zeigen/Verstecken linke Seite (Abfolge der Änderungen, Taste H)
@@ -336,8 +348,8 @@ PREFERENCES_CLIPPINGIND;Anzeige zu helle/zu dunkle Bereiche
 PREFERENCES_CMETRICINTENT;Farbraumtransformation
 PREFERENCES_DATEFORMAT;Datumsformat
 PREFERENCES_DATEFORMATHINT;<i>Die folgenden Variablen können verwendet werden:</i>\n<b>%y</b><i> : Jahr</i>\n<b>%m</b><i> : Monat</i>\n<b>%d</b><i> : Tag</i>\n<i>\nDas Deutsche Datumsformat zum Beispiel ist:</i>\n<b>%d/%m/%y</b>
-PREFERENCES_DCBITERATIONS;Anzahl der DCB Iterationen
 PREFERENCES_DCBENHANCE;DCB Verfeinerungsschritt durchführen
+PREFERENCES_DCBITERATIONS;Anzahl der DCB Iterationen
 PREFERENCES_DEFAULTLANG;Sprache für die Menüs und Dialoge
 PREFERENCES_DEFAULTTHEME;Standard Oberflächendesign
 PREFERENCES_DEMOSAICINGALGO;Algorithmus zur Entrasterung
diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK)
index 8a5ba2691..e80c66b76 100644
--- a/rtdata/languages/English (UK)	
+++ b/rtdata/languages/English (UK)	
@@ -1,6 +1,6 @@
 #  British english
-# 16.01.2009: Richard Regal
 #
+# 16.01.2009: Richard Regal
 ADJUSTER_RESET_TO_DEFAULT;Reset to default
 CURVEEDITOR_FILEDLGFILTERANY;Any files
 CURVEEDITOR_FILEDLGFILTERCURVE;Curve files
@@ -250,10 +250,18 @@ IPTCPANEL_TITLE;Title
 IPTCPANEL_TITLEHINT;A shorthand reference for the image (Object Name).
 IPTCPANEL_TRANSREFERENCE;Trans. Reference
 IPTCPANEL_TRANSREFERENCEHINT;A code representing the location of original transmission (Original Transmission Reference).
+MAIN_BUTTON_EXIT;Exit
 MAIN_BUTTON_PREFERENCES;Preferences
+MAIN_BUTTON_QUEUE;Put to queue
 MAIN_BUTTON_SAVE;Save Image
 MAIN_BUTTON_SAVEAS;As...
 MAIN_BUTTON_SENDTOEDITOR;Send to editor
+MAIN_FRAME_BATCHQUEUE;Batch Queue 
+MAIN_FRAME_FILEBROWSER;File Browser 
+MAIN_FRAME_PLACES;Places 
+MAIN_FRAME_PLACES_ADD;Add
+MAIN_FRAME_PLACES_DEL;Del
+MAIN_FRAME_RECENT;Recent Folders 
 MAIN_MSG_ALREADYEXISTS;File already exists.
 MAIN_MSG_CANNOTLOAD;Cannot load image
 MAIN_MSG_CANNOTSAVE;File saving error
@@ -266,11 +274,14 @@ MAIN_MSG_QOVERWRITE;Do you want to overwrite it?
 MAIN_TAB_BASIC;Basic
 MAIN_TAB_COLOR;Colour
 MAIN_TAB_DETAIL;Detail
+MAIN_TAB_DEVELOP;Develop
 MAIN_TAB_EXIF;Exif
 MAIN_TAB_EXPOSURE;Exposure
+MAIN_TAB_FILTER;Filter
 MAIN_TAB_ICM;ICM
 MAIN_TAB_IPTC;IPTC
 MAIN_TAB_METADATA;Metadata
+MAIN_TAB_TAGGING;Tagging
 MAIN_TAB_TRANSFORM;Transform
 MAIN_TOOLTIP_HIDEFP;Show/hide the bottom panel (directory and file browser, shortcut key: F)
 MAIN_TOOLTIP_HIDEHP;Show/hide the left panel (including the history, shortcut key: H)
@@ -329,8 +340,8 @@ PREFERENCES_CLIPPINGIND;Clipping indication
 PREFERENCES_CMETRICINTENT;Colorimetric Intent
 PREFERENCES_DATEFORMAT;Date Format
 PREFERENCES_DATEFORMATHINT;<i>You can use the following formatting strings:</i>\n<b>%y</b><i> : year</i>\n<b>%m</b><i> : month</i>\n<b>%d</b><i> : day</i>\n<i>\nFor example, the hungarian date format is:</i>\n<b>%y/%m/%d</b>
-PREFERENCES_DCBITERATIONS;Number of DCB iterations
 PREFERENCES_DCBENHANCE;Apply DCB enhancment step
+PREFERENCES_DCBITERATIONS;Number of DCB iterations
 PREFERENCES_DEFAULTLANG;Default language
 PREFERENCES_DEFAULTTHEME;Default theme
 PREFERENCES_DEMOSAICINGALGO;Demosaicing Algorithm
diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US)
index ebb100dc4..533fe83f7 100644
--- a/rtdata/languages/English (US)	
+++ b/rtdata/languages/English (US)	
@@ -250,10 +250,18 @@ IPTCPANEL_TITLE;Title
 IPTCPANEL_TITLEHINT;A shorthand reference for the image (Object Name).
 IPTCPANEL_TRANSREFERENCE;Trans. Reference
 IPTCPANEL_TRANSREFERENCEHINT;A code representing the location of original transmission (Original Transmission Reference).
+MAIN_BUTTON_EXIT;Exit
 MAIN_BUTTON_PREFERENCES;Preferences
+MAIN_BUTTON_QUEUE;Put to queue
 MAIN_BUTTON_SAVE;Save Image
 MAIN_BUTTON_SAVEAS;As...
 MAIN_BUTTON_SENDTOEDITOR;Send to editor
+MAIN_FRAME_BATCHQUEUE;Batch Queue 
+MAIN_FRAME_FILEBROWSER;File Browser 
+MAIN_FRAME_PLACES;Places 
+MAIN_FRAME_PLACES_ADD;Add
+MAIN_FRAME_PLACES_DEL;Del
+MAIN_FRAME_RECENT;Recent Folders 
 MAIN_MSG_ALREADYEXISTS;File already exists.
 MAIN_MSG_CANNOTLOAD;Cannot load image
 MAIN_MSG_CANNOTSAVE;File saving error
@@ -266,11 +274,14 @@ MAIN_MSG_QOVERWRITE;Do you want to overwrite it?
 MAIN_TAB_BASIC;Basic
 MAIN_TAB_COLOR;Color
 MAIN_TAB_DETAIL;Detail
+MAIN_TAB_DEVELOP;Develop
 MAIN_TAB_EXIF;Exif
 MAIN_TAB_EXPOSURE;Exposure
+MAIN_TAB_FILTER;Filter
 MAIN_TAB_ICM;ICM
 MAIN_TAB_IPTC;IPTC
 MAIN_TAB_METADATA;Metadata
+MAIN_TAB_TAGGING;Tagging
 MAIN_TAB_TRANSFORM;Transform
 MAIN_TOOLTIP_HIDEFP;Show/hide the bottom panel (directory and file browser, shortcut key: F)
 MAIN_TOOLTIP_HIDEHP;Show/hide the left panel (including the history, shortcut key: H)
@@ -329,8 +340,8 @@ PREFERENCES_CLIPPINGIND;Clipping indication
 PREFERENCES_CMETRICINTENT;Colorimetric Intent
 PREFERENCES_DATEFORMAT;Date Format
 PREFERENCES_DATEFORMATHINT;<i>You can use the following formatting strings:</i>\n<b>%y</b><i> : year</i>\n<b>%m</b><i> : month</i>\n<b>%d</b><i> : day</i>\n<i>\nFor example, the hungarian date format is:</i>\n<b>%y/%m/%d</b>
-PREFERENCES_DCBITERATIONS;Number of DCB iterations
 PREFERENCES_DCBENHANCE;Apply DCB enhancment step
+PREFERENCES_DCBITERATIONS;Number of DCB iterations
 PREFERENCES_DEFAULTLANG;Default language
 PREFERENCES_DEFAULTTHEME;Default theme
 PREFERENCES_DEMOSAICINGALGO;Demosaicing Algorithm
diff --git a/rtgui/favoritbrowser.cc b/rtgui/favoritbrowser.cc
index 90b7b610d..5bb282b07 100755
--- a/rtgui/favoritbrowser.cc
+++ b/rtgui/favoritbrowser.cc
@@ -46,8 +46,8 @@ FavoritBrowser::FavoritBrowser () : listener (NULL), lastSelectedDir ("") {
     treeView->set_tooltip_column (2);
     treeView->get_selection()->signal_changed().connect(sigc::mem_fun(*this, &FavoritBrowser::selectionChanged));
 
-    add = Gtk::manage (new Gtk::Button ("Add"));
-    del = Gtk::manage (new Gtk::Button ("Del"));
+    add = Gtk::manage (new Gtk::Button (M("MAIN_FRAME_PLACES_ADD")));
+    del = Gtk::manage (new Gtk::Button (M("MAIN_FRAME_PLACES_DEL")));
     add->set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::ADD, Gtk::ICON_SIZE_MENU)));
     del->set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::REMOVE, Gtk::ICON_SIZE_MENU)));
     Gtk::HBox* buttonBox = Gtk::manage (new Gtk::HBox ());
diff --git a/rtgui/filepanel.cc b/rtgui/filepanel.cc
index 5771a0575..2b9e75ff0 100755
--- a/rtgui/filepanel.cc
+++ b/rtgui/filepanel.cc
@@ -81,11 +81,11 @@ FilePanel::FilePanel () : parent(NULL) {
 
     rightNotebook->set_tab_pos (Gtk::POS_LEFT);
     
-    Gtk::Label* devLab = new Gtk::Label ("Develop");
+    Gtk::Label* devLab = new Gtk::Label (M("MAIN_TAB_DEVELOP"));
     devLab->set_angle (90);
-    Gtk::Label* filtLab = new Gtk::Label ("Filter");
+    Gtk::Label* filtLab = new Gtk::Label (M("MAIN_TAB_FILTER"));
     filtLab->set_angle (90);
-    Gtk::Label* tagLab = new Gtk::Label ("Tagging");
+    Gtk::Label* tagLab = new Gtk::Label (M("MAIN_TAB_TAGGING"));
     tagLab->set_angle (90);
 
     Gtk::VPaned* tpcPaned = new Gtk::VPaned ();
diff --git a/rtgui/placesbrowser.cc b/rtgui/placesbrowser.cc
index c78df9624..b65c9f106 100755
--- a/rtgui/placesbrowser.cc
+++ b/rtgui/placesbrowser.cc
@@ -27,8 +27,8 @@ PlacesBrowser::PlacesBrowser () : listener (NULL) {
     scrollw->set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
     pack_start (*scrollw);
 
-    add = Gtk::manage (new Gtk::Button ("Add"));
-    del = Gtk::manage (new Gtk::Button ("Del"));
+    add = Gtk::manage (new Gtk::Button (M("MAIN_FRAME_PLACES_ADD")));
+    del = Gtk::manage (new Gtk::Button (M("MAIN_FRAME_PLACES_DEL")));
     add->set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::ADD, Gtk::ICON_SIZE_MENU)));
     del->set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::REMOVE, Gtk::ICON_SIZE_MENU)));
     Gtk::HBox* buttonBox = Gtk::manage (new Gtk::HBox ());
@@ -45,7 +45,7 @@ PlacesBrowser::PlacesBrowser () : listener (NULL) {
     treeView->set_model (placesModel);
     treeView->set_headers_visible (true);
 
-    Gtk::TreeView::Column *iviewcol = Gtk::manage (new Gtk::TreeView::Column ("Places"));
+    Gtk::TreeView::Column *iviewcol = Gtk::manage (new Gtk::TreeView::Column (M("MAIN_FRAME_PLACES")));
     Gtk::CellRendererPixbuf *iconCR  = Gtk::manage (new Gtk::CellRendererPixbuf());
     Gtk::CellRendererText *labelCR  = Gtk::manage (new Gtk::CellRendererText());
     iviewcol->pack_start (*iconCR, false);
diff --git a/rtgui/placesbrowser.h b/rtgui/placesbrowser.h
index 1a9ef7313..eac18f162 100755
--- a/rtgui/placesbrowser.h
+++ b/rtgui/placesbrowser.h
@@ -23,6 +23,7 @@
 #include <giomm.h>
 #include <dirbrowserremoteinterface.h>
 #include <dirselectionlistener.h>
+#include <multilangmgr.h>
 
 class PlacesBrowser : public Gtk::VBox, public DirSelectionListener {
 
diff --git a/rtgui/recentbrowser.cc b/rtgui/recentbrowser.cc
index e694d5e7a..da004d913 100755
--- a/rtgui/recentbrowser.cc
+++ b/rtgui/recentbrowser.cc
@@ -22,7 +22,7 @@ RecentBrowser::RecentBrowser () : listener (NULL) {
 
     recentDirs = Gtk::manage (new Gtk::ComboBoxText ());
 
-    Gtk::Frame* frame = Gtk::manage (new Gtk::Frame ("Recent Folders"));
+    Gtk::Frame* frame = Gtk::manage (new Gtk::Frame (M("MAIN_FRAME_RECENT")));
     frame->add (*recentDirs);
 
     pack_start (*frame, Gtk::PACK_SHRINK, 4);
diff --git a/rtgui/recentbrowser.h b/rtgui/recentbrowser.h
index 26280bc4e..0a267df63 100755
--- a/rtgui/recentbrowser.h
+++ b/rtgui/recentbrowser.h
@@ -22,6 +22,7 @@
 #include <gtkmm.h>
 #include <dirbrowserremoteinterface.h>
 #include <dirselectionlistener.h>
+#include <multilangmgr.h>
 
 class RecentBrowser : public Gtk::VBox, public DirSelectionListener {
 
diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc
index 8643b876d..fc0332f43 100755
--- a/rtgui/rtwindow.cc
+++ b/rtgui/rtwindow.cc
@@ -50,7 +50,7 @@ RTWindow::RTWindow () {
     // decorate tab
     Gtk::HBox* hbf = Gtk::manage (new Gtk::HBox ());
     hbf->pack_start (*Gtk::manage (new Gtk::Image (Gtk::Stock::DIRECTORY, Gtk::ICON_SIZE_MENU)));
-    hbf->pack_start (*Gtk::manage (new Gtk::Label ("File Browser")));
+    hbf->pack_start (*Gtk::manage (new Gtk::Label (M("MAIN_FRAME_FILEBROWSER"))));
     hbf->set_spacing (2);
     hbf->show_all ();
     mainNB->append_page (*fpanel, *hbf);
@@ -61,7 +61,7 @@ RTWindow::RTWindow () {
     // decorate tab
     Gtk::HBox* hbb = Gtk::manage (new Gtk::HBox ());
     hbb->pack_start (*Gtk::manage (new Gtk::Image (Gtk::Stock::EXECUTE, Gtk::ICON_SIZE_MENU)));
-    hbb->pack_start (*Gtk::manage (new Gtk::Label ("Batch Queue")));
+    hbb->pack_start (*Gtk::manage (new Gtk::Label (M("MAIN_FRAME_BATCHQUEUE"))));
     hbb->set_spacing (2);
     hbb->show_all ();
     mainNB->append_page (*bpanel, *hbb);
@@ -78,7 +78,7 @@ RTWindow::RTWindow () {
     preferences->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID("gtk-preferences"), Gtk::ICON_SIZE_BUTTON)));
     preferences->set_relief (Gtk::RELIEF_NONE);
     preferences->signal_clicked().connect( sigc::mem_fun(*this, &RTWindow::showPreferences) );
-    Gtk::Button* exit = Gtk::manage (new Gtk::Button ("Exit"));
+    Gtk::Button* exit = Gtk::manage (new Gtk::Button (M("MAIN_BUTTON_EXIT")));
     exit->set_image (*Gtk::manage(new Gtk::Image (Gtk::StockID("gtk-quit"), Gtk::ICON_SIZE_BUTTON)));
     exit->set_relief (Gtk::RELIEF_NONE);
     exit->signal_clicked().connect( sigc::mem_fun(*this, &RTWindow::onExit) );