diff --git a/core/textdocumentsettings.cpp b/core/textdocumentsettings.cpp
index fcacaedf0..7b744627b 100644
--- a/core/textdocumentsettings.cpp
+++ b/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
}
diff --git a/doc/configure-backends.png b/doc/configure-backends.png
index 8411b23fa..fed28ad13 100644
Binary files a/doc/configure-backends.png and b/doc/configure-backends.png differ
diff --git a/doc/index.docbook b/doc/index.docbook
index 6631ad399..e83360b69 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -37,7 +37,7 @@ Context menu actions like Rename Bookmarks etc.)
&FDLNotice;
- 2013-04-06
+ 2013-05-19
0.16.60 (&kde; 4.11)
@@ -1549,7 +1549,7 @@ Add a 'Find Previous' entry
Settings
Configure Backends...
.
- 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.
The backends configuration dialog
@@ -1562,6 +1562,12 @@ Add a 'Find Previous' entry
+
+ Using backend configuration pages for EPub, FictionBook, Txt and OpenDocument Text you can define the font to render documents in the corresponding formats. The Choose... button in these pages opens standard &kde; font configuration window. Please refer to the &kde; Fundamentals documentation for the details.
+
+
+ The description of &PostScript; and &PDF; backends configuration pages can be found below.
+
&PostScript; backend configuration
diff --git a/generators/txt/Messages.sh b/generators/txt/Messages.sh
new file mode 100644
index 000000000..95c4e1cea
--- /dev/null
+++ b/generators/txt/Messages.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+$XGETTEXT $(find . -name "*.cpp" -o -name "*.h") -o $podir/okular_txt.pot
diff --git a/ui/pageview.cpp b/ui/pageview.cpp
index f38aef68f..8fd54cc64 100644
--- a/ui/pageview.cpp
+++ b/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 )
{