Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 158 → Rev 159

/trunk/Scribus/Doxyfile
138,7 → 138,7
# The TAB_SIZE tag can be used to set the number of spaces in a tab.
# Doxygen uses this value to replace tabs by spaces in code fragments.
 
TAB_SIZE = 8
TAB_SIZE = 4
 
# This tag can be used to specify a number of aliases that acts
# as commands in the documentation. An alias has the form "name=value".
370,7 → 370,7
# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp
# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc
 
FILE_PATTERNS = *.h *.c *.cpp
FILE_PATTERNS = *.h *.cpp
 
# The RECURSIVE tag can be used to turn specify whether or not subdirectories
# should be searched for input files as well. Possible values are YES and NO.
/trunk/Scribus/ChangeLogCVS
1,4 → 1,7
Changes since Version 1.1.4
14.01.2004 Fixed Textframe Issues.
Removed Hardcoded Paths from the Source.
 
13.01.2004 Fixed Cursor Placement Issues.
 
12.01.2004 Fixed Bug with Sub/Superscript.
/trunk/Scribus/scribus/hyphenator.cpp
31,6 → 31,16
#include <string>
#include "scribus.h"
 
/*!
\fn Hyphenator::Hyphenator(QWidget* parent, ScribusDoc *dok, ScribusApp* app)
\brief Constructor reads user configuration and sets hyphenator properties.
\date
\author Franz Schmid
\param parent unused
\param dok ScribusDoc reference. It's used for preferences accessing.
\param app ScribusApp reference. It's used for preferences accessing.
\retval None
*/
Hyphenator::Hyphenator(QWidget* parent, ScribusDoc *dok, ScribusApp* app) : QObject( parent, "bu")
{
char *filename = NULL;
72,11 → 82,27
useAble = true;
}
 
/*!
\fn Hyphenator::~Hyphenator()
\brief Safely cleans hyphen.
\date
\author Franz Schmid
\param None
\retval None
*/
Hyphenator::~Hyphenator()
{
hnj_hyphen_free(hdict);
}
 
/*!
\fn void Hyphenator::slotNewDict(QString name)
\brief Loads dictionary and fills parameters like \a useAble, \a codec, \a hdict.
\date
\author Franz Schmid
\param name is the name of specified language - filename.
\retval None
*/
void Hyphenator::slotNewDict(QString name)
{
char *filename = NULL;
112,6 → 138,16
useAble = true;
}
 
/*!
\fn void Hyphenator::slotNewSettings(int Wordlen, bool Autom, bool ACheck)
\brief Writes actual hyphen configuration into \a doc object.
\date
\author Franz Schmid
\param WordLen lenght of the word.
\param Autom is automatic flag.
\param ACheck AutoCheck flag.
\retval None
*/
void Hyphenator::slotNewSettings(int Wordlen, bool Autom, bool ACheck)
{
MinWordLen = Wordlen;
122,6 → 158,16
doc->AutoCheck = AutoCheck;
}
 
/*!
\fn void Hyphenator::slotHyphenateWord(PageItem* it, QString text, int firstC)
\brief Make hyphenation when user edits text in text frame manually.
\detail If is everything set correctly and textframe selected language fits the
dictionary language. At first removes any old hyphens then sets new one.
\param it references \see PageItem - text frame.
\param text is a word to hyphenate.
\param firstC is the first character of the word in \a it item.
\retval None
*/
void Hyphenator::slotHyphenateWord(PageItem* it, QString text, int firstC)
{
const char *word;
159,6 → 205,14
}
}
 
