r19167 by jghali - #12334: Typo/Updates after string freeze for 1.4.5.svn

[scribus-commit]

Author: jghali
Date: Mon Jun  2 06:32:10 2014
New Revision: 19167

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19167
Log:
#12334: Typo/Updates after string freeze for 1.4.5.svn

Modified:
    branches/Version14x/Scribus/scribus/scribus.cpp
    branches/Version14x/Scribus/scribus/storyeditor.cpp
    branches/Version14x/Scribus/scribus/tabscrapbook.ui
    branches/Version14x/Scribus/scribus/undomanager.cpp
    branches/Version14x/Scribus/scribus/undomanager.h

Modified: branches/Version14x/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19167&path=/branches/Version14x/Scribus/scribus/scribus.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scribus.cpp (original)
+++ branches/Version14x/Scribus/scribus/scribus.cpp Mon Jun  2 06:32:10 2014
@@ -5657,7 +5657,7 @@
 		wdir = prefsManager->prefsFile->getContext("dirs")->get("save_text", prefsDocDir);
 	else
 		wdir = prefsManager->prefsFile->getContext("dirs")->get("save_text", ".");
-	QString fn = CFileDialog( wdir, tr("Save As"), tr("Text Files (*.txt);;All Files(*)"), "", fdShowCodecs|fdHidePreviewCheckBox);
+	QString fn = CFileDialog( wdir, tr("Save As"), tr("Text Files (*.txt);;All Files (*)"), "", fdShowCodecs|fdHidePreviewCheckBox);
 	if (!fn.isEmpty())
 	{
 		prefsManager->prefsFile->getContext("dirs")->set("save_text", fn.left(fn.lastIndexOf("/")));
@@ -7644,7 +7644,7 @@
 	view->Deselect(true);
 	UndoTransaction *trans = NULL;
 	if (UndoManager::undoEnabled())
-		trans = new UndoTransaction(undoManager->beginTransaction(Um::Selection, Um::IPolygon, Um::Copy, "", Um::IMultipleDuplicate));
+		trans = new UndoTransaction(undoManager->beginTransaction(Um::Selection, Um::IPolygon, Um::Duplicate, "", Um::IMultipleDuplicate));
 	slotEditPaste();
 	for (int b=0; b<doc->m_Selection->count(); ++b)
 	{

Modified: branches/Version14x/Scribus/scribus/storyeditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19167&path=/branches/Version14x/Scribus/scribus/storyeditor.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/storyeditor.cpp (original)
+++ branches/Version14x/Scribus/scribus/storyeditor.cpp Mon Jun  2 06:32:10 2014
@@ -3243,7 +3243,7 @@
 		QString fileName = "";
 		PrefsContext* dirs = prefsManager->prefsFile->getContext("dirs");
 		QString wdir = dirs->get("story_load", prefsManager->documentDir());
-		CustomFDialog dia(this, wdir, tr("Open"), tr("Text Files (*.txt);;All Files(*)"), fdExistingFiles | fdShowCodecs);
+		CustomFDialog dia(this, wdir, tr("Open"), tr("Text Files (*.txt);;All Files (*)"), fdExistingFiles | fdShowCodecs);
 		if (dia.exec() != QDialog::Accepted)
 			return;
 		LoadEnc = dia.TxCodeM->currentText();
@@ -3278,7 +3278,7 @@
 	QString fileName = "";
 	PrefsContext* dirs = prefsManager->prefsFile->getContext("dirs");
 	QString wdir = dirs->get("story_save", prefsManager->appPrefs.DocDir);
-	CustomFDialog dia(this, wdir, tr("Save as"), tr("Text Files (*.txt);;All Files(*)"), fdShowCodecs|fdHidePreviewCheckBox);
+	CustomFDialog dia(this, wdir, tr("Save as"), tr("Text Files (*.txt);;All Files (*)"), fdShowCodecs|fdHidePreviewCheckBox);
 	qApp->processEvents();
 	if (dia.exec() != QDialog::Accepted)
 	{

Modified: branches/Version14x/Scribus/scribus/tabscrapbook.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19167&path=/branches/Version14x/Scribus/scribus/tabscrapbook.ui
==============================================================================
--- branches/Version14x/Scribus/scribus/tabscrapbook.ui (original)
+++ branches/Version14x/Scribus/scribus/tabscrapbook.ui Mon Jun  2 06:32:10 2014
@@ -49,7 +49,7 @@
      <item>
       <widget class="QLabel" name="textLabel2" >
        <property name="toolTip" >
-        <string>The minimum number is 1; the maximum us 100.</string>
+        <string>The minimum number is 1; the maximum is 100.</string>
        </property>
        <property name="text" >
         <string>Number of Copied Items to Keep in Scrapbook:</string>

Modified: branches/Version14x/Scribus/scribus/undomanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19167&path=/branches/Version14x/Scribus/scribus/undomanager.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/undomanager.cpp (original)
+++ branches/Version14x/Scribus/scribus/undomanager.cpp Mon Jun  2 06:32:10 2014
@@ -950,6 +950,7 @@
 	UndoManager::SetLayerUnlocked   =tr("Unlock layer");
 	UndoManager::GetImage           = tr("Get image");
 	UndoManager::ChangeFormula      = tr("Change formula");
+	UndoManager::Duplicate          = tr("Duplicate");
 	UndoManager::MultipleDuplicate  = tr("Multiple duplicate");
 	UndoManager::ApplyTextStyle     = tr("Apply text style");
 	UndoManager::MenuUndo           = tr("&Undo: %1", "f.e. Undo: Move");
@@ -1168,6 +1169,7 @@
 QString UndoManager::SetLayerUnlocked   = "";
 QString UndoManager::GetImage           = "";
 QString UndoManager::ChangeFormula      = "";
+QString UndoManager::Duplicate          = "";
 QString UndoManager::MultipleDuplicate  = "";
 QString UndoManager::ApplyTextStyle     = "";
 QString UndoManager::MenuUndo           = "";

Modified: branches/Version14x/Scribus/scribus/undomanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19167&path=/branches/Version14x/Scribus/scribus/undomanager.h
==============================================================================
--- branches/Version14x/Scribus/scribus/undomanager.h (original)
+++ branches/Version14x/Scribus/scribus/undomanager.h Mon Jun  2 06:32:10 2014
@@ -580,6 +580,7 @@
 	static QString SetLayerUnlocked;
 	static QString GetImage;
 	static QString ChangeFormula;
+	static QString Duplicate;
 	static QString MultipleDuplicate;
 	static QString ApplyTextStyle;
 	static QString MenuUndo;