diff --git a/core/document.cpp b/core/document.cpp
index a16fd6207..6337c3d55 100644
--- a/core/document.cpp
+++ b/core/document.cpp
@@ -523,7 +523,7 @@ Generator * DocumentPrivate::loadGeneratorLibrary( const QString& name, const QS
     {
         kWarning().nospace() << "Could not load '" << libname << "' library.";
         kWarning() << KLibLoader::self()->lastErrorMessage();
-        emit m_parent->error( i18n( "Could not load the necessary plugin to view the document" ), -1 );
+        emit m_parent->error( i18n( "Could not load the necessary plugin to view the document." ), -1 );
         return 0;
     }
 
diff --git a/ui/annotationguiutils.cpp b/ui/annotationguiutils.cpp
index eead1cd1d..07f77b02a 100644
--- a/ui/annotationguiutils.cpp
+++ b/ui/annotationguiutils.cpp
@@ -27,13 +27,13 @@ QString AnnotationGuiUtils::captionForAnnotation( Okular::Annotation * ann )
             if( ( (Okular::TextAnnotation*)ann )->textType() == Okular::TextAnnotation::Linked )
                 ret = i18n( "Note" );
             else
-                ret = i18n( "FreeText" );
+                ret = i18n( "Inline Note" );
             break;
         case Okular::Annotation::ALine:
             ret = i18n( "Line" );
             break;
         case Okular::Annotation::AGeom:
-            ret = i18n( "Geom" );
+            ret = i18n( "Geometry" );
             break;
         case Okular::Annotation::AHighlight:
             ret = i18n( "Highlight" );
diff --git a/ui/annotationpropertiesdialog.cpp b/ui/annotationpropertiesdialog.cpp
index d53946568..5a3cd1f14 100644
--- a/ui/annotationpropertiesdialog.cpp
+++ b/ui/annotationpropertiesdialog.cpp
@@ -147,13 +147,13 @@ void AnnotsPropertiesDialog::setCaptionTextbyAnnotType()
             if(((Okular::TextAnnotation*)m_annot)->textType()==Okular::TextAnnotation::Linked)
                 captiontext = i18n( "Note Properties" );
             else
-                captiontext = i18n( "FreeText Properties" );
+                captiontext = i18n( "Inline Note Properties" );
             break;
         case Okular::Annotation::ALine:
             captiontext = i18n( "Line Properties" );
             break;
         case Okular::Annotation::AGeom:
-            captiontext = i18n( "Geom Properties" );
+            captiontext = i18n( "Geometry Properties" );
             break;
         case Okular::Annotation::AHighlight:
             captiontext = i18n( "Highlight Properties" );
diff --git a/ui/data/tools.xml b/ui/data/tools.xml
index 00498d6bc..56a8f90e1 100644
--- a/ui/data/tools.xml
+++ b/ui/data/tools.xml
@@ -24,8 +24,8 @@ Engine/Annotation Types [specific attributes]:
         </engine>
         <shortcut>1</shortcut>
     </tool>
-    <tool id="2" name="FreeText" pixmap="text">
-        <tooltip>Free Text Annotation (drag to select a zone)</tooltip>
+    <tool id="2" name="Inline Note" pixmap="text">
+        <tooltip>Inline Text Annotation (drag to select a zone)</tooltip>
         <engine type="PickPoint" color="#FFFF00" hoverIcon="tool_note" block="true">
             <annotation type="FreeText" color="#FFFF00" />
         </engine>
@@ -85,6 +85,5 @@ Engine/Annotation Types [specific attributes]:
         <engine type="PickPoint" color="#00ffff">
             <annotation type="GeomCircle" color="#00ffff" />
         </engine>
-        <shortcut>10</shortcut>
     </tool>
 </annotatingTools>
diff --git a/ui/formwidgets.cpp b/ui/formwidgets.cpp
index 5fa96557a..0b3485098 100644
--- a/ui/formwidgets.cpp
+++ b/ui/formwidgets.cpp
@@ -144,7 +144,7 @@ FileEdit::FileEdit( Okular::FormFieldText * text, QWidget * parent )
     : KUrlRequester( parent ), FormWidgetIface( this, text ), m_form( text )
 {
     setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly );
-    setFilter( QString( "*|" ) + i18n( "All files" ) );
+    setFilter( i18n( "*|All files" ) );
     setPath( m_form->text() );
     lineEdit()->setAlignment( m_form->textAlignment() );
     setEnabled( !m_form->isReadOnly() );
diff --git a/ui/pageviewannotator.cpp b/ui/pageviewannotator.cpp
index ad84a7b28..4908ecb42 100644
--- a/ui/pageviewannotator.cpp
+++ b/ui/pageviewannotator.cpp
@@ -155,9 +155,9 @@ class PickPointEngine : public AnnotatorEngine
             if ( typeString == "FreeText")	//<annotation type="Text"
             {
                 //note dialog
-                QString prompt = i18n( "Please input the free text:" ) ;
+                QString prompt = i18n( "Text of the new note:" );
                 bool resok;
-                QString note = KInputDialog::getMultiLineText( i18n( "Free Text" ), prompt, QString(), &resok );
+                QString note = KInputDialog::getMultiLineText( i18n( "New Text Note" ), prompt, QString(), &resok );
                 if(resok)
                 {
                     //add note
diff --git a/ui/side_reviews.cpp b/ui/side_reviews.cpp
index a44801870..cb2223ad7 100644
--- a/ui/side_reviews.cpp
+++ b/ui/side_reviews.cpp
@@ -312,7 +312,7 @@ void Reviews::addContents( const Okular::Page * page )
             // get author's name
             QString author = annotation->author();
             if ( author.isEmpty() )
-                author = i18n( "Unknown" );
+                author = i18nc( "Unknown author", "Unknown" );
 
             // find out a previous entry by author
             QTreeWidgetItemIterator it = pageItem
@@ -328,7 +328,7 @@ void Reviews::addContents( const Okular::Page * page )
                     authorItem = new QTreeWidgetItem( pageItem );
                 else
                     authorItem = new QTreeWidgetItem( m_listView );
-                QString icon = author != i18n( "Unknown" ) ? "personal" : "presence_away";
+                QString icon = author != i18nc( "Unknown author", "Unknown" ) ? "personal" : "presence_away";
                 authorItem->setText( 0, author );
                 authorItem->setIcon( 0, KIcon( icon ) );
             }