/*!
\fn void Hyphenator::slotHyphenate(PageItem* it)
\brief Make hyphenation as described in \see slotHyphenateWord for the whole text frame.
\date
\author Franz Schmid
\param it references \see PageItem - text frame.
\retval None
*/
void Hyphenator::slotHyphenate(PageItem* it)
{
const char *word;
/trunk/Scribus/scribus/util.cpp
212,17 → 212,18
QPixmap LoadPDF(QString fn, int Seite, int Size, int *w, int *h)
{
QString tmp, cmd1, cmd2;
QString tmpFile = QString(getenv("HOME"))+"/.scribus/sc.png";
QPixmap pm;
int ret = -1;
tmp.setNum(Seite);
cmd1 = "gs -q -dNOPAUSE -sDEVICE=png16m -r72 -sOutputFile=/tmp/sc.png -dFirstPage="+tmp+" -dLastPage="+tmp+" ";
cmd1 = "gs -q -dNOPAUSE -sDEVICE=png16m -r72 -sOutputFile="+tmpFile+" -dFirstPage="+tmp+" -dLastPage="+tmp+" ";
cmd2 = " -c showpage -c quit";
ret = system(cmd1 + "\"" + fn + "\"" + cmd2);
if (ret == 0)
{
QImage image;
image.load("/tmp/sc.png");
system("rm -f /tmp/sc.png");
image.load(tmpFile);
system("rm -f "+tmpFile);
QImage im2;
*h = image.height();
*w = image.width();
252,19 → 253,20
double x, y, b, h;
bool found = false;
int ret = -1;
QString tmpFile = QString(getenv("HOME"))+"/.scribus/sc.png";
QFileInfo fi = QFileInfo(fn);
QString ext = fi.extension(false).lower();
if (ext == "pdf")
{
cmd1 = "gs -q -dNOPAUSE -sDEVICE=png16m -r72 -sOutputFile=/tmp/sc.png -dFirstPage=1 -dLastPage=1 ";
cmd1 = "gs -q -dNOPAUSE -sDEVICE=png16m -r72 -sOutputFile="+tmpFile+" -dFirstPage=1 -dLastPage=1 ";
cmd2 = " -c showpage -c quit";
ret = system(cmd1 + "\"" + fn + "\"" + cmd2);
if (ret == 0)
{
QImage image;
image.load("/tmp/sc.png");
image.load(tmpFile);
Bild = image.convertDepth(32);
system("rm -f /tmp/sc.png");
system("rm -f "+tmpFile);
}
}
if ((ext == "eps") || (ext == "ps"))
296,7 → 298,7
{
QTextStream ts2(&BBox, IO_ReadOnly);
ts2 >> dummy >> x >> y >> b >> h;
cmd1 = "gs -q -dNOPAUSE -sDEVICE=png16m -r72 -sOutputFile=/tmp/sc.png -g";
cmd1 = "gs -q -dNOPAUSE -sDEVICE=png16m -r72 -sOutputFile="+tmpFile+" -g";
cmd2 = " -c showpage -c quit";
ret = system(cmd1 + tmp.setNum(qRound(b)) + "x" + tmp2.setNum(qRound(h)) + " \"" + fn + "\"" + cmd2);
if (ret == 0)
303,11 → 305,11
{
QImage im4;
QImage image;
image.load("/tmp/sc.png");
image.load(tmpFile);
image = image.convertDepth(32);
int wi = image.width();
int hi = image.height();
QBitmap bm("/tmp/sc.png");
QBitmap bm(tmpFile);
bm.fill(Qt::color1);
QPainter pp;
pp.begin(&bm);
344,7 → 346,7
im4.setAlphaBuffer(true);
im4 = pm.convertToImage();
Bild = im4.copy(static_cast<int>(x), 0, static_cast<int>(b-x), static_cast<int>(h-y));
system("rm -f /tmp/sc.png");
system("rm -f "+tmpFile);
}
}
}
412,19 → 414,20
double x, y, b, h;
bool found = false;
int ret = -1;
QString tmpFile = QString(getenv("HOME"))+"/.scribus/sc.png";
QFileInfo fi = QFileInfo(fn);
QString ext = fi.extension(false).lower();
if (ext == "pdf")
{
cmd1 = "gs -q -dNOPAUSE -sDEVICE=png16m -r72 -sOutputFile=/tmp/sc.png -dFirstPage=1 -dLastPage=1 ";
cmd1 = "gs -q -dNOPAUSE -sDEVICE=png16m -r72 -sOutputFile="+tmpFile+" -dFirstPage=1 -dLastPage=1 ";
cmd2 = " -c showpage -c quit";
ret = system(cmd1 + "\"" + fn + "\"" + cmd2);
if (ret == 0)
{
QImage image;
image.load("/tmp/sc.png");
image.load(tmpFile);
Bild = image.convertDepth(32);
system("rm -f /tmp/sc.png");
system("rm -f "+tmpFile);
*realCMYK = false;
}
}
457,7 → 460,7
{
QTextStream ts2(&BBox, IO_ReadOnly);
ts2 >> dummy >> x >> y >> b >> h;
cmd1 = "gs -q -dNOPAUSE -sDEVICE=png16m -r72 -sOutputFile=/tmp/sc.png -g";
cmd1 = "gs -q -dNOPAUSE -sDEVICE=png16m -r72 -sOutputFile="+tmpFile+" -g";
cmd2 = " -c showpage -c quit";
ret = system(cmd1 + tmp.setNum(qRound(b)) + "x" + tmp2.setNum(qRound(h)) + " \"" + fn + "\"" + cmd2);
if (ret == 0)
464,11 → 467,11
{
QImage im4;
QImage image;
image.load("/tmp/sc.png");
image.load(tmpFile);
image = image.convertDepth(32);
int wi = image.width();
int hi = image.height();
QBitmap bm("/tmp/sc.png");
QBitmap bm(tmpFile);
bm.fill(Qt::color1);
QPainter pp;
pp.begin(&bm);
505,7 → 508,7
im4.setAlphaBuffer(true);
im4 = pm.convertToImage();
Bild = im4.copy(static_cast<int>(x), 0, static_cast<int>(b-x), static_cast<int>(h-y));
system("rm -f /tmp/sc.png");
system("rm -f "+tmpFile);
*realCMYK = false;
}
}
/trunk/Scribus/scribus/pageitem.cpp
589,8 → 589,7
ColBound = FPoint((ColWidth + ColGap) * CurrCol+Extra + lineCorr, ColWidth * (CurrCol+1) + ColGap * CurrCol + Extra+lineCorr);
ColBound = FPoint(ColBound.x(), ColBound.y()+RExtra+lineCorr);
CurX = ColBound.x();
// CurY = Doc->Vorlagen[0].LineSpa+TExtra+lineCorr;
CurY = TExtra+lineCorr;
CurY = Doc->Vorlagen[0].LineSpa+TExtra+lineCorr;
LiList.clear();
BuPos = 0;
BuPos2 = 0;
653,7 → 652,7
{
DropLines = Doc->Vorlagen[absa].DropLin;
tmpCurY = CurY;
CurY += Doc->Vorlagen[absa].LineSpa * (DropLines);
CurY += Doc->Vorlagen[absa].LineSpa * (DropLines-1);
}
}
}
661,7 → 660,6
CurY += Doc->Vorlagen[absa].Avor;
if (LiList.count() == 0)
{
// CurY += Doc->Vorlagen[absa].LineSpa - Doc->Vorlagen[0].LineSpa;
if ((a > 0) && (Ptext.at(a-1)->ch == QChar(13)))
{
CurX += Doc->Vorlagen[hl->cab].First;
677,7 → 675,6
}
}
}
// oldCurY = CurY;
if (DropCmode)
{
chs = qRound((Doc->Vorlagen[absa].LineSpa * DropLines) * 10);
715,10 → 712,7
if (CurX+RExtra+lineCorr > ColBound.y())
{
fBorder = false;
if (a == 0)
CurY++;
else
CurY += QMAX(Doc->Vorlagen[hl->cab].LineSpa, 1);
CurY++;
CurX = ColBound.x();
if (CurY+BExtra+lineCorr > Height)
{
728,10 → 722,9
{
ColWidth = (Width - (ColGap * (Cols - 1)) - Extra - RExtra - 2*lineCorr) / Cols;
ColBound = FPoint((ColWidth + ColGap) * CurrCol + Extra+lineCorr, ColWidth * (CurrCol+1) + ColGap * CurrCol + Extra+lineCorr);
CurY = Doc->Vorlagen[0].LineSpa+TExtra+lineCorr;
CurY = Doc->Vorlagen[hl->cab].LineSpa+TExtra+lineCorr;
CurX = ColBound.x();
ColBound = FPoint(ColBound.x(), ColBound.y()+RExtra+lineCorr);
// oldCurY = CurY;
if ((a > 0) && (Ptext.at(a-1)->ch == QChar(13)))
{
CurX += Doc->Vorlagen[hl->cab].First;
756,12 → 749,14
}
}
}
pt1 = QPoint(static_cast<int>(CurX), static_cast<int>(CurY+desc));
pt1 = QPoint(static_cast<int>(CurX), static_cast<int>(CurY+desc+BExtra+lineCorr));
pt2 = QPoint(static_cast<int>(CurX), static_cast<int>(CurY-asce));
}
// oldCurY = CurY;
if (fBorder)
if ((fBorder) && (a == 0))
{
CurX += Extra+lineCorr;
CurY += TExtra+lineCorr;
}
fBorder = false;
}
if ((hl->ch == ".") && (TabCode == 2) && (RTab))
891,12 → 886,10
DropCmode = false;
AbsHasDrop = true;
maxDY = CurY;
CurY = tmpCurY;
cm = QRegion(pf.xForm(QRect(qRound(hl->xp), qRound(hl->yp-DropLines*Doc->Vorlagen[absa].LineSpa), qRound(wide), qRound(DropLines*Doc->Vorlagen[absa].LineSpa))));
CurY -= Doc->Vorlagen[absa].LineSpa * (DropLines-1);
cm = QRegion(pf.xForm(QRect(qRound(hl->xp), qRound(maxDY-DropLines*Doc->Vorlagen[absa].LineSpa), qRound(wide), qRound(DropLines*Doc->Vorlagen[absa].LineSpa))));
cl = cl.subtract(cm);
}
// else
// CurY = oldCurY;
if ((hl->ch == QChar(13)) || (outs))
{
RTab = false;
/trunk/Scribus/scribus/libabout/about.cpp
54,7 → 54,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1. %2 %3 ").arg(13).arg("January").arg(2004);
QString bu = tr("%1. %2 %3 ").arg(14).arg("January").arg(2004);
#ifdef HAVE_CMS
bu += "C";
#else
164,7 → 164,7
"<tr><td>Kevin Donnelly</td><td>kevin@dotmon.com</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"<tr><td><b>" + tr("Russian:") + "</b></td><td></td></tr>" +
"<tr><td>Alexandre Prokoudine</td><td>avp@cad.ru</td></tr>" +
"<tr><td>Alexandre Prokoudine</td><td>techwriter@land.ru</td></tr>" +
"<tr><td> </td><td> </td></tr>" +
"<tr><td><b>" + tr("Brazilian:") + "</b></td><td></td></tr>" +
"<tr><td>Celio Santos</td><td>celio@electronic.srv.br</td></tr>" +
/trunk/Scribus/scribus/hyphenator.h
8,6 → 8,10
class ScribusApp;
class PageItem;
 
/*!
This class is the core of the Scribus hyphenation system.
*/
 
class Hyphenator : public QObject
{
Q_OBJECT
15,14 → 19,25
public:
Hyphenator(QWidget* parent, ScribusDoc *dok, ScribusApp* app);
~Hyphenator();
/*! There are languages having rule not to hyphen word shorter than
MinWordLen */
int MinWordLen;
/*! Language in use */
QString Language;
/*! Flag - if user set auto hyphen processing.*/
bool Automatic;
/*! Flag - obsolete? */
bool AutoCheck;
/*! Reference to the hyphen dictionary structure. */
HyphenDict *hdict;
/*! Embeded reference to the \see ScribusDoc filled by \a dok */
ScribusDoc *doc;
/*! Embeded reference to the \see ScribusApp filled by \a app */
ScribusApp *Sap;
/*! Flag - if is the dictionary without errors etc. If is it 'false'
hyphen aborted. */
bool useAble;
/*! Qt text codec which handles local characters. */
QTextCodec *codec;
 
public slots:
/trunk/Scribus/scribus/scribus.cpp
601,7 → 601,7
editMenu->insertSeparator();
MenID = editMenu->insertItem( tr("Colors..."), this , SLOT(slotEditColors()));
SetKeyEntry(14, tr("Colors..."), MenID, 0);
edid6 = editMenu->insertItem( tr("Styles..."), this , SLOT(slotEditStyles()));
edid6 = editMenu->insertItem( tr("Paragraph Styles..."), this , SLOT(slotEditStyles()));
edid6a = editMenu->insertItem( tr("Line Styles..."), this , SLOT(slotEditLineStyles()));
SetKeyEntry(15, tr("Styles..."), edid6, 0);
tman = editMenu->insertItem( tr("Templates..."), this, SLOT(ManageTemp()));
/trunk/Scribus/scribus/page.cpp
6568,7 → 6568,7
break;
case 8:
case 4:
z = PaintText(x, y, w, h, 1, Buffer->Pcolor);
z = PaintText(x, y, w, h, pw, Buffer->Pcolor);
if ((Buffer->isAnnotation) && (Buffer->AnUseIcons))
{
Items.at(z)->LocalScX = Buffer->LocalScX;
7245,6 → 7245,7
double x, y, b, h, c, m, k;
bool found = false;
int ret = -1;
QString tmpFile = QString(getenv("HOME"))+"/.scribus/sc.png";
QFileInfo fi = QFileInfo(fn);
if (!fi.exists())
{
7256,7 → 7257,7
QString ext = fi.extension(false).lower();
if (ext == "pdf")
{
cmd1 = "gs -q -dNOPAUSE -sDEVICE=png16m -r72 -sOutputFile=/tmp/sc.png -dFirstPage=1 -dLastPage=1 ";
cmd1 = "gs -q -dNOPAUSE -sDEVICE=png16m -r72 -sOutputFile="+tmpFile+" -dFirstPage=1 -dLastPage=1 ";
cmd2 = " -c showpage -c quit";
ret = system(cmd1 + "\"" + fn + "\"" + cmd2);
if (ret == 0)
7263,7 → 7264,7
{
QImage im4;
QImage image;
image.load("/tmp/sc.png");
image.load(tmpFile);
image = image.convertDepth(32);
im4 = ProofPict(&image, Items.at(ItNr)->IProfile, Items.at(ItNr)->IRender);
Items.at(ItNr)->pixm = im4;
7279,7 → 7280,7
Items.at(ItNr)->LocalViewY = Items.at(ItNr)->LocalScY;
Items.at(ItNr)->dpiX = 72.0;
Items.at(ItNr)->dpiY = 72.0;
system("rm -f /tmp/sc.png");
system("rm -f "+tmpFile);
}
else
{
7350,7 → 7351,7
{
QTextStream ts2(&BBox, IO_ReadOnly);
ts2 >> dummy >> x >> y >> b >> h;
cmd1 = "gs -q -dNOPAUSE -sDEVICE=png16m -r72 -sOutputFile=/tmp/sc.png -g";
cmd1 = "gs -q -dNOPAUSE -sDEVICE=png16m -r72 -sOutputFile="+tmpFile+" -g";
cmd2 = " -c showpage -c quit";
ret = system(cmd1 + tmp.setNum(qRound(b)) + "x" + tmp2.setNum(qRound(h)) + " \"" + fn + "\"" + cmd2);
if (ret == 0)
7357,11 → 7358,11
{
QImage im4;
QImage image;
image.load("/tmp/sc.png");
image.load(tmpFile);
image = image.convertDepth(32);
int wi = image.width();
int hi = image.height();
QBitmap bm("/tmp/sc.png");
QBitmap bm(tmpFile);
bm.fill(Qt::color1);
QPainter pp;
pp.begin(&bm);
7412,7 → 7413,7
Items.at(ItNr)->LocalViewY = Items.at(ItNr)->LocalScY;
Items.at(ItNr)->dpiX = 72.0;
Items.at(ItNr)->dpiY = 72.0;
system("rm -f /tmp/sc.png");
system("rm -f "+tmpFile);
}
else
{
/trunk/Scribus/scribus/libpdf/pdflib.cpp
2903,6 → 2903,7
#endif
if ((ext == "eps") || (ext == "pdf"))
{
QString tmpFile = QString(getenv("HOME"))+"/.scribus/sc.png";
if (Options->RecalcPic)
{
afl = QMIN(Options->PicRes, Options->Resolution);
2912,15 → 2913,15
afl = Options->Resolution;
if (ext == "pdf")
{
cmd1 = "gs -q -dNOPAUSE -sDEVICE=png16m -r"+IToStr(afl)+" -sOutputFile=/tmp/sc.png -dFirstPage=1 -dLastPage=1 ";
cmd1 = "gs -q -dNOPAUSE -sDEVICE=png16m -r"+IToStr(afl)+" -sOutputFile="+tmpFile+" -dFirstPage=1 -dLastPage=1 ";
cmd2 = " -c showpage -c quit";
ret = system(cmd1 + "\"" + fn + "\"" + cmd2);
if (ret == 0)
{
QImage image;
image.load("/tmp/sc.png");
image.load(tmpFile);
img = image.convertDepth(32);
system("rm -f /tmp/sc.png");
system("rm -f "+tmpFile);
}
}
else
2956,16 → 2957,16
y2 = y2 * aufl;
b = b * aufl;
h = h * aufl;
cmd1 = "gs -q -dNOPAUSE -sDEVICE=png16m -r"+IToStr(afl)+" -sOutputFile=/tmp/sc.png -g";
cmd1 = "gs -q -dNOPAUSE -sDEVICE=png16m -r"+IToStr(afl)+" -sOutputFile="+tmpFile+" -g";
cmd2 = " -c showpage -c quit";
ret = system(cmd1 + tmp.setNum(qRound(b)) + "x" + tmpy.setNum(qRound(h)) + " \"" + fn + "\"" + cmd2);
if (ret == 0)
{
QImage image;
image.load("/tmp/sc.png");
image.load(tmpFile);
image = image.convertDepth(32);
img = image.copy(static_cast<int>(x2), 0, static_cast<int>(b-x2), static_cast<int>(h-y2));
system("rm -f /tmp/sc.png");
system("rm -f "+tmpFile);
}
}
}
/trunk/Scribus/scribus/po/scribus.ru.ts
119,6 → 119,14
<source>Russian:</source>
<translation>На русский:</translation>
</message>
<message>
<source>Windows port:</source>
<translation>Портирование под Windows:</translation>
</message>
<message>
<source>Brazilian:</source>
<translation>На бразильский:</translation>
</message>
</context>
<context>
<name>AdvOptions</name>
454,7 → 462,7
</message>
<message>
<source>Roll Over</source>
<translation type="unfinished"></translation>
<translation>Roll Over</translation>
</message>
<message>
<source>Icon Placement...</source>
905,7 → 913,7
</message>
<message>
<source>Apply to Actual Page</source>
<translation>Применить к текущей странице</translation>
<translation type="obsolete">Применить к текущей странице</translation>
</message>
<message>
<source>Apply from Page:</source>
923,6 → 931,10
<source>Cancel</source>
<translation>Отменить</translation>
</message>
<message>
<source>Apply to Current Page</source>
<translation>Применить к текущей странице</translation>
</message>
</context>
<context>
<name>Biblio</name>
1706,6 → 1718,18
<source>Name of the Style is not unique</source>
<translation>Стиль с таким именем уже существует</translation>
</message>
<message>
<source>Drop Caps</source>
<translation>Буквица</translation>
</message>
<message>
<source>Lines:</source>
<translation>Строк:</translation>
</message>
<message>
<source>Tabulators...</source>
<translation>Табуляторы...</translation>
</message>
</context>
<context>
<name>Editor</name>
1851,6 → 1875,18
<source>Copy of %1</source>
<translation>Копия %1</translation>
</message>
<message>
<source>Color Sets</source>
<translation>Наборы цветов</translation>
</message>
<message>
<source>Current Color Set:</source>
<translation>Текущий набор цветов:</translation>
</message>
<message>
<source>Save Color Set</source>
<translation>Сохранить набор цветов</translation>
</message>
</context>
<context>
<name>FontPrefs</name>
2322,6 → 2358,25
</message>
</context>
<context>
<name>MSpinBox</name>
<message>
<source> pt</source>
<translation>pt</translation>
</message>
<message>
<source> mm</source>
<translation>mm</translation>
</message>
<message>
<source> in</source>
<translation>in</translation>
</message>
<message>
<source> p</source>
<translation>p</translation>
</message>
</context>
<context>
<name>Mdup</name>
<message>
<source>Multiple Duplicate</source>
2533,11 → 2588,11
</message>
<message>
<source>Rotation</source>
<translation>Поворот</translation>
<translation type="obsolete">Поворот</translation>
</message>
<message>
<source>by:</source>
<translation>на:</translation>
<translation type="obsolete">на:</translation>
</message>
<message>
<source>Edit Shape...</source>
2563,7 → 2618,7
</message>
<message>
<source> pts</source>
<translation>pts</translation>
<translation type="obsolete">pts</translation>
</message>
<message>
<source>Distance from Curve:</source>
2851,6 → 2906,26
<source>Shape:</source>
<translation>Очертание:</translation>
</message>
<message>
<source>Rotation:</source>
<translation type="unfinished">Поворот:</translation>
</message>
<message>
<source>Basepoint:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Columns:</source>
<translation type="unfinished">Количество столбцов:</translation>
</message>
<message>
<source>Gap:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Tabulators...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MultiLine</name>
3256,6 → 3331,22
<source> p</source>
<translation>p</translation>
</message>
<message>
<source>Rotates the Path counter-clockwise</source>
<translation>Вращать контур против часовой стрелки</translation>
</message>
<message>
<source>Rotates the Path clockwise</source>
<translation>Вращать контур по часовой стрелке</translation>
</message>
<message>
<source>Reduce the Size of the Path by 10%</source>
<translation>Уменьшить контур на 10%</translation>
</message>
<message>
<source>Enlarges the Size of the Path by 10%</source>
<translation>Увеличить контур на 10%</translation>
</message>
</context>
<context>
<name>PConsole</name>
3540,11 → 3631,11
</message>
<message>
<source>Screen</source>
<translation>Экрана</translation>
<translation type="obsolete">Экрана</translation>
</message>
<message>
<source>Printer</source>
<translation>Принтера</translation>
<translation>Вывода на печать</translation>
</message>
<message>
<source>Solid Colors:</source>
3642,6 → 3733,10
<source>PDF-Files (*.pdf);;All Files (*)</source>
<translation>PDF-документы (*.pdf);;Все файлы (*)</translation>
</message>
<message>
<source>Screen / Web</source>
<translation>Просмотра с монитора / Web</translation>
</message>
</context>
<context>
<name>PPreview</name>
3810,7 → 3905,7
</message>
<message>
<source>Text Chain</source>
<translation>Текстовая цепочка</translation>
<translation type="obsolete">Текстовая цепочка</translation>
</message>
<message>
<source>Text on a Path</source>
3832,6 → 3927,74
<source>Info</source>
<translation>Информация</translation>
</message>
<message>
<source>Paste</source>
<translation>Вставить</translation>
</message>
<message>
<source>Hide Margins</source>
<translation>Спрятать поля</translation>
</message>
<message>
<source>Show Margins</source>
<translation>Показать поля</translation>
</message>
<message>
<source>Hide Frames</source>
<translation>Спрятать обрамление</translation>
</message>
<message>
<source>Show Frames</source>
<translation>Показывать обрамление</translation>
</message>
<message>
<source>Hide Images</source>
<translation>Спрятать изображения</translation>
</message>
<message>
<source>Show Images</source>
<translation>Показывать изображения</translation>
</message>
<message>
<source>Hide Grid</source>
<translation>Спрятать сетку</translation>
</message>
<message>
<source>Show Grid</source>
<translation>Показать сетку</translation>
</message>
<message>
<source>Hide Guides</source>
<translation>Спрятать направляющие</translation>
</message>
<message>
<source>Show Guides</source>
<translation>Показать направляющие</translation>
</message>
<message>
<source>Snap to Grid</source>
<translation>Привязать к сетке</translation>
</message>
<message>
<source>Snap to Guides</source>
<translation>Привязать к направляющим</translation>
</message>
<message>
<source>Linked Text</source>
<translation>Связанный текст</translation>
</message>
<message>
<source>Show Properties...</source>
<translation>Показать Свойства...</translation>
</message>
<message>
<source>Hide Properties...</source>
<translation>Спрятать Свойства...</translation>
</message>
<message>
<source>Clear Contents</source>
<translation>Удалить содержимое</translation>
</message>
</context>
<context>
<name>PicSearch</name>
3998,7 → 4161,7
</message>
<message>
<source>Millimeters (mm)</source>
<translation>Миллиметры (мм)</translation>
<translation type="obsolete">Миллиметры (мм)</translation>
</message>
<message>
<source>Inches (in)</source>
4392,6 → 4555,18
<source> p</source>
<translation>p</translation>
</message>
<message>
<source>Millimetres (mm)</source>
<translation>Миллиметры (mm)</translation>
</message>
<message>
<source>Columns:</source>
<translation>Столбцов:</translation>
</message>
<message>
<source>Gap:</source>
<translation>Интервал:</translation>
</message>
</context>
<context>
<name>QObject</name>
5399,6 → 5574,10
<source>Scribus crashes due to Signal #%1</source>
<translation>Scribus обрушился по причине #%1</translation>
</message>
<message>
<source>Tabulators...</source>
<translation>Табуляторы...</translation>
</message>
</context>
<context>
<name>ScribusDoc</name>
5456,6 → 5635,10
<source>Leave Anyway</source>
<translation>Выйти без сохранения</translation>
</message>
<message>
<source>Close Anyway</source>
<translation type="unfinished">Всё равно закрыть</translation>
</message>
</context>
<context>
<name>SeList</name>
5743,6 → 5926,61
</message>
</context>
<context>
<name>TabManager</name>
<message>
<source>Manage Tabulators</source>
<translation>Настройка табуляторов</translation>
</message>
<message>
<source>Position:</source>
<translation>Положение:</translation>
</message>
<message>
<source>Alignment:</source>
<translation>Выравнивание:</translation>
</message>
<message>
<source>Left</source>
<translation>Влево</translation>
</message>
<message>
<source>Right</source>
<translation>Вправо</translation>
</message>
<message>
<source>Full Stop</source>
<translation>По точке</translation>
</message>
<message>
<source>Comma</source>
<translation>По запятой</translation>
</message>
<message>
<source>Center</source>
<translation>По центру</translation>
</message>
<message>
<source> pt</source>
<translation>pt</translation>
</message>
<message>
<source>OK</source>
<translation>ОК</translation>
</message>
<message>
<source>Cancel</source>
<translation>Отменить</translation>
</message>
<message>
<source>Remove</source>
<translation>Удалить</translation>
</message>
<message>
<source>Add</source>
<translation>Добавить</translation>
</message>
</context>
<context>
<name>Tree</name>
<message>
<source>Outline</source>
5857,11 → 6095,11
</message>
<message>
<source>Create Text Chains</source>
<translation>Создать текстовые цепочки</translation>
<translation type="obsolete">Создать текстовые цепочки</translation>
</message>
<message>
<source>Break Text Chains</source>
<translation>Разомкнуть текстовые цепочки</translation>
<translation type="obsolete">Разомкнуть текстовые цепочки</translation>
</message>
<message>
<source>Draws various Shapes</source>
5871,6 → 6109,18
<source>Edit the Text with the Story Editor</source>
<translation>Изменить текст в редакторе</translation>
</message>
<message>
<source>Insert Freehand Line</source>
<translation>Вставить линию от руки</translation>
</message>
<message>
<source>Link Text Frames</source>
<translation>Связать текстовые рамки</translation>
</message>
<message>
<source>Unlink Text Frames</source>
<translation>Разъединить тестовые рамки</translation>
</message>
</context>
<context>
<name>WerkToolBP</name>
/trunk/Scribus/scribus/qm/scribus.ru.qm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream