diff --git a/common/gal/opengl/opengl_compositor.cpp b/common/gal/opengl/opengl_compositor.cpp
index 2843204d78..26b136bbbc 100644
--- a/common/gal/opengl/opengl_compositor.cpp
+++ b/common/gal/opengl/opengl_compositor.cpp
@@ -98,7 +98,7 @@ unsigned int OPENGL_COMPOSITOR::CreateBuffer()
 
     if( usedBuffers() >= maxBuffers )
     {
-        DisplayError( NULL, _( "Cannot create more framebuffers. OpenGL rendering "
+        DisplayError( NULL, wxT( "Cannot create more framebuffers. OpenGL rendering "
                         "backend requires at least 3 framebuffers. You may try to update/change "
                         "your graphic drivers." ) );
         return 0;    // Unfortunately we have no more free buffers left
@@ -133,38 +133,38 @@ unsigned int OPENGL_COMPOSITOR::CreateBuffer()
         switch( status )
         {
         case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT:
-            DisplayError( NULL, _( "Cannot create the framebuffer." ) );
+            DisplayError( NULL,wxT( "Cannot create the framebuffer." ) );
             break;
 
         case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT:
-            DisplayError( NULL, _( "The framebuffer attachment points are incomplete." ) );
+            DisplayError( NULL, wxT( "The framebuffer attachment points are incomplete." ) );
             break;
 
         case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT:
-            DisplayError( NULL, _( "The framebuffer does not have at least "
+            DisplayError( NULL, wxT( "The framebuffer does not have at least "
                                    "one image attached to it." ) );
             break;
 
         case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT:
-            DisplayError( NULL, _( "The framebuffer read buffer is incomplete." ) );
+            DisplayError( NULL, wxT( "The framebuffer read buffer is incomplete." ) );
             break;
 
         case GL_FRAMEBUFFER_UNSUPPORTED_EXT:
-            DisplayError( NULL, _( "The combination of internal formats of the attached images "
+            DisplayError( NULL, wxT( "The combination of internal formats of the attached images "
                                    "violates an implementation-dependent set of restrictions." ) );
             break;
 
         case GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT:
-            DisplayError( NULL, _( "GL_RENDERBUFFER_SAMPLES is not the same "
+            DisplayError( NULL, wxT( "GL_RENDERBUFFER_SAMPLES is not the same "
                                    "for all attached renderbuffers" ) );
             break;
 
         case GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT:
-            DisplayError( NULL, _( "Framebuffer incomplete layer targets errors." ) );
+            DisplayError( NULL, wxT( "Framebuffer incomplete layer targets errors." ) );
             break;
 
         default:
-            DisplayError( NULL, _( "Cannot create the framebuffer." ) );
+            DisplayError( NULL, wxT( "Cannot create the framebuffer." ) );
             break;
         }
 
diff --git a/pcbnew/dialogs/dialog_plot_base.cpp b/pcbnew/dialogs/dialog_plot_base.cpp
index c0b2d82c65..fb2f7ed3c1 100644
--- a/pcbnew/dialogs/dialog_plot_base.cpp
+++ b/pcbnew/dialogs/dialog_plot_base.cpp
@@ -230,7 +230,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
 	bSizerGbrOpt->Add( m_useGerberExtensions, 0, wxALL, 2 );
 	
 	m_useGerberAttributes = new wxCheckBox( this, wxID_ANY, _("Include extended attributes"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_useGerberAttributes->SetToolTip( _("Include extended attributes for non-image data in the Gerber file") );
+	m_useGerberAttributes->SetToolTip( _("Include extended attributes (X2 Gerber files format) in the Gerber file") );
 	
 	bSizerGbrOpt->Add( m_useGerberAttributes, 0, wxALL, 2 );
 	
diff --git a/pcbnew/dialogs/dialog_plot_base.fbp b/pcbnew/dialogs/dialog_plot_base.fbp
index 2326520795..e460059ba5 100644
--- a/pcbnew/dialogs/dialog_plot_base.fbp
+++ b/pcbnew/dialogs/dialog_plot_base.fbp
@@ -2841,7 +2841,7 @@
                                                                 <property name="style"></property>
                                                                 <property name="subclass"></property>
                                                                 <property name="toolbar_pane">0</property>
-                                                                <property name="tooltip">Include extended attributes for non-image data in the Gerber file</property>
+                                                                <property name="tooltip">Include extended attributes (X2 Gerber files format) in the Gerber file</property>
                                                                 <property name="validator_data_type"></property>
                                                                 <property name="validator_style">wxFILTER_NONE</property>
                                                                 <property name="validator_type">wxDefaultValidator</property>
diff --git a/pcbnew/librairi.cpp b/pcbnew/librairi.cpp
index efe27218e4..9174f7dcbe 100644
--- a/pcbnew/librairi.cpp
+++ b/pcbnew/librairi.cpp
@@ -58,7 +58,7 @@
 // unique, "file local" translations:
 
 #define FMT_OK_OVERWRITE    _( "Library '%s' exists, OK to replace ?" )
-#define FMT_CREATE_LIB      _( "Create New Library Folder (the .pretty Library is the folder)" )
+#define FMT_CREATE_LIB      _( "Create New Library Folder (the .pretty folder is the library)" )
 #define FMT_OK_DELETE       _( "OK to delete module %s in library '%s'" )
 #define FMT_IMPORT_MODULE   _( "Import Footprint" )
 #define FMT_FILE_NOT_FOUND  _( "File '%s' not found" )