Merge remote-tracking branch 'origin/master' into configurable-review-tools

core/textdocumentsettings.cpp

@@ -38,7 +38,7 @@ TextDocumentSettingsWidget::TextDocumentSettingsWidget( QWidget *parent )
     d->property->setObjectName( QString::fromUtf8( objectName ) );   \
     addRow( labelName, d->property );
 
-    ADD_WIDGET( mFont, KFontRequester, "kcfg_Font", "&Default Font:" );
+    ADD_WIDGET( mFont, KFontRequester, "kcfg_Font", i18n("&Default Font:") );
 #undef ADD_WIDGET
 }
 

doc/index.docbook

@@ -37,7 +37,7 @@ Context menu actions like Rename Bookmarks etc.)
 			<!-- TRANS:ROLES_OF_TRANSLATORS -->
 		</authorgroup>
 		<legalnotice>&FDLNotice;</legalnotice>
-		<date>2013-04-06</date>
+		<date>2013-05-19</date>
 		<releaseinfo>0.16.60 (&kde; 4.11)</releaseinfo>
 		<!-- Abstract about this handbook -->
 		<abstract>
@@ -1549,7 +1549,7 @@ Add a 'Find Previous' entry
 	      <guimenu>Settings</guimenu>
 	      <guimenuitem>Configure Backends...</guimenuitem>
 	    </menuchoice>.
-	    Currently, configuration options are provided for &PostScript; and &PDF; backends only.
+	    Currently, configuration options are provided for EPub, &PostScript;, FictionBook, Txt, OpenDocument Text, and &PDF; backends only.
 	  </para>
 	  <screenshot>
 	    <screeninfo>The backends configuration dialog</screeninfo>
@@ -1562,6 +1562,12 @@ Add a 'Find Previous' entry
 	      </textobject>
 	    </mediaobject>
 	  </screenshot>
+	  <para>
+	    Using backend configuration pages for EPub, FictionBook, Txt and OpenDocument Text you can define the font to render documents in the corresponding formats. The <guibutton>Choose...</guibutton> button in these pages opens standard &kde; font configuration window. Please refer to the <ulink url="help:/fundamentals/fonts.html">&kde; Fundamentals documentation</ulink> for the details.
+	  </para>
+	  <para>
+	    The description of &PostScript; and &PDF; backends configuration pages can be found below.
+	  </para>
 	  <sect1 id="config-ghostscript">
 	    <title>&PostScript; backend configuration</title>
 	    <para>

generators/txt/Messages.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+$XGETTEXT $(find . -name "*.cpp" -o -name "*.h") -o $podir/okular_txt.pot

ui/pageview.cpp

@@ -826,9 +826,6 @@ void PageView::copyTextSelection() const
 
 void PageView::selectAll()
 {
-    if ( Okular::Settings::mouseMode() == Okular::Settings::EnumMouseMode::TextSelect )
-        return;
-
     QVector< PageViewItem * >::const_iterator it = d->items.constBegin(), itEnd = d->items.constEnd();
     for ( ; it < itEnd; ++it )
     {