Consistently call "Note" -> "Pop-up Note" (as opposed to "Inline Note")

conf/widgetannottools.cpp

@@ -246,7 +246,7 @@ NewAnnotToolDialog::NewAnnotToolDialog( QWidget *parent )
     widgetLayout->addWidget( m_appearanceBox, 2, 0, 1, 2 );
 
     // Populate combobox with annotation types
-    m_type->addItem( i18n("Note"), QByteArray("note-linked") );
+    m_type->addItem( i18n("Pop-up Note"), QByteArray("note-linked") );
     m_type->addItem( i18n("Inline Note"), QByteArray("note-inline") );
     m_type->addItem( i18n("Freehand Line"), QByteArray("ink") );
     m_type->addItem( i18n("Straight Line"), QByteArray("straight-line") );

ui/annotationpropertiesdialog.cpp

@@ -115,7 +115,7 @@ void AnnotsPropertiesDialog::setCaptionTextbyAnnotType()
     {
         case Okular::Annotation::AText:
             if(((Okular::TextAnnotation*)m_annot)->textType()==Okular::TextAnnotation::Linked)
-                captiontext = i18n( "Note Properties" );
+                captiontext = i18n( "Pop-up Note Properties" );
             else
                 captiontext = i18n( "Inline Note Properties" );
             break;

ui/pageviewannotator.cpp

@@ -1052,7 +1052,7 @@ QString PageViewAnnotator::defaultToolName( const QDomElement &toolElement )
     else if ( annotType == "note-inline" )
         return i18n( "Inline Note" );
     else if ( annotType == "note-linked" )
-        return i18n( "Note" );
+        return i18n( "Pop-up Note" );
     else if ( annotType == "polygon" )
         return i18n( "Polygon" );
     else if ( annotType == "rectangle" )