r16308 by jghali - merge trunk revisions up to r16306
scribus-commit
scribus-commit at lists.scribus.net
Tue Jan 25 22:50:10 CET 2011
Author: jghali
Date: Tue Jan 25 21:50:10 2011
New Revision: 16308
URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16308
Log:
merge trunk revisions up to r16306
Modified:
branches/ScribusOIF/TRANSLATION
branches/ScribusOIF/resources/translations/po/scribus.lt_LT.ts
branches/ScribusOIF/scribus/canvasmode_editpolygon.cpp
branches/ScribusOIF/scribus/canvasmode_editpolygon.h
branches/ScribusOIF/scribus/plugins/scriptplugin/scripts/Autoquote.py
branches/ScribusOIF/scribus/scpainter.cpp
branches/ScribusOIF/scribus/third_party/cairo/cairo-pattern.c
branches/ScribusOIF/scribus/third_party/cairo/cairo.h
branches/ScribusOIF/scribus/ui/about.cpp
branches/ScribusOIF/scribus/ui/polyprops.cpp
branches/ScribusOIF/scribus/ui/polyprops.h
Modified: branches/ScribusOIF/TRANSLATION
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16308&path=/branches/ScribusOIF/TRANSLATION
==============================================================================
--- branches/ScribusOIF/TRANSLATION (original)
+++ branches/ScribusOIF/TRANSLATION Tue Jan 25 21:50:10 2011
@@ -84,6 +84,10 @@
Korean (ko)
Jin-Hwan Jeong (yongdoriaa at gmail.com)
Kitae Kim (neeum at yahoo.com)
+
+Lithuanian
+Aidas Žandaris
+aidas00 at gmail.com
Norwegian (Bokmål) (nb)
Axel Bojer (axelb at skolelinux.no)
Modified: branches/ScribusOIF/resources/translations/po/scribus.lt_LT.ts
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16308&path=/branches/ScribusOIF/resources/translations/po/scribus.lt_LT.ts
==============================================================================
--- branches/ScribusOIF/resources/translations/po/scribus.lt_LT.ts (original)
+++ branches/ScribusOIF/resources/translations/po/scribus.lt_LT.ts Tue Jan 25 21:50:10 2011
@@ -136,6 +136,7 @@
<message>
<location filename="../../../scribus/ui/about.cpp" line="125"/>
<source>%1 %2 %3</source>
+ <translatorcomment>data lietuviškai</translatorcomment>
<translation>%3 %2 %1 d. </translation>
</message>
<message>
@@ -363,7 +364,7 @@
<message>
<location filename="../../../scribus/actionmanager.cpp" line="1286"/>
<source>Get Text...</source>
- <translation>TekstÄ
...</translation>
+ <translation>Importuoti tekstÄ
...</translation>
</message>
<message>
<location filename="../../../scribus/actionmanager.cpp" line="1287"/>
@@ -373,7 +374,7 @@
<message>
<location filename="../../../scribus/actionmanager.cpp" line="1288"/>
<source>Get Image...</source>
- <translation>PaveikslÄ
...</translation>
+ <translation>Importuoti paveikslÄ
...</translation>
</message>
<message>
<location filename="../../../scribus/actionmanager.cpp" line="1291"/>
@@ -413,7 +414,7 @@
<message>
<location filename="../../../scribus/actionmanager.cpp" line="1304"/>
<source>&Item Action Mode</source>
- <translation>&Veiksmų tik su pasirinktu elementu veiksena</translation>
+ <translation>&Veiksmų tik su pasirinktu objektu veiksena</translation>
</message>
<message>
<location filename="../../../scribus/actionmanager.cpp" line="1305"/>
@@ -465,7 +466,7 @@
<message>
<location filename="../../../scribus/actionmanager.cpp" line="1297"/>
<source>P&references...</source>
- <translation>&Nuostatos...</translation>
+ <translation>&Programos nuostatos...</translation>
</message>
<message>
<source>Document &Setup (old)...</source>
@@ -577,12 +578,12 @@
<message>
<location filename="../../../scribus/actionmanager.cpp" line="1356"/>
<source>&Multiple Duplicate</source>
- <translation type="unfinished">&Daug kopijų</translation>
+ <translation>&Daug kopijų</translation>
</message>
<message>
<location filename="../../../scribus/actionmanager.cpp" line="1357"/>
<source>&Transform</source>
- <translation type="unfinished">&Transformacija</translation>
+ <translation>&Transformuoti</translation>
</message>
<message>
<location filename="../../../scribus/actionmanager.cpp" line="1358"/>
@@ -926,12 +927,12 @@
<message>
<location filename="../../../scribus/actionmanager.cpp" line="1457"/>
<source>Select Item</source>
- <translation>PažymÄ—ti elementÄ
</translation>
+ <translation>PažymÄ—ti objektÄ
</translation>
</message>
<message>
<location filename="../../../scribus/actionmanager.cpp" line="1458"/>
<source>Rotate Item</source>
- <translation>Pasukti elementÄ
</translation>
+ <translation>PažymÄ—ti objektÄ
</translation>
</message>
<message>
<location filename="../../../scribus/actionmanager.cpp" line="1459"/>
@@ -976,12 +977,12 @@
<message>
<location filename="../../../scribus/actionmanager.cpp" line="1467"/>
<source>Copy Item Properties</source>
- <translation>Kopijuoti elemento ypatybes</translation>
+ <translation>Kopijuoti objekto ypatybes</translation>
</message>
<message>
<location filename="../../../scribus/actionmanager.cpp" line="1476"/>
<source>Insert Calligraphic Line</source>
- <translation type="unfinished"></translation>
+ <translation>Įterpti kaligrafinę eilutę</translation>
</message>
<message>
<location filename="../../../scribus/actionmanager.cpp" line="1488"/>
@@ -1924,8 +1925,7 @@
<message>
<location filename="../../../scribus/ui/aligndistribute.cpp" line="110"/>
<source><qt>When aligning one side of an item:<ul><li>Always move the other side too (preserve existing width and height), or </li><li>Keep the other side fixed (resize the item instead of moving it) whenever possible</li></ul></qt></source>
- <translation><qt>Vienos elemento pusÄ—s lygiavimas:<ul><li>Visuomet keiskite tik vieno kraÅ¡to padÄ—ti, kita keisis atitinkamai (nekeiskite esamų objekto matmenų), arba </li><li>Nurodykite fiksuoti kitÄ
pusÄ™ (užuot perkÄ—lÄ™ objektÄ
, keiskite jo dydį) jei tik įmanoma</li></ul></qt>
-</translation>
+ <translation><qt>Vienos objekto pusÄ—s lygiavimas:<ul><li>Visuomet keiskite tik vieno kraÅ¡to padÄ—ti, kita keisis atitinkamai (nekeiskite esamų objekto matmenų), arba </li><li>Nurodykite fiksuoti kitÄ
pusÄ™ (užuot perkÄ—lÄ™ objektÄ
, keiskite jo dydį) jei tik įmanoma</li></ul></qt></translation>
</message>
<message>
<location filename="../../../scribus/ui/aligndistribute.cpp" line="118"/>
@@ -3727,25 +3727,25 @@
<location filename="../../../scribus/ui/scrapbookpalette.cpp" line="885"/>
<location filename="../../../scribus/ui/scrapbookpalette.cpp" line="2090"/>
<source>Hide Directorys</source>
- <translation type="unfinished"></translation>
+ <translation>SlÄ—pti aplankus</translation>
</message>
<message>
<location filename="../../../scribus/ui/scrapbookpalette.cpp" line="888"/>
<location filename="../../../scribus/ui/scrapbookpalette.cpp" line="2091"/>
<source>Hide Images</source>
- <translation type="unfinished">SlÄ—pti paveikslus</translation>
+ <translation>SlÄ—pti paveikslus</translation>
</message>
<message>
<location filename="../../../scribus/ui/scrapbookpalette.cpp" line="891"/>
<location filename="../../../scribus/ui/scrapbookpalette.cpp" line="2092"/>
<source>Hide Vector files</source>
- <translation type="unfinished"></translation>
+ <translation>SlÄ—pti vektorinius failus</translation>
</message>
<message>
<location filename="../../../scribus/ui/scrapbookpalette.cpp" line="895"/>
<location filename="../../../scribus/ui/scrapbookpalette.cpp" line="2093"/>
<source>Open Directorys in a new tab</source>
- <translation type="unfinished"></translation>
+ <translation>Atverti aplankus naujoje kortelÄ—je</translation>
</message>
<message>
<location filename="../../../scribus/ui/scrapbookpalette.cpp" line="1298"/>
@@ -3775,7 +3775,7 @@
<message>
<location filename="../../../scribus/ui/scrapbookpalette.cpp" line="2086"/>
<source>Go up one Directory</source>
- <translation type="unfinished"></translation>
+ <translation>Pereiti į antaplankį</translation>
</message>
<message>
<location filename="../../../scribus/ui/scrapbookpalette.cpp" line="2087"/>
@@ -3785,7 +3785,7 @@
<message>
<location filename="../../../scribus/ui/scrapbookpalette.cpp" line="2089"/>
<source>Configure the scrapbook</source>
- <translation type="unfinished"></translation>
+ <translation>Konfigūruoti koliažinę</translation>
</message>
</context>
<context>
@@ -4197,12 +4197,12 @@
<message>
<location filename="../../../scribus/ui/cmykfw.cpp" line="195"/>
<source>Scribus Swatches</source>
- <translation type="unfinished"></translation>
+ <translation>Scibus spalvų mėginiai</translation>
</message>
<message>
<location filename="../../../scribus/ui/cmykfw.cpp" line="199"/>
<source>User Swatches</source>
- <translation type="unfinished"></translation>
+ <translation>Naudotojo spalvų mėginiai</translation>
</message>
<message>
<location filename="../../../scribus/ui/cmykfw.cpp" line="239"/>
@@ -4694,7 +4694,7 @@
<message>
<location filename="../../../scribus/ui/charselect.ui" line="13"/>
<source>Character Palette</source>
- <translation>Raįmenų paletė</translation>
+ <translation>Rašmenų paletė</translation>
</message>
<message>
<location filename="../../../scribus/ui/charselect.cpp" line="306"/>
@@ -5216,17 +5216,17 @@
<message>
<location filename="../../../scribus/ui/colorlistbox.cpp" line="227"/>
<source>Sort by Name</source>
- <translation type="unfinished">Rikiuoti pagal vardus</translation>
+ <translation>Rikiuoti pagal vardus</translation>
</message>
<message>
<location filename="../../../scribus/ui/colorlistbox.cpp" line="228"/>
<source>Sort by Color</source>
- <translation type="unfinished"></translation>
+ <translation>Rikiuoti pagal spalvas</translation>
</message>
<message>
<location filename="../../../scribus/ui/colorlistbox.cpp" line="229"/>
<source>Sort by Type</source>
- <translation type="unfinished">Rikiuoti pagal tipÄ
</translation>
+ <translation>Rikiuoti pagal tipÄ
</translation>
</message>
</context>
<context>
@@ -5690,7 +5690,7 @@
<location filename="../../../scribus/commonstrings.cpp" line="365"/>
<source>Tritanopia (Blue)</source>
<comment>Color Blindness - Blue Color Blind</comment>
- <translation>Aaklumas mÄ—lynai spalvai</translation>
+ <translation>Aklumas mÄ—lynai spalvai</translation>
</message>
<message>
<location filename="../../../scribus/commonstrings.cpp" line="366"/>
@@ -6237,7 +6237,7 @@
<message>
<location filename="../../../scribus/ui/createrange.ui" line="186"/>
<source>Move &Down</source>
- <translation>Perkelti &žemyn</translation>
+ <translation>Nuleisti &žemyn</translation>
</message>
<message>
<location filename="../../../scribus/ui/createrange.ui" line="189"/>
@@ -6247,7 +6247,7 @@
<message>
<location filename="../../../scribus/ui/createrange.ui" line="196"/>
<source>Move &Up</source>
- <translation>Perkelti &aukštyn</translation>
+ <translation>Pakelti &aukštyn</translation>
</message>
<message>
<location filename="../../../scribus/ui/createrange.ui" line="199"/>
@@ -7113,7 +7113,7 @@
<message>
<location filename="../../../scribus/ui/docitemattrprefs.ui" line="13"/>
<source>Document Item Attributes</source>
- <translation>Dokumento elemento atributai</translation>
+ <translation>Dokumento objekto atributai</translation>
</message>
<message>
<location filename="../../../scribus/ui/docitemattrprefs.ui" line="82"/>
@@ -8035,12 +8035,12 @@
<message>
<location filename="../../../scribus/ui/extimageprops.cpp" line="267"/>
<source>Don't use any Path</source>
- <translation>Nenaudoti jokių kontūrų</translation>
+ <translation>Nenaudoti jokių apybrėžų</translation>
</message>
<message>
<location filename="../../../scribus/ui/extimageprops.cpp" line="269"/>
<source>Paths</source>
- <translation>Kontūrai</translation>
+ <translation>Apybrėžos</translation>
</message>
<message>
<location filename="../../../scribus/ui/extimageprops.cpp" line="276"/>
@@ -11002,7 +11002,7 @@
<message>
<location filename="../../../scribus/plugins/tools/lenseffects/lenseffects.cpp" line="71"/>
<source>Path Tools</source>
- <translation>Kontūrų įrankiai</translation>
+ <translation>Apybrėžų įrankiai</translation>
</message>
<message>
<location filename="../../../scribus/plugins/tools/lenseffects/lenseffects.cpp" line="92"/>
@@ -11733,7 +11733,7 @@
<message>
<location filename="../../../scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.cpp" line="73"/>
<source>Path Tools</source>
- <translation>Kontūrų įrankiai</translation>
+ <translation>Apybrėžų įrankiai</translation>
</message>
<message>
<location filename="../../../scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.cpp" line="95"/>
@@ -11747,7 +11747,7 @@
<message>
<location filename="../../../scribus/ui/missing.cpp" line="309"/>
<source>Missing Font</source>
- <translation>Nerastas Å¡riftaas</translation>
+ <translation>Nerastas Å¡riftas</translation>
</message>
<message>
<location filename="../../../scribus/ui/missing.cpp" line="317"/>
@@ -11776,13 +11776,13 @@
<location filename="../../../scribus/ui/modetoolbar.cpp" line="85"/>
<location filename="../../../scribus/ui/modetoolbar.cpp" line="155"/>
<source>Angle:</source>
- <translation type="unfinished">Kampas:</translation>
+ <translation>Kampas:</translation>
</message>
<message>
<location filename="../../../scribus/ui/modetoolbar.cpp" line="90"/>
<location filename="../../../scribus/ui/modetoolbar.cpp" line="156"/>
<source>Width:</source>
- <translation type="unfinished">Plotis:</translation>
+ <translation>Plotis:</translation>
</message>
<message>
<location filename="../../../scribus/ui/modetoolbar.cpp" line="157"/>
@@ -12409,12 +12409,12 @@
<message>
<location filename="../../../scribus/ui/nodeeditpalette.cpp" line="905"/>
<source>Edit &Contour Line</source>
- <translation>Taisyti &kontÅ«ro linijÄ
</translation>
+ <translation>Taisyti &figÅ«ros apybrėžÄ
</translation>
</message>
<message>
<location filename="../../../scribus/ui/nodeeditpalette.cpp" line="906"/>
<source>&Reset Contour Line</source>
- <translation>&Atitaisyti kontÅ«ro linijÄ
</translation>
+ <translation>&Atitaisyti figÅ«ros apybrėžÄ
</translation>
</message>
<message>
<location filename="../../../scribus/ui/nodeeditpalette.cpp" line="909"/>
@@ -12474,47 +12474,47 @@
<message>
<location filename="../../../scribus/ui/nodeeditpalette.cpp" line="920"/>
<source>Mirror the Path Horizontally</source>
- <translation>AtspindÄ—ti kontÅ«rÄ
horizontaliai</translation>
+ <translation>AtspindÄ—ti figÅ«rÄ
horizontaliai</translation>
</message>
<message>
<location filename="../../../scribus/ui/nodeeditpalette.cpp" line="921"/>
<source>Mirror the Path Vertically</source>
- <translation>AtspindÄ—ti kontÅ«rÄ
vertikaliai</translation>
+ <translation>AtspindÄ—ti figÅ«rÄ
vertikaliai</translation>
</message>
<message>
<location filename="../../../scribus/ui/nodeeditpalette.cpp" line="922"/>
<source>Shear the Path Horizontally to the Right</source>
- <translation>Kirpti kontÅ«rÄ
horizontaliai į dešinę</translation>
+ <translation>Kreipti figÅ«rÄ
horizontaliai į dešinę</translation>
</message>
<message>
<location filename="../../../scribus/ui/nodeeditpalette.cpp" line="923"/>
<source>Shear the Path Horizontally to the Left</source>
- <translation>Kirpti kontÅ«rÄ
horizontaliai į kairę</translation>
+ <translation>Kreipti figÅ«rÄ
horizontaliai į kairę</translation>
</message>
<message>
<location filename="../../../scribus/ui/nodeeditpalette.cpp" line="924"/>
<source>Shear the Path Vertically Up</source>
- <translation>Kirpti kontÅ«rÄ
vertikaliai aukštyn</translation>
+ <translation>Kreipti figÅ«rÄ
vertikaliai aukštyn</translation>
</message>
<message>
<location filename="../../../scribus/ui/nodeeditpalette.cpp" line="925"/>
<source>Shear the Path Vertically Down</source>
- <translation>Kirpti kontÅ«rÄ
vertikaliai žemyn</translation>
+ <translation>Kreipti figÅ«rÄ
vertikaliai žemyn</translation>
</message>
<message>
<location filename="../../../scribus/ui/nodeeditpalette.cpp" line="926"/>
<source>Rotate the Path Counter-Clockwise</source>
- <translation>Pasukti kontÅ«rÄ
prieš laikrodžio rodyklę</translation>
+ <translation>Pasukti figÅ«rÄ
prieš laikrodžio rodyklę</translation>
</message>
<message>
<location filename="../../../scribus/ui/nodeeditpalette.cpp" line="927"/>
<source>Rotate the Path Clockwise</source>
- <translation>Pasukti kontÅ«rÄ
laikrodžio rodyklės kryptimi</translation>
+ <translation>Pasukti figÅ«rÄ
laikrodžio rodyklės kryptimi</translation>
</message>
<message>
<location filename="../../../scribus/ui/nodeeditpalette.cpp" line="929"/>
<source>Enlarge the Size of the Path by shown %</source>
- <translation>Padidinti kontÅ«rÄ
(procentais)</translation>
+ <translation>Padidinti figÅ«rÄ
(procentais)</translation>
</message>
<message>
<location filename="../../../scribus/ui/nodeeditpalette.cpp" line="932"/>
@@ -12524,12 +12524,12 @@
<message>
<location filename="../../../scribus/ui/nodeeditpalette.cpp" line="935"/>
<source>Activate Contour Line Editing Mode</source>
- <translation>Ä®jungti kontÅ«ro linijų keitimo veiksenÄ
</translation>
+ <translation>Ä®jungti figÅ«ros apybrėžos keitimo veiksenÄ
</translation>
</message>
<message>
<location filename="../../../scribus/ui/nodeeditpalette.cpp" line="936"/>
<source>Reset the Contour Line to the Original Shape of the Frame</source>
- <translation>Atstatyti kontÅ«ro linijÄ
į pradinÄ™ formÄ
</translation>
+ <translation>Atstatyti figÅ«ros apybrėžÄ
į pradinÄ™ formÄ
</translation>
</message>
<message>
<location filename="../../../scribus/ui/nodeeditpalette.cpp" line="898"/>
@@ -12544,17 +12544,17 @@
<message>
<location filename="../../../scribus/ui/nodeeditpalette.cpp" line="928"/>
<source>Shrink the Size of the Path by shown %</source>
- <translation>Sumažinti kontÅ«rÄ
(procentais)</translation>
+ <translation>Sumažinti figÅ«rÄ
(procentais)</translation>
</message>
<message>
<location filename="../../../scribus/ui/nodeeditpalette.cpp" line="930"/>
<source>Reduce the Size of the Path by the shown value</source>
- <translation>Sumažinti kontÅ«ro dydį nurodytu skaiÄiumi</translation>
+ <translation>Sumažinti figÅ«ros dydį nurodytu skaiÄiumi</translation>
</message>
<message>
<location filename="../../../scribus/ui/nodeeditpalette.cpp" line="931"/>
<source>Enlarge the Size of the Path by the shown value</source>
- <translation>Padidinti kontÅ«ro dydį nurodytu skaiÄiumi</translation>
+ <translation>Padidinti figÅ«ros dydį nurodytu skaiÄiumi</translation>
</message>
<message>
<location filename="../../../scribus/ui/nodeeditpalette.cpp" line="933"/>
@@ -12569,18 +12569,18 @@
<message>
<location filename="../../../scribus/ui/nodeeditpalette.cpp" line="907"/>
<source>Set Contour to Image Clip</source>
- <translation>KontÅ«rÄ
laikyti plokštuminiu piešiniu</translation>
+ <translation>Nustatyti apybrėžÄ
pagal paveiksle esanÄiÄ
Ä
pybrėžÄ
(kontÅ«rÄ
)</translation>
</message>
<message>
<location filename="../../../scribus/ui/nodeeditpalette.cpp" line="937"/>
<source>Reset the Contour Line to the Clipping Path of the Image</source>
- <translation>GrÄ
žinti kontÅ«ro linijÄ
į paveikslo apybrėžos formÄ
</translation>
+ <translation>GrÄ
žinti figÅ«ros apybrėžai paveikslo apybrėžos (kontÅ«ro) formÄ
</translation>
</message>
<message>
<location filename="../../../scribus/ui/nodeeditpalette.cpp" line="241"/>
<location filename="../../../scribus/ui/nodeeditpalette.cpp" line="901"/>
<source>to Canvas</source>
- <translation>lapo (canvas) atžvilgiu</translation>
+ <translation>lapo atžvilgiu</translation>
</message>
<message>
<location filename="../../../scribus/ui/nodeeditpalette.cpp" line="243"/>
@@ -12982,7 +12982,7 @@
<name>OneClick</name>
<message>
<source>Origin</source>
- <translation type="obsolete">Atramos taškas</translation>
+ <translation type="obsolete">Atskaitos taškas</translation>
</message>
<message>
<location filename="../../../scribus/ui/oneclick.cpp" line="38"/>
@@ -13455,7 +13455,7 @@
<message>
<location filename="../../../scribus/ui/preview.cpp" line="358"/>
<source>Shows transparency and transparent items in your document. Requires Ghostscript 7.07 or later</source>
- <translation>Rodyti permatomus (skaidrius) dokumento elementus. Reikalinga „Ghostscript 7.07“ ar naujesnė programa</translation>
+ <translation>Rodyti permatomus (skaidrius) dokumento objektus. Reikalinga „Ghostscript 7.07“ ar naujesnė programa</translation>
</message>
<message>
<location filename="../../../scribus/ui/preview.cpp" line="359"/>
@@ -14278,7 +14278,7 @@
<message>
<location filename="../../../scribus/ui/paintmanagerbase.ui" line="14"/>
<source>Manage Paints</source>
- <translation type="unfinished"></translation>
+ <translation>Tvarkyti spalvas</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanagerbase.ui" line="32"/>
@@ -14290,112 +14290,112 @@
<tr>
<td style="border: none;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If color management is enabled, a triangle warning indicator is a warning that the color maybe outside of the color gamut of the current printer profile selected. What this means is the color may not print exactly as indicated on screen. Spot colors are indicated by a red circle. More hints about gamut warnings are in the online help under Color Management. Registration colors will have a registration mark next to the color. Use Registration only for printers marks and crop marks.</p></td></tr></table></body></html></source>
- <translation type="unfinished"></translation>
+ <translation></translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanagerbase.ui" line="46"/>
<source>1</source>
- <translation type="unfinished">1</translation>
+ <translation>1</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanagerbase.ui" line="56"/>
<source>Import colors to the current set from an existing document</source>
- <translation type="unfinished">Importuoti spalvas į dabartinį rinkinį iš turimo dokumento</translation>
+ <translation>Importuoti spalvas į dabartinį rinkinį iš turimo dokumento</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanagerbase.ui" line="59"/>
<source>&Import</source>
- <translation type="unfinished">&Importuoti</translation>
+ <translation>&Importuoti</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanagerbase.ui" line="72"/>
<source>Create a new color within the current set</source>
- <translation type="unfinished">Sukurti naujÄ
spalvÄ
ir įrašyti į dabartinį rinkinį</translation>
+ <translation>Sukurti naujÄ
spalvÄ
ir įrašyti į dabartinį rinkinį</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanagerbase.ui" line="75"/>
<source>Add</source>
- <translation type="unfinished">PridÄ—ti</translation>
+ <translation>PridÄ—ti</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanagerbase.ui" line="82"/>
<source>Edit the currently selected color</source>
- <translation type="unfinished">Taisyti Å¡iuo metu pasirinktÄ
spalvÄ
</translation>
+ <translation>Taisyti Å¡iuo metu pasirinktÄ
spalvÄ
</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanagerbase.ui" line="85"/>
<source>&Edit</source>
- <translation type="unfinished"></translation>
+ <translation>&Taisa</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanagerbase.ui" line="92"/>
<source>Make a copy of the currently selected color</source>
- <translation type="unfinished">Kurti Å¡iuo metu pasirinktos spalvos kopijÄ
</translation>
+ <translation>Kurti Å¡iuo metu pasirinktos spalvos kopijÄ
</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanagerbase.ui" line="95"/>
<source>D&uplicate</source>
- <translation type="unfinished">D&ublikatas</translation>
+ <translation>D&ublikatas</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanagerbase.ui" line="102"/>
<source>Delete the currently selected color</source>
- <translation type="unfinished">PaÅ¡alinti pasirinktÄ
spalvÄ
</translation>
+ <translation>PaÅ¡alinti pasirinktÄ
spalvÄ
</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanagerbase.ui" line="105"/>
<source>&Delete</source>
- <translation type="unfinished"></translation>
+ <translation>&Pašalinti</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanagerbase.ui" line="112"/>
<source>Remove unused colors from current document's color set</source>
- <translation type="unfinished">Pašalinti nenaudojamas spalvas iš dabartinio dokumento spalvų rinkinio</translation>
+ <translation>Pašalinti nenaudojamas spalvas iš dabartinio dokumento spalvų rinkinio</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanagerbase.ui" line="115"/>
<source>&Remove Unused</source>
- <translation type="unfinished">&Pašalinti nenaudojamas</translation>
+ <translation>&Pašalinti nenaudojamas</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanagerbase.ui" line="122"/>
<source>Color Sets</source>
- <translation type="unfinished">Spalvų rinkiniai</translation>
+ <translation>Spalvų rinkiniai</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanagerbase.ui" line="134"/>
<source>Current Color Set:</source>
- <translation type="unfinished">Dabartinis spalvų rinkinys:</translation>
+ <translation>Dabartinis spalvų rinkinys:</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanagerbase.ui" line="147"/>
<source>...</source>
- <translation type="unfinished">...</translation>
+ <translation>...</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanagerbase.ui" line="157"/>
<source>Save the current color set</source>
- <translation type="unfinished">Įrašyti dabartinį spalvų rinkinį</translation>
+ <translation>Įrašyti dabartinį spalvų rinkinį</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanagerbase.ui" line="160"/>
<source>&Save Color Set</source>
- <translation type="unfinished">Į&rašyti spalvų rinkinį</translation>
+ <translation>Į&rašyti spalvų rinkinį</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanagerbase.ui" line="188"/>
<source>Make the current colorset the default color set</source>
- <translation type="unfinished">Å iuo metu pasirinktÄ
spalvų rinkinį daryti numatytuoju</translation>
+ <translation>Å iuo metu pasirinktÄ
spalvų rinkinį daryti numatytuoju</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanagerbase.ui" line="191"/>
<source>OK</source>
- <translation type="unfinished">Gerai</translation>
+ <translation>Gerai</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanagerbase.ui" line="198"/>
<source>Cancel</source>
- <translation type="unfinished">Atsisakyti</translation>
+ <translation>Atsisakyti</translation>
</message>
</context>
<context>
@@ -14403,113 +14403,113 @@
<message>
<location filename="../../../scribus/ui/paintmanager.cpp" line="71"/>
<source>Solid Colors</source>
- <translation type="unfinished">Grynosios spalvos</translation>
+ <translation>Grynosios spalvos</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanager.cpp" line="73"/>
<source>Gradients</source>
- <translation type="unfinished"></translation>
+ <translation>Gradientai</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanager.cpp" line="82"/>
<source>Scribus Swatches</source>
- <translation type="unfinished"></translation>
+ <translation>Scribus spalvų mėginiai</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanager.cpp" line="86"/>
<source>User Swatches</source>
- <translation type="unfinished"></translation>
+ <translation>Naudotojo spalvų mėginiai</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanager.cpp" line="94"/>
<source>Merge Color Set</source>
- <translation type="unfinished"></translation>
+ <translation>Sujungti spalvų rinkinius</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanager.cpp" line="264"/>
<source>Sort by Name</source>
- <translation type="unfinished">Rikiuoti pagal vardus</translation>
+ <translation>Rikiuoti pagal vardus</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanager.cpp" line="265"/>
<source>Sort by Color</source>
- <translation type="unfinished"></translation>
+ <translation>Rikiuoti pagal spalvas</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanager.cpp" line="266"/>
<source>Sort by Type</source>
- <translation type="unfinished">Rikiuoti pagal tipÄ
</translation>
+ <translation>Rikiuoti pagal tipÄ
</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanager.cpp" line="365"/>
<source>New Gradient</source>
- <translation type="unfinished">Naujas gradientas</translation>
+ <translation>Naujas gradientas</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanager.cpp" line="383"/>
<source>New Color</source>
- <translation type="unfinished">Nauja spalva</translation>
+ <translation>Nauja spalva</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanager.cpp" line="478"/>
<location filename="../../../scribus/ui/paintmanager.cpp" line="510"/>
<source>Copy of %1</source>
- <translation type="unfinished">„%1“ kopija</translation>
+ <translation>„%1“ kopija</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanager.cpp" line="586"/>
<source>Selected Colors</source>
- <translation type="unfinished"></translation>
+ <translation>Pasirinktos spalvos</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanager.cpp" line="640"/>
<source>Do you really want to clear all your gradients?</source>
- <translation type="unfinished"></translation>
+ <translation>Ar tikrai pašalinti visus jūsų gradientus?</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanager.cpp" line="663"/>
<source>Do you really want to clear all your colors and gradients?</source>
- <translation type="unfinished"></translation>
+ <translation>Ar tikrai pašalinti visas jūsų spalvas ir gradientus?</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanager.cpp" line="777"/>
<source>All Supported Formats</source>
- <translation type="unfinished">Visi palaikomi formatai</translation>
+ <translation>Visi palaikomi formatai</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanager.cpp" line="781"/>
<source>Scribus Gradient Files "*.sgr" (*.sgr *.SGR);;</source>
- <translation type="unfinished">„Scribus“ gradientų failai „*.sgr“ (*.sgr *.SGR);;</translation>
+ <translation>„Scribus“ gradientų failai „*.sgr“ (*.sgr *.SGR);;</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanager.cpp" line="782"/>
<source>Gimp Gradient Files "*.ggr" (*.ggr *.GGR);;</source>
- <translation type="unfinished">„Gimp“ gradientų failai „*.sgr“ (*.sgr *.SGR);;</translation>
+ <translation>„Gimp“ gradientų failai „*.sgr“ (*.sgr *.SGR);;</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanager.cpp" line="783"/>
<source>All Files (*)</source>
- <translation type="unfinished">Visi failai (*)</translation>
+ <translation>Visi failai (*)</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanager.cpp" line="787"/>
<source>Open</source>
- <translation type="unfinished">Atverti</translation>
+ <translation>Atverti</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanager.cpp" line="815"/>
<source>All Supported Formats (%1);;Documents (%2);;Other Files (%3);;All Files (*)</source>
- <translation type="unfinished">Visi palaikomi firmatai (%1);; Dokumentai (%2);; Kiti failai (%3);; Visi failai (*)</translation>
+ <translation>Visi palaikomi firmatai (%1);; Dokumentai (%2);; Kiti failai (%3);; Visi failai (*)</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanager.cpp" line="816"/>
<source>Import Colors</source>
- <translation type="unfinished">Importuoti spalvas</translation>
+ <translation>Importuoti spalvas</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanager.cpp" line="824"/>
<source>Information</source>
- <translation type="unfinished">Informacija</translation>
+ <translation>Informacija</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanager.cpp" line="824"/>
@@ -14518,21 +14518,21 @@
Not all files have DSC conformant comments where the color descriptions are located.
This prevents importing colors from some files.
See the Edit Colors section of the documentation for more details.</source>
- <translation type="unfinished">Faile „%1“ nėra spalvų, kurias galima importuoti.
+ <translation>Faile „%1“ nėra spalvų, kurias galima importuoti.
Jei tai „PostScript“ pagrindu sukurtas failas, pabandykite importuoti „Failas -&gt; Importuoti“.
-Ne visuose failuose būna komentarai apie DSC su spalvų aprašais,
+Ne visuose failuose būna atitinkami įrašai apie DSC su spalvų aprašais,
leidžiantys importuoti spalvas iš kai kurių failų.
Išsamesnės informacijos ieškokite dokumentacijoje, skyrelyje „Edit Colors“ (Spalvų tvarkymas).</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanager.cpp" line="1170"/>
<source>&Name:</source>
- <translation type="unfinished">Pa&vadinimas:</translation>
+ <translation>Pa&vadinimas:</translation>
</message>
<message>
<location filename="../../../scribus/ui/paintmanager.cpp" line="1170"/>
<source>Choose a Name</source>
- <translation type="unfinished">Parinkite pavadinimÄ
</translation>
+ <translation>Parinkite pavadinimÄ
</translation>
</message>
</context>
<context>
@@ -14550,17 +14550,17 @@
<message>
<location filename="../../../scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp" line="69"/>
<source>Path Along Path...</source>
- <translation>Kontūras išilgai kontūro...</translation>
+ <translation>Apybrėža išilgai apybrėžos...</translation>
</message>
<message>
<location filename="../../../scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp" line="70"/>
<source>Bends a Polygon along a Path.</source>
- <translation type="unfinished"></translation>
+ <translation>Apybrėža „iÅ¡silanksto“ pagal daugiakampio kontÅ«rÄ
.</translation>
</message>
<message>
<location filename="../../../scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp" line="74"/>
<source>Path Tools</source>
- <translation>Kontūrų įrankiai</translation>
+ <translation>Apybrėžų įrankiai</translation>
</message>
<message>
<location filename="../../../scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp" line="98"/>
@@ -14578,7 +14578,7 @@
<message>
<location filename="../../../scribus/plugins/tools/pathconnect/pathconnectdialogbase.ui" line="13"/>
<source>Connect Paths</source>
- <translation>Sujungti kontūrus</translation>
+ <translation>Sujungti apybrėžas</translation>
</message>
<message>
<location filename="../../../scribus/plugins/tools/pathconnect/pathconnectdialogbase.ui" line="27"/>
@@ -14629,17 +14629,17 @@
<location filename="../../../scribus/plugins/tools/pathconnect/pathconnect.cpp" line="67"/>
<location filename="../../../scribus/plugins/tools/pathconnect/pathconnect.cpp" line="94"/>
<source>Connect Paths</source>
- <translation>Sujungti kontūrus</translation>
+ <translation>Sujungti apybrėžas</translation>
</message>
<message>
<location filename="../../../scribus/plugins/tools/pathconnect/pathconnect.cpp" line="68"/>
<source>Connects two Paths.</source>
- <translation type="unfinished"></translation>
+ <translation>Jungia du kontūrus.</translation>
</message>
<message>
<location filename="../../../scribus/plugins/tools/pathconnect/pathconnect.cpp" line="72"/>
<source>Path Tools</source>
- <translation>Kontūrų įrankiai</translation>
+ <translation>Apybrėžų įrankiai</translation>
</message>
<message>
<location filename="../../../scribus/plugins/tools/pathconnect/pathconnect.cpp" line="95"/>
@@ -14657,12 +14657,12 @@
<message>
<location filename="../../../scribus/plugins/tools/pathcut/pathcut.cpp" line="73"/>
<source>Cuts a Polygon with a Path.</source>
- <translation type="unfinished"></translation>
+ <translation>Apybrėža „kerta“ daugiakampį.</translation>
</message>
<message>
<location filename="../../../scribus/plugins/tools/pathcut/pathcut.cpp" line="79"/>
<source>Path Tools</source>
- <translation>Kontūrų įrankiai</translation>
+ <translation>Apybrėžų įrankiai</translation>
</message>
<message>
<location filename="../../../scribus/plugins/tools/pathcut/pathcut.cpp" line="103"/>
@@ -14698,7 +14698,7 @@
<message>
<location filename="../../../scribus/plugins/tools/2geomtools/pathalongpath/pathdialogbase.ui" line="13"/>
<source>Path along Path</source>
- <translation>Kontūras išilgai kontūro</translation>
+ <translation>Apybrėža išilgai apybrėžos</translation>
</message>
<message>
<location filename="../../../scribus/plugins/tools/2geomtools/pathalongpath/pathdialogbase.ui" line="21"/>
@@ -14776,7 +14776,7 @@
<message>
<location filename="../../../scribus/plugins/tools/pathfinder/pathfinderbase.ui" line="13"/>
<source>Boolean Path Operations</source>
- <translation>Loginės kontūro operacijos</translation>
+ <translation>Loginės apybrėžų operacijos</translation>
</message>
<message>
<location filename="../../../scribus/plugins/tools/pathfinder/pathfinderbase.ui" line="97"/>
@@ -14944,22 +14944,22 @@
<message>
<location filename="../../../scribus/plugins/tools/pathfinder/pathfinder.cpp" line="77"/>
<source>Path Operations...</source>
- <translation>Kontūrų komandos...</translation>
+ <translation>Apybrėžų komandos...</translation>
</message>
<message>
<location filename="../../../scribus/plugins/tools/pathfinder/pathfinder.cpp" line="81"/>
<source>Path Tools</source>
- <translation>Kontūrų įrankiai</translation>
+ <translation>Apybrėžų įrankiai</translation>
</message>
<message>
<location filename="../../../scribus/plugins/tools/pathfinder/pathfinder.cpp" line="107"/>
<source>Path Operations</source>
- <translation>Kontūrų komandos</translation>
+ <translation>Apybrėžų komandos</translation>
</message>
<message>
<location filename="../../../scribus/plugins/tools/pathfinder/pathfinder.cpp" line="108"/>
<source>Apply fancy boolean operations to paths.</source>
- <translation>Taikyti trokštamas logines operacijas kontūrams.</translation>
+ <translation>Taikyti pageidaujamas logines operacijas apybrėžoms.</translation>
</message>
<message>
<location filename="../../../scribus/plugins/tools/pathfinder/pathfinder.cpp" line="127"/>
@@ -14978,12 +14978,12 @@
<location filename="../../../scribus/plugins/tools/pathstroker/pathstroker.cpp" line="76"/>
<location filename="../../../scribus/plugins/tools/pathstroker/pathstroker.cpp" line="102"/>
<source>Create Path from Stroke</source>
- <translation>IÅ¡ apvado sukurti kontÅ«rÄ
</translation>
+ <translation>IÅ¡ apvado sukurti apybrėžÄ
</translation>
</message>
<message>
<location filename="../../../scribus/plugins/tools/pathstroker/pathstroker.cpp" line="80"/>
<source>Path Tools</source>
- <translation>Kontūrų įrankiai</translation>
+ <translation>Apybrėžų įrankiai</translation>
</message>
<message>
<location filename="../../../scribus/plugins/tools/pathstroker/pathstroker.cpp" line="103"/>
@@ -15531,6 +15531,7 @@
<message>
<location filename="../../../scribus/ui/picstatus.ui" line="148"/>
<source>Path:</source>
+ <translatorcomment>OS sÄ
voka (failų sistemos)</translatorcomment>
<translation>Kelias:</translation>
</message>
<message>
@@ -15903,12 +15904,12 @@
<message>
<location filename="../../../scribus/plugins/picbrowser/picturebrowser.ui" line="446"/>
<source>Go to Page</source>
- <translation type="unfinished"></translation>
+ <translation>Eiti į puslapį</translation>
</message>
<message>
<location filename="../../../scribus/plugins/picbrowser/picturebrowser.ui" line="669"/>
<source>Preview Images Only</source>
- <translation type="unfinished"></translation>
+ <translation>Tik paveikslų peržiūra</translation>
</message>
<message>
<location filename="../../../scribus/plugins/picbrowser/picturebrowser.ui" line="674"/>
@@ -16162,12 +16163,12 @@
<message>
<location filename="../../../scribus/plugins/picbrowser/picturebrowser.ui" line="1379"/>
<source>Page(s):</source>
- <translation type="unfinished"></translation>
+ <translation>Puslapis (-ai):</translation>
</message>
<message>
<location filename="../../../scribus/plugins/picbrowser/picturebrowser.ui" line="1398"/>
<source>Image Frame(s):</source>
- <translation type="unfinished"></translation>
+ <translation>Paveikslo rÄ—melis (-iai):</translation>
</message>
<message>
<source>Page(s)</source>
@@ -16407,7 +16408,7 @@
<message>
<location filename="../../../scribus/plugins/picbrowser/picturebrowserplugin.cpp" line="34"/>
<source>&Picture Browser...</source>
- <translation type="unfinished"></translation>
+ <translation>&Paveikslų žvalgyklė</translation>
</message>
</context>
<context>
@@ -16637,7 +16638,7 @@
<location filename="../../../scribus/ui/polygonwidgetbase.ui" line="172"/>
<location filename="../../../scribus/ui/polygonwidgetbase.ui" line="188"/>
<source>A negative value will make the polygon concave (or star shaped), a positive value will make it convex</source>
- <translation>Neigiama reikšmė reiškia, kad daugiaakampis bus neiškilas (arba žvaigždės formos), teigiama – daugiakampis iškilas</translation>
+ <translation>Neigiama reikšmė reiškia, kad daugiakampis bus neiškilas (arba žvaigždės formos), teigiama – daugiakampis iškilas</translation>
</message>
<message>
<location filename="../../../scribus/ui/polygonwidgetbase.ui" line="175"/>
@@ -16825,7 +16826,7 @@
<message>
<location filename="../../../scribus/ui/prefs.cpp" line="133"/>
<source>Keyboard Shortcuts</source>
- <translation>Šaukiniai (klavišų deriniai)</translation>
+ <translation>KlaviatÅ«ros sparÄiosios komandos</translation>
</message>
<message>
<location filename="../../../scribus/ui/prefs.cpp" line="149"/>
@@ -17830,12 +17831,12 @@
<message>
<location filename="../../../scribus/ui/prefs_documentsectionsbase.ui" line="78"/>
<source>Field Width</source>
- <translation type="unfinished"></translation>
+ <translation>Lauko plotis</translation>
</message>
<message>
<location filename="../../../scribus/ui/prefs_documentsectionsbase.ui" line="83"/>
<source>Fill Character</source>
- <translation type="unfinished"></translation>
+ <translation>Užpildo rašmuo</translation>
</message>
<message>
<location filename="../../../scribus/ui/prefs_documentsectionsbase.ui" line="109"/>
@@ -18367,14 +18368,16 @@
<message>
<location filename="../../../scribus/ui/prefs_externaltools.cpp" line="216"/>
<source>LaTeX Command</source>
- <translation type="unfinished"></translation>
+ <translation>LaTeX komanda</translation>
</message>
<message>
<location filename="../../../scribus/ui/prefs_externaltools.cpp" line="217"/>
<source>Scribus has found the following pdflatex command:
%1
Do you want to use this?</source>
- <translation type="unfinished"></translation>
+ <translation>„Scribus“ haptiko tokiÄ
„pdflatex“ komandÄ
:
+%1
+Ar naudosite jÄ
?</translation>
</message>
<message>
<location filename="../../../scribus/ui/prefs_externaltools.cpp" line="254"/>
@@ -19105,17 +19108,17 @@
<message>
<location filename="../../../scribus/ui/prefs_itemtoolsbase.ui" line="1310"/>
<source>Calligraphic Pen</source>
- <translation type="unfinished"></translation>
+ <translation>KaligrafinÄ— plunksna</translation>
</message>
<message>
<location filename="../../../scribus/ui/prefs_itemtoolsbase.ui" line="1384"/>
<source>Pen Angle:</source>
- <translation type="unfinished"></translation>
+ <translation>Plunksnos kampas:</translation>
</message>
<message>
<location filename="../../../scribus/ui/prefs_itemtoolsbase.ui" line="1404"/>
<source>Pen Width:</source>
- <translation type="unfinished"></translation>
+ <translation>Plunksnos plotis:</translation>
</message>
<message>
<location filename="../../../scribus/ui/prefs_itemtools.cpp" line="43"/>
@@ -19133,7 +19136,7 @@
<message>
<location filename="../../../scribus/ui/prefs_itemtools.cpp" line="60"/>
<source>Keep horizontal and vertical scaling the same</source>
- <translation type="unfinished">Vertikalus ir horizontalus mastelis tas pats</translation>
+ <translation>Taikyti tÄ
patį vertikalų ir horizontalų mastelį</translation>
</message>
<message>
<location filename="../../../scribus/ui/prefs_itemtools.cpp" line="98"/>
@@ -22242,12 +22245,12 @@
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="4881"/>
<source>&Rotation:</source>
- <translation>Pa&sukti:</translation>
+ <translation>Pa&sukimo kampas:</translation>
</message>
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="4882"/>
<source>Basepoint:</source>
- <translation>Atspirties taškas:</translation>
+ <translation>Atskaitos taškas:</translation>
</message>
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="4883"/>
@@ -22322,13 +22325,13 @@
<location filename="../../../scribus/ui/propertiespalette.cpp" line="4917"/>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="4923"/>
<source>Use &Bounding Box</source>
- <translation>Naudoti &aprÄ—pos staÄiakampį</translation>
+ <translation>&Apybrėžai naudoti staÄiakampį</translation>
</message>
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="4918"/>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="4924"/>
<source>&Use Contour Line</source>
- <translation>Naudoti &kontÅ«ro linijÄ
</translation>
+ <translation>Naudoti &figÅ«ros apybrėžÄ
</translation>
</message>
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="5040"/>
@@ -22407,7 +22410,7 @@
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="5002"/>
<source>&Basepoint:</source>
- <translation>A&tspirties taškas:</translation>
+ <translation>A&tskaitos taškas:</translation>
</message>
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="5003"/>
@@ -22570,12 +22573,12 @@
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="5086"/>
<source>Horizontal position of current basepoint</source>
- <translation>Atspirties taško horizontali pozicija</translation>
+ <translation>Atskaitos taško horizontalioji pozicija</translation>
</message>
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="5087"/>
<source>Vertical position of current basepoint</source>
- <translation>Atspirties taško vertikali pozicija</translation>
+ <translation>Atskaitos taško vertikalioji pozicija</translation>
</message>
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="5088"/>
@@ -22590,7 +22593,7 @@
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="5090"/>
<source>Rotation of object at current basepoint</source>
- <translation>Objekto sukimas apie atspirties taÅ¡kÄ
</translation>
+ <translation>Objekto sukimas apie atskaitos taÅ¡kÄ
</translation>
</message>
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="5091"/>
@@ -22610,12 +22613,12 @@
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="5096"/>
<source>Move one level up</source>
- <translation>Perkelti lygiu aukštyn</translation>
+ <translation>Pakelti į aukštesnį lygmenį</translation>
</message>
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="5097"/>
<source>Move one level down</source>
- <translation>Nuleisti lygiu aukštyn</translation>
+ <translation>Nuleisti į žemesnį lygmenį</translation>
</message>
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="5098"/>
@@ -22646,7 +22649,7 @@
<location filename="../../../scribus/ui/propertiespalette.cpp" line="5107"/>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="5112"/>
<source>When chosen, the contour line can be edited with the Edit Shape Tool on the palette further above. When edited via the shape palette, this becomes a second separate line originally based on the frame's shape for text flow of text frames below the object.</source>
- <translatorcomment>PažymÄ—jus kontÅ«ro linija gali bÅ«ti keiÄiama figÅ«rų redagavimo priemone (mygtukas „Taisyti figÅ«rÄ
...“ aukÅ¡Äiau esanÄioje paletÄ—je). Taisant figÅ«rų paletÄ—s priemonÄ—mis sukuriama antra papildoma kontÅ«ro linija figÅ«ros pagrindu tekstui, skirtam blokui po objektu esanÄiuose teksiniuose rÄ—meliuose, apgaubti.</translatorcomment>
+ <translatorcomment>PažymÄ—ta figÅ«ros apybrėža gali bÅ«ti keiÄiama figÅ«rų redagavimo priemone (mygtukas „Taisyti figÅ«rÄ
...“ aukÅ¡Äiau esanÄioje paletÄ—je). Taisant figÅ«rų paletÄ—s priemonÄ—mis sukuriama antra papildoma apybrėža figÅ«ros pagrindu tekstui, skirtam blokui po objektu esanÄiuose teksiniuose rÄ—meliuose, apgaubti.</translatorcomment>
<translation></translation>
</message>
<message>
@@ -22722,12 +22725,12 @@
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="5152"/>
<source>Choose the shape of frame...</source>
- <translation>Parinkti rÄ—melio formÄ
...</translation>
+ <translation>Parinkti figÅ«ros formÄ
...</translation>
</message>
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="5153"/>
<source>Edit shape of the frame...</source>
- <translation>Taisyti rÄ—melio formÄ
...</translation>
+ <translation>Taisyti figÅ«ros formÄ
...</translation>
</message>
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="5154"/>
@@ -22977,7 +22980,7 @@
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="5120"/>
<source>Color of selected text. If Outline text decoration is enabled, this color will be the fill color. If Drop Shadow Text is enabled, then this will be the top most color.</source>
- <translation>Pažymėto teksto spalva. Jei teksto kontūro puošyba leidžiama, ši spalva bus užpildo spalva. Jei leidžiami teksto šešėliai, tai ši spalva bus viršutinė.</translation>
+ <translation>Pažymėto teksto spalva. Jei teksto kontūro puošyba leidžiama, ši spalva bus užpildo spalva. Jei leidžiami teksto šešėliai, tai ši spalva bus viršutinė.</translation>
</message>
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="4892"/>
@@ -22993,19 +22996,19 @@
<location filename="../../../scribus/ui/propertiespalette.cpp" line="4914"/>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="4920"/>
<source>Text &Flow Around Frame</source>
- <translation>Tekstas ap&gaubs rėmelį</translation>
+ <translation>Apgaubti &rėmelį tekstu</translation>
</message>
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="4915"/>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="4921"/>
<source>Disabled</source>
- <translation>Draudžiamas</translation>
+ <translation>Draudžiama</translation>
</message>
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="4916"/>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="4922"/>
<source>Use Frame &Shape</source>
- <translation>Naudoti rÄ—melio &formÄ
</translation>
+ <translation>Naudoti kontÅ«ro &formÄ
</translation>
</message>
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="4956"/>
@@ -23027,13 +23030,13 @@
<location filename="../../../scribus/ui/propertiespalette.cpp" line="5105"/>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="5110"/>
<source>Use the frame shape for text flow of text frames below the object.</source>
- <translation>Objektus, esanÄius greta teksto rÄ—melio, apgaubti tekstu pagal objektų rÄ—melio formÄ
.</translation>
+ <translation>Objektus, esanÄius greta teksto rÄ—melio, apgaubti tekstu pagal objektų figÅ«ros formÄ
.</translation>
</message>
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="5106"/>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="5111"/>
<source>Use the bounding box, which is always rectangular, instead of the frame's shape for text flow of text frames below the object. </source>
- <translation>Naudoti aprÄ—pos staÄiakampį tekstui apgaubti (vietoje objektų rÄ—melių formos).</translation>
+ <translation>Naudoti aprÄ—pos staÄiakampį tekstui apgaubti (vietoje objektų rÄ—melių formos).Tekstui apgaubti naudoti apybrėžos staÄiakampį (vietoje objektų formos apybrėžos).</translation>
</message>
<message>
<source>Transparency Settings</source>
@@ -23121,7 +23124,7 @@
</message>
<message>
<source>When chosen, the contour line can be edited with the Edit Shape Tool on the palette further above. When edited via the shape palette, this becomes a second separate line originally based on the frame's shape for text flow of text frames below the object. T</source>
- <translation type="obsolete">KontÅ«ro linija gali bÅ«ti keiÄiama figÅ«rų redagavimo priemone (mygtukas „Taisyti figÅ«rÄ
...“ aukÅ¡Äiau). Taisant figÅ«rų paletÄ—s priemonÄ—mis sukuriama antra papildoma kontÅ«ro linija. Å i linija sukuriama figÅ«ros pagrindu tekstui, skirtam blokui po objektu esanÄiuose teksiniuose rÄ—meliuose, apgaubti.</translation>
+ <translation type="obsolete">PažymÄ—ta figÅ«ros apybrėža gali bÅ«ti keiÄiama figÅ«rų redagavimo priemone (mygtukas „Taisyti figÅ«rÄ
...“ aukÅ¡Äiau esanÄioje paletÄ—je). Taisant figÅ«rų paletÄ—s priemonÄ—mis sukuriama antra papildoma apybrėža figÅ«ros pagrindu tekstui, skirtam blokui po objektu esanÄiuose teksiniuose rÄ—meliuose, apgaubti.</translation>
</message>
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="4902"/>
@@ -23257,7 +23260,7 @@
<location filename="../../../scribus/ui/propertiespalette.cpp" line="656"/>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="4942"/>
<source>First Line Offset</source>
- <translation>Pirmosios eilutÄ—s poslinkis</translation>
+ <translation>Pirmosios eilutÄ—s nuleidimas</translation>
</message>
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="646"/>
@@ -23326,7 +23329,7 @@
<location filename="../../../scribus/ui/propertiespalette.cpp" line="706"/>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="4943"/>
<source>Columns & Text Distances</source>
- <translation>Stulpeliai ir atstumai iki tekto</translation>
+ <translation>Stulpeliai ir atstumai iki teksto</translation>
</message>
<message>
<location filename="../../../scribus/ui/propertiespalette.cpp" line="738"/>
@@ -25542,13 +25545,13 @@
<location filename="../../../scribus/plugins/scriptplugin/cmdmani.cpp" line="396"/>
<source>Cannot group less than two items</source>
<comment>python error</comment>
- <translation>Negalima sugrupuoti mažiau negu 2 elementus</translation>
+ <translation>Sugrupuoti galima ne mažiau, kaip 2 objektus</translation>
</message>
<message>
<location filename="../../../scribus/plugins/scriptplugin/cmdmani.cpp" line="364"/>
<source>Need selection or argument list of items to group</source>
<comment>python error</comment>
- <translation>BÅ«tina pažymÄ—ti arba pateikti argumentÄ
– sÄ
raÅ¡Ä
grupuosimų elementų</translation>
+ <translation>BÅ«tina pažymÄ—ti arba pateikti argumentÄ
– sÄ
raÅ¡Ä
grupuosimų objektų</translation>
</message>
<message>
<location filename="../../../scribus/plugins/scriptplugin/cmdtext.cpp" line="1082"/>
@@ -26305,7 +26308,7 @@
<message>
<location filename="../../../scribus/util_formats.cpp" line="48"/>
<source>PGF</source>
- <translation type="unfinished"></translation>
+ <translation>PGF</translation>
</message>
<message>
<location filename="../../../scribus/util_formats.cpp" line="49"/>
@@ -26340,17 +26343,17 @@
<message>
<location filename="../../../scribus/util_formats.cpp" line="58"/>
<source>Calamus CVG File</source>
- <translation type="unfinished"></translation>
+ <translation>„Calamus“ CVG failas</translation>
</message>
<message>
<location filename="../../../scribus/util_formats.cpp" line="59"/>
<source>Word Perfect WPG File</source>
- <translation type="unfinished"></translation>
+ <translation>„Word Perfect“ WPG failas</translation>
</message>
<message>
<location filename="../../../scribus/util_formats.cpp" line="60"/>
<source>BMP</source>
- <translation type="unfinished"></translation>
+ <translation>BMP</translation>
</message>
<message>
<source>PostScript</source>
@@ -26418,7 +26421,7 @@
<message>
<location filename="../../../scribus/latexhelpers.cpp" line="73"/>
<source>Highlighter error: Invalid index returned by Qt's QString.indexOf(). This is a incompatibility between different Qt versions and it can only be fixed by recompiling Scribus with the same Qt version that is running on this system. Syntax highlighting is disabled now, but render frames should continue to work without problems.</source>
- <translation type="unfinished"></translation>
+ <translation>ŽymÄ—jimo klaida: „Qt“ procedÅ«ra QString.indexOf() gražino neteisingÄ
indeksÄ
. Tai nesuderinamumo tarp skirtingų „Qt“ versijų rezultatas ir iÅ¡taisoma tik perkompiliavus„Scribus“ naudojant tÄ
paÄia „Qt“ versijÄ
, kuri yra paleista ir Jūsų sistemoje. Sintaksės žymėjimas dabar išjungtas, bet vizualizavimo rėmeliai veiks be sutrikimų.</translation>
</message>
<message>
<location filename="../../../scribus/latexhelpers.cpp" line="104"/>
@@ -26535,7 +26538,7 @@
<message>
<location filename="../../../scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp" line="90"/>
<source>PathAlongPath</source>
- <translation>Kontūras išilgai kontūro</translation>
+ <translation>Apybrėža išilgai apybrėžos</translation>
</message>
<message>
<source>Transform Effect</source>
@@ -27508,7 +27511,7 @@
<location filename="../../../scribus/ui/smpstylewidget.cpp" line="159"/>
<location filename="../../../scribus/ui/smpstylewidget.cpp" line="330"/>
<source>Fixed Linespacing</source>
- <translation>Fiksuotas intervalas tarp eiluÄių</translation>
+ <translation>Fiksuotas intervalas</translation>
</message>
<message>
<location filename="../../../scribus/ui/smpstylewidget.cpp" line="35"/>
@@ -27516,7 +27519,7 @@
<location filename="../../../scribus/ui/smpstylewidget.cpp" line="160"/>
<location filename="../../../scribus/ui/smpstylewidget.cpp" line="331"/>
<source>Automatic Linespacing</source>
- <translation>Automatinis intervalas tarp eiluÄių</translation>
+ <translation>Automatinis intervalas</translation>
</message>
<message>
<location filename="../../../scribus/ui/smpstylewidget.cpp" line="36"/>
@@ -27524,7 +27527,7 @@
<location filename="../../../scribus/ui/smpstylewidget.cpp" line="161"/>
<location filename="../../../scribus/ui/smpstylewidget.cpp" line="332"/>
<source>Align to Baseline Grid</source>
- <translation>Lygiuoti pagal pagrindinių linijų tinklelį</translation>
+ <translation>Lygiuoti pagal pagrindinį tinklelį</translation>
</message>
<message>
<location filename="../../../scribus/ui/smpstylewidget.ui" line="72"/>
@@ -27690,7 +27693,7 @@
<message>
<location filename="../../../scribus/ui/smpstylewidget.ui" line="378"/>
<source>Reset to Default</source>
- <translation>GrÄ
žinti numarytÄ
sias</translation>
+ <translation>GrÄ
žinti numatytÄ
sias</translation>
</message>
<message>
<location filename="../../../scribus/ui/smpstylewidget.ui" line="443"/>
@@ -28160,7 +28163,7 @@
<message>
<location filename="../../../scribus/plugins/short-words/swdialog.ui" line="40"/>
<source>&All Items</source>
- <translation>&Vivi objektai</translation>
+ <translation>&Visi objektai</translation>
</message>
<message>
<location filename="../../../scribus/plugins/short-words/swdialog.ui" line="50"/>
@@ -28940,7 +28943,7 @@
<message>
<location filename="../../../scribus/scribuscore.cpp" line="179"/>
<source>Initializing Keyboard Shortcuts</source>
- <translation>Inicializuojami klaviatūros šaukiniai</translation>
+ <translation>Inicializuojamos klaviatÅ«ros sparÄiosios komandos</translation>
</message>
<message>
<location filename="../../../scribus/scribuscore.cpp" line="181"/>
@@ -29164,7 +29167,7 @@
<message>
<location filename="../../../scribus/scribus.cpp" line="741"/>
<source>Send to Scrapbook</source>
- <translation type="unfinished"></translation>
+ <translation>Siųsti į koliažinę</translation>
</message>
<message>
<location filename="../../../scribus/scribus.cpp" line="760"/>
@@ -29203,7 +29206,7 @@
</message>
<message>
<source>Character</source>
- <translation type="obsolete">Rašmuo</translation>
+ <translation type="obsolete">Specialusis simbolis</translation>
</message>
<message>
<source>Quote</source>
@@ -29514,7 +29517,7 @@
<message>
<location filename="../../../scribus/scribus.cpp" line="805"/>
<source>&Character</source>
- <translation>&Simbolis</translation>
+ <translation>&Specialusis simbolis</translation>
</message>
<message>
<location filename="../../../scribus/scribus.cpp" line="823"/>
@@ -29569,7 +29572,7 @@
<message>
<location filename="../../../scribus/scribus.cpp" line="339"/>
<source>Applying User Shortcuts</source>
- <translation>Taikoma klaviatūros šaukiniams</translation>
+ <translation>Taikoma klaviatÅ«ros sparÄiosioms komandoms</translation>
</message>
<message>
<location filename="../../../scribus/scribus.cpp" line="7789"/>
@@ -29826,7 +29829,7 @@
<message>
<location filename="../../../scribus/ui/contextmenu.cpp" line="293"/>
<source>Send to Scrapbook</source>
- <translation type="unfinished"></translation>
+ <translation>Siųsti į koliažinę</translation>
</message>
<message>
<location filename="../../../scribus/ui/contextmenu.cpp" line="316"/>
@@ -29836,7 +29839,7 @@
<message>
<location filename="../../../scribus/ui/contextmenu.cpp" line="356"/>
<source>Le&vel</source>
- <translation>Ly&gmuo</translation>
+ <translation>Per&kelti objektÄ
</translation>
</message>
<message>
<location filename="../../../scribus/ui/contextmenu.cpp" line="378"/>
@@ -29862,12 +29865,12 @@
<message>
<location filename="../../../scribus/scribusview.cpp" line="3544"/>
<source>Cannot Convert In-Use Item</source>
- <translation>Naudojamo elemento negalima konvertuoti</translation>
+ <translation>Naudojamo objekto negalima konvertuoti</translation>
</message>
<message>
<location filename="../../../scribus/scribusview.cpp" line="3544"/>
<source>The item %1 is currently being edited by Story Editor. The convert to outlines operation for this item will be skipped</source>
- <translation>Elementas %1 yra pakeistas teksto tvarkytuvÄ—je. Konvertavimo į kontÅ«rinį pavidalÄ
komanda bus praleista</translation>
+ <translation>Objektas „%1“ yra pakeistas teksto tvarkytuvÄ—je. Konvertavimo į kontÅ«rinį pavidalÄ
komanda bus ignoruota</translation>
</message>
<message>
<location filename="../../../scribus/scribusview.cpp" line="2454"/>
@@ -30583,17 +30586,17 @@
<message>
<location filename="../../../scribus/ui/shortcutwidget.ui" line="16"/>
<source>&No Key</source>
- <translation>&Be šaukinių</translation>
+ <translation>&Nevartoti sparÄiųjų komandų</translation>
</message>
<message>
<location filename="../../../scribus/ui/shortcutwidget.ui" line="23"/>
<source>&User Defined Key</source>
- <translation>&Naudotojo apibrėžti šaukiniai</translation>
+ <translation>&Naudotojo apibrėžtos sparÄiosios komandos</translation>
</message>
<message>
<location filename="../../../scribus/ui/shortcutwidget.ui" line="30"/>
<source>Set &Key</source>
- <translation>Nustatyti &šaukinį</translation>
+ <translation>Nustatyti &sparÄiÄ
jÄ
komandÄ
</translation>
</message>
<message>
<location filename="../../../scribus/ui/shortcutwidget.cpp" line="69"/>
@@ -30642,17 +30645,17 @@
<message>
<location filename="../../../scribus/ui/shortcutwidget.cpp" line="45"/>
<source>No shortcut for the style</source>
- <translation>NÄ—ra stiliaus Å¡aukinio</translation>
+ <translation>NÄ—ra stiliaus sparÄiosios komandos</translation>
</message>
<message>
<location filename="../../../scribus/ui/shortcutwidget.cpp" line="46"/>
<source>Style has user defined shortcut</source>
- <translation>Stilius turi naudotojo apibrėžtÄ
šaukinį</translation>
+ <translation>Stilius turi naudotojo apibrėžtÄ
sparÄiÄ
jÄ
komandÄ
</translation>
</message>
<message>
<location filename="../../../scribus/ui/shortcutwidget.cpp" line="47"/>
<source>Assign a shortcut for the style</source>
- <translation>Susieti šaukinį su stiliumi</translation>
+ <translation>Susieti sparÄiÄ
jÄ
komandÄ
su stiliumi</translation>
</message>
</context>
<context>
@@ -31083,7 +31086,7 @@
<location filename="../../../scribus/ui/stylemanager.ui" line="54"/>
<location filename="../../../scribus/ui/stylemanager.cpp" line="986"/>
<source>Shortcut</source>
- <translation>Å aukinys</translation>
+ <translation>SparÄioji komanda</translation>
</message>
<message>
<location filename="../../../scribus/ui/stylemanager.ui" line="49"/>
@@ -31114,7 +31117,7 @@
<message>
<location filename="../../../scribus/ui/stylemanager.cpp" line="1050"/>
<source>This key sequence is already in use</source>
- <translation>Šis klavišų derinys (šaukinys) jau naudojamas</translation>
+ <translation>Å is klavišų derinys (sparÄioji komanda) jau naudojamas</translation>
</message>
<message>
<location filename="../../../scribus/ui/stylemanager.cpp" line="1141"/>
@@ -31251,17 +31254,17 @@
<message>
<location filename="../../../scribus/plugins/tools/subdivide/subdivide.cpp" line="68"/>
<source>Subdivide Path</source>
- <translation>Padalyti kontÅ«rÄ
</translation>
+ <translation>Padalyti apybrėžÄ
</translation>
</message>
<message>
<location filename="../../../scribus/plugins/tools/subdivide/subdivide.cpp" line="69"/>
<source>Subdivide a path by inserting new Nodes.</source>
- <translation type="unfinished"></translation>
+ <translation>Suskaidyti apybrėžÄ
pridedant naujų mazgų.</translation>
</message>
<message>
<location filename="../../../scribus/plugins/tools/subdivide/subdivide.cpp" line="73"/>
<source>Path Tools</source>
- <translation>Kontūrų įrankiai</translation>
+ <translation>Apybrėžų įrankiai</translation>
</message>
<message>
<location filename="../../../scribus/plugins/tools/subdivide/subdivide.cpp" line="91"/>
@@ -31271,7 +31274,7 @@
<message>
<location filename="../../../scribus/plugins/tools/subdivide/subdivide.cpp" line="92"/>
<source>Subdivide selected Path</source>
- <translation>Padalyti pasirinktÄ
kontÅ«rÄ
</translation>
+ <translation>Padalyti pasirinktÄ
apybrėžÄ
</translation>
</message>
</context>
<context>
@@ -31398,7 +31401,7 @@
<location filename="../../../scribus/ui/tocindexprefs.ui" line="125"/>
<location filename="../../../scribus/ui/tocindexprefs.cpp" line="99"/>
<source>Item Attribute Name:</source>
- <translation>Elemento atributo pavadinimas:</translation>
+ <translation>Objekto atributo pavadinimas:</translation>
</message>
<message>
<location filename="../../../scribus/ui/tocindexprefs.ui" line="135"/>
@@ -32258,7 +32261,7 @@
<message>
<location filename="../../../scribus/ui/tabgeneral.cpp" line="56"/>
<source>Choose the default window decoration and looks. Scribus inherits any available KDE or Qt themes, if Qt is configured to search KDE plugins.</source>
- <translation>Parinkite numatytÄ
jÄ
lango apdailÄ
ir iÅ¡vaizdÄ
. „Scribus“ perima išvaizdos elementus iš KDE aar „Qt“ temų, jei „Qt“ konfigūracijoje numatyta KDE papildinių paieška.</translation>
+ <translation>Parinkite numatytÄ
jÄ
lango apdailÄ
ir iÅ¡vaizdÄ
. „Scribus“ perima išvaizdos elementus iš KDE ar „Qt“ temų, jei „Qt“ konfigūracijoje numatyta KDE priedų paieška.</translation>
</message>
<message>
<location filename="../../../scribus/ui/tabgeneral.cpp" line="57"/>
@@ -32699,7 +32702,7 @@
<message>
<location filename="../../../scribus/ui/tabkeyboardshortcutswidget.ui" line="13"/>
<source>Keyboard Shortcuts</source>
- <translation>Klaviatūros komandos (šaukiniai)</translation>
+ <translation>KlaviatÅ«ros sparÄiosios komandos</translation>
</message>
<message>
<location filename="../../../scribus/ui/tabkeyboardshortcutswidget.ui" line="26"/>
@@ -32709,7 +32712,7 @@
<message>
<location filename="../../../scribus/ui/tabkeyboardshortcutswidget.ui" line="31"/>
<source>Shortcut</source>
- <translation>Å aukinys</translation>
+ <translation>SparÄioji komanda</translation>
</message>
<message>
<location filename="../../../scribus/ui/tabkeyboardshortcutswidget.ui" line="54"/>
@@ -32719,7 +32722,7 @@
<message>
<location filename="../../../scribus/ui/tabkeyboardshortcutswidget.ui" line="69"/>
<source>Shortcut for Selected Action</source>
- <translation>Pasirinktos komandos Å¡aukinys</translation>
+ <translation>Pasirinkto veiksmo sparÄioji komanda</translation>
</message>
<message>
<location filename="../../../scribus/ui/tabkeyboardshortcutswidget.ui" line="87"/>
@@ -32729,7 +32732,7 @@
<message>
<location filename="../../../scribus/ui/tabkeyboardshortcutswidget.ui" line="100"/>
<source>Set &Key</source>
- <translation>Nurodyti Å¡aukinio &komandÄ
</translation>
+ <translation>Nurodyti sparÄiÄ
jÄ
&komandÄ
(klavišus)</translation>
</message>
<message>
<location filename="../../../scribus/ui/tabkeyboardshortcutswidget.ui" line="103"/>
@@ -32759,12 +32762,12 @@
<message>
<location filename="../../../scribus/ui/tabkeyboardshortcutswidget.ui" line="152"/>
<source>Loadable Shortcut Sets</source>
- <translation>Tinkami įkelti šaukinių rinkiniai</translation>
+ <translation>Tinkantys įkelti sparÄiųjų komandų rinkiniai</translation>
</message>
<message>
<location filename="../../../scribus/ui/tabkeyboardshortcutswidget.ui" line="164"/>
<source>Reload the default Scribus shortcuts</source>
- <translation>Įkelti iš naujo „Scribus“ šaukinius</translation>
+ <translation>Ä®kelti iÅ¡ naujo „Scribus“ sparÄiÄ
sias komandas</translation>
</message>
<message>
<location filename="../../../scribus/ui/tabkeyboardshortcutswidget.ui" line="167"/>
@@ -32779,7 +32782,7 @@
<message>
<location filename="../../../scribus/ui/tabkeyboardshortcutswidget.ui" line="193"/>
<source>Export the current shortcuts into an importable file</source>
- <translation>Eksportuoti klaviatÅ«ros komandas (Å¡aukinius) į failÄ
</translation>
+ <translation>Eksportuoti klaviatÅ«ros sparÄiÄ
sias komandas į failÄ
</translation>
</message>
<message>
<location filename="../../../scribus/ui/tabkeyboardshortcutswidget.ui" line="196"/>
@@ -32794,7 +32797,7 @@
<message>
<location filename="../../../scribus/ui/tabkeyboardshortcutswidget.ui" line="206"/>
<source>Import a shortcut set into the current configuration</source>
- <translation>Importuoti Å¡aukinius į dabartinÄ™ konfigÅ«racijÄ
</translation>
+ <translation>Importuoti sparÄiÄ
sias komandas į dabartinÄ™ konfigÅ«racijÄ
</translation>
</message>
<message>
<location filename="../../../scribus/ui/tabkeyboardshortcutswidget.ui" line="209"/>
@@ -32809,7 +32812,7 @@
<message>
<location filename="../../../scribus/ui/tabkeyboardshortcutswidget.ui" line="235"/>
<source>Load the selected shortcut set</source>
- <translation>Pkelti pasirinktÄ
šaukinių aibę</translation>
+ <translation>Ä®kelti pasirinktÄ
sparÄiųjų komandų aibÄ™</translation>
</message>
<message>
<location filename="../../../scribus/ui/tabkeyboardshortcutswidget.ui" line="238"/>
@@ -32824,12 +32827,12 @@
<message>
<location filename="../../../scribus/ui/tabkeyboardshortcutswidget.ui" line="248"/>
<source>Keyboard shortcut sets available to load</source>
- <translation>Klaviatūros komandų (šaukinių) rinkinį galima įkelti</translation>
+ <translation>Galimi įkelti klaviatÅ«ros sparÄiųjų komandų rinkiniai</translation>
</message>
<message>
<location filename="../../../scribus/ui/tabkeyboardshortcutswidget.cpp" line="233"/>
<source>Export Keyboard Shortcuts to File</source>
- <translation>Eksportuoti klaviatÅ«ros komandas (Å¡aukinius) į failÄ
</translation>
+ <translation>Eksportuoti klaviatÅ«ros sparÄiÄ
sias komandas į failÄ
</translation>
</message>
<message>
<location filename="../../../scribus/ui/tabkeyboardshortcutswidget.cpp" line="233"/>
@@ -32839,18 +32842,18 @@
<message>
<location filename="../../../scribus/ui/tabkeyboardshortcutswidget.cpp" line="154"/>
<source>Select a Key set file to read</source>
- <translation>PažymÄ—kite skaitysimÄ
Å¡aukinių failÄ
</translation>
+ <translation>PažymÄ—kite skaitysimÄ
sparÄiųjų komandų failÄ
</translation>
</message>
<message>
<location filename="../../../scribus/ui/tabkeyboardshortcutswidget.cpp" line="154"/>
<location filename="../../../scribus/ui/tabkeyboardshortcutswidget.cpp" line="162"/>
<source>Key Set XML Files (*.xml)</source>
- <translation>Klaviatūros komandų (šaukinių) rinkinio XML failas (*.xml)</translation>
+ <translation>KlaviatÅ«ros sparÄiųjų komandų rinkinio XML failas (*.xml)</translation>
</message>
<message>
<location filename="../../../scribus/ui/tabkeyboardshortcutswidget.cpp" line="162"/>
<source>Select a Key set file to save to</source>
- <translation>Pasirinkite Å¡aukinių rinkinio failÄ
įrašymui</translation>
+ <translation>Pasirinkite sparÄiųjų komandų rinkinio failÄ
įrašymui</translation>
</message>
</context>
<context>
@@ -32936,7 +32939,7 @@
<message>
<location filename="../../../scribus/ui/tabpdfoptions.cpp" line="282"/>
<source>&Rotation:</source>
- <translation>Pa&sukti:</translation>
+ <translation>Pa&sukimo kampas:</translation>
</message>
<message>
<location filename="../../../scribus/ui/tabpdfoptions.cpp" line="309"/>
@@ -35301,7 +35304,7 @@
</message>
<message>
<source>Origin</source>
- <translation type="obsolete">Atramos taškas</translation>
+ <translation type="obsolete">Atskaitos taškas</translation>
</message>
<message>
<location filename="../../../scribus/ui/transformdialogbase.ui" line="445"/>
@@ -35775,17 +35778,17 @@
<message>
<location filename="../../../scribus/undomanager.cpp" line="911"/>
<source>Text flows around the frame</source>
- <translation>Tekstas apgaubs rėmelį</translation>
+ <translation>Apgaubti rėmelį tekstu</translation>
</message>
<message>
<location filename="../../../scribus/undomanager.cpp" line="912"/>
<source>Text flows around bounding box</source>
- <translation>Tekstas apgaubs aprÄ—pos staÄiakampį</translation>
+ <translation>Tekstus apgaubs apybrėžos staÄiakampį</translation>
</message>
<message>
<location filename="../../../scribus/undomanager.cpp" line="913"/>
<source>Text flows around contour line</source>
- <translation>Tekstas apgaubs kontÅ«rÄ
</translation>
+ <translation>Tekstu apgaubs atsižvelgiant į figÅ«ros apybrėžÄ
</translation>
</message>
<message>
<location filename="../../../scribus/undomanager.cpp" line="915"/>
@@ -35795,12 +35798,12 @@
<message>
<location filename="../../../scribus/undomanager.cpp" line="917"/>
<source>No bounding box</source>
- <translation>NÄ—ra aprÄ—pos staÄiakampio</translation>
+ <translation>NÄ—ra apybrėžos staÄiakampio</translation>
</message>
<message>
<location filename="../../../scribus/undomanager.cpp" line="918"/>
<source>No contour line</source>
- <translation>Nėra kontūro linijos</translation>
+ <translation>Nėra figūros apybrėžos</translation>
</message>
<message>
<location filename="../../../scribus/undomanager.cpp" line="919"/>
@@ -35836,7 +35839,7 @@
<location filename="../../../scribus/undomanager.cpp" line="925"/>
<location filename="../../../scribus/undomanager.cpp" line="951"/>
<source>Edit contour line</source>
- <translation>Taisyti kontÅ«ro linijÄ
</translation>
+ <translation>Taisyti figÅ«ros apybrėžÄ
</translation>
</message>
<message>
<location filename="../../../scribus/undomanager.cpp" line="926"/>
@@ -35846,7 +35849,7 @@
<message>
<location filename="../../../scribus/undomanager.cpp" line="928"/>
<source>Reset contour line</source>
- <translation>Atstatyti kontÅ«ro linijÄ
</translation>
+ <translation>Atstatyti figÅ«ros apybrėžÄ
</translation>
</message>
<message>
<location filename="../../../scribus/undomanager.cpp" line="862"/>
@@ -35946,7 +35949,7 @@
<message>
<location filename="../../../scribus/undomanager.cpp" line="857"/>
<source>Disable Item Printing</source>
- <translation>Drausti spausdinti elementÄ
</translation>
+ <translation>Drausti spausdinti objektÄ
</translation>
</message>
<message>
<location filename="../../../scribus/undomanager.cpp" line="945"/>
@@ -36889,7 +36892,7 @@
<message>
<location filename="../../../scribus/ui/gtfiledialog.cpp" line="25"/>
<source>Automatic</source>
- <translation>Automatiškai</translation>
+ <translation>Automatiškai parinktas</translation>
</message>
<message>
<location filename="../../../scribus/ui/gtfiledialog.cpp" line="28"/>
@@ -37625,7 +37628,7 @@
<message>
<location filename="../../../scribus/ui/selectobjects.ui" line="83"/>
<source>Narrow the selection of items based on various item properties</source>
- <translation>Sumažinti pažymÄ—tų objektų skaiÄių remiantis nurodytomis įvairiomis ypatybÄ—mis</translation>
+ <translation>Sumažinti pažymÄ—tų objektų skaiÄių remiantis nurodytomis kai kuriomis ypatybÄ—mis</translation>
</message>
<message>
<location filename="../../../scribus/ui/selectobjects.ui" line="86"/>
Modified: branches/ScribusOIF/scribus/canvasmode_editpolygon.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16308&path=/branches/ScribusOIF/scribus/canvasmode_editpolygon.cpp
==============================================================================
--- branches/ScribusOIF/scribus/canvasmode_editpolygon.cpp (original)
+++ branches/ScribusOIF/scribus/canvasmode_editpolygon.cpp Tue Jan 25 21:50:10 2011
@@ -194,7 +194,7 @@
polyCurvature = item->polyCurvature;
polyInnerRot = item->polyInnerRot;
polyOuterCurvature = item->polyOuterCurvature;
- VectorDialog = new PolygonProps(m_ScMW, polyCorners, polyFactor, polyUseFactor, polyRotation, polyCurvature, polyInnerRot, polyOuterCurvature, true);
+ VectorDialog = new PolyVectorDialog(m_ScMW, polyCorners, polyFactor, polyUseFactor, polyRotation, polyCurvature, polyInnerRot, polyOuterCurvature);
VectorDialog->show();
uint cx = polyUseFactor ? polyCorners * 2 : polyCorners;
double seg = 360.0 / cx;
@@ -212,8 +212,8 @@
connect(m_doc, SIGNAL(docChanged()), this, SLOT(updateFromItem()));
connect(VectorDialog, SIGNAL(NewVectors(int, double, bool, double, double, double, double)), this, SLOT(applyValues(int, double, bool, double, double, double, double)));
- connect(VectorDialog, SIGNAL(accepted()), this, SLOT(endEditing()));
- connect(VectorDialog, SIGNAL(rejected()), this, SLOT(endEditing()));
+ connect(VectorDialog, SIGNAL(endEdit()), this, SLOT(endEditing()));
+ connect(VectorDialog, SIGNAL(paletteShown(bool)), this, SLOT(endEditing(bool)));
}
void CanvasMode_EditPolygon::deactivate(bool forGesture)
@@ -223,6 +223,12 @@
m_view->redrawMarker->hide();
m_polygonPoint = noPointDefined;
disconnect(m_doc, SIGNAL(docChanged()), this, SLOT(updateFromItem()));
+}
+
+void CanvasMode_EditPolygon::endEditing(bool active)
+{
+ if (!active)
+ endEditing();
}
void CanvasMode_EditPolygon::endEditing()
Modified: branches/ScribusOIF/scribus/canvasmode_editpolygon.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16308&path=/branches/ScribusOIF/scribus/canvasmode_editpolygon.h
==============================================================================
--- branches/ScribusOIF/scribus/canvasmode_editpolygon.h (original)
+++ branches/ScribusOIF/scribus/canvasmode_editpolygon.h Tue Jan 25 21:50:10 2011
@@ -1,104 +1,105 @@
-/*
- For general Scribus (>=1.3.2) copyright and licensing information please refer
- to the COPYING file provided with the program. Following this notice may exist
- a copyright and/or license notice that predates the release of Scribus 1.3.2
- for which a new license (GPL+exception) is in place.
- */
-/***************************************************************************
-* *
-* This program is free software; you can redistribute it and/or modify *
-* it under the terms of the GNU General Public License as published by *
-* the Free Software Foundation; either version 2 of the License, or *
-* (at your option) any later version. *
-* *
-***************************************************************************/
-/***************************************************************************
- canvasmode_editpolygon.h - description
- -------------------
- begin : Wed Jan 12 2011
- copyright : (C) 2011 by Franz Schmid
- email : Franz.Schmid at altmuehlnet.de
- ***************************************************************************/
-
-#ifndef CANVAS_MODE_EDITPOLYGON_H
-#define CANVAS_MODE_EDITPOLYGON_H
-
-#include <QObject>
-#include <QTime>
-
-#include "canvasmode.h"
-#include "fpointarray.h"
-#include "ui/polyprops.h"
-
-class PageItem;
-class ScribusMainWindow;
-class ScribusView;
-
-
-// This class encapsulate the old code for mouse interaction from scribusview.cpp
-
-class CanvasMode_EditPolygon : public CanvasMode
-{
- Q_OBJECT
-public:
- CanvasMode_EditPolygon(ScribusView* view);
-
- virtual void enterEvent(QEvent *);
- virtual void leaveEvent(QEvent *);
-
- virtual void activate(bool);
- virtual void deactivate(bool);
- virtual void mouseDoubleClickEvent(QMouseEvent *m);
- virtual void mouseReleaseEvent(QMouseEvent *m);
- virtual void mouseMoveEvent(QMouseEvent *m);
- virtual void mousePressEvent(QMouseEvent *m);
- virtual void drawControls(QPainter* p);
- void drawControlsPolygon(QPainter* pp, PageItem* currItem);
-
-private:
-
- typedef enum
- {
- noPointDefined,
- useControlOuter,
- useControlInner,
- useControlInnerCurve,
- useControlOuterCurve
- } ePolygonPoint;
-
- inline bool GetItem(PageItem** pi);
- double GetZeroFactor();
- double GetMaxFactor();
- double getUserValFromFactor(double factor);
-
- double Mxp, Myp;
- ScribusMainWindow* m_ScMW;
- bool m_cursorVisible;
- bool m_lastPosWasOverGuide;
- QPointF startPoint;
- QPointF endPoint;
- QPointF centerPoint;
- QPointF innerCPoint;
- QPointF outerCPoint;
- int polyCorners;
- bool polyUseFactor;
- double polyFactor;
- double polyRotation;
- double polyCurvature;
- double polyInnerRot;
- double polyOuterCurvature;
- ePolygonPoint m_polygonPoint;
- PolygonProps *VectorDialog;
-
+/*
+ For general Scribus (>=1.3.2) copyright and licensing information please refer
+ to the COPYING file provided with the program. Following this notice may exist
+ a copyright and/or license notice that predates the release of Scribus 1.3.2
+ for which a new license (GPL+exception) is in place.
+ */
+/***************************************************************************
+* *
+* This program is free software; you can redistribute it and/or modify *
+* it under the terms of the GNU General Public License as published by *
+* the Free Software Foundation; either version 2 of the License, or *
+* (at your option) any later version. *
+* *
+***************************************************************************/
+/***************************************************************************
+ canvasmode_editpolygon.h - description
+ -------------------
+ begin : Wed Jan 12 2011
+ copyright : (C) 2011 by Franz Schmid
+ email : Franz.Schmid at altmuehlnet.de
+ ***************************************************************************/
+
+#ifndef CANVAS_MODE_EDITPOLYGON_H
+#define CANVAS_MODE_EDITPOLYGON_H
+
+#include <QObject>
+#include <QTime>
+
+#include "canvasmode.h"
+#include "fpointarray.h"
+#include "ui/polyprops.h"
+
+class PageItem;
+class ScribusMainWindow;
+class ScribusView;
+
+
+// This class encapsulate the old code for mouse interaction from scribusview.cpp
+
+class CanvasMode_EditPolygon : public CanvasMode
+{
+ Q_OBJECT
+public:
+ CanvasMode_EditPolygon(ScribusView* view);
+
+ virtual void enterEvent(QEvent *);
+ virtual void leaveEvent(QEvent *);
+
+ virtual void activate(bool);
+ virtual void deactivate(bool);
+ virtual void mouseDoubleClickEvent(QMouseEvent *m);
+ virtual void mouseReleaseEvent(QMouseEvent *m);
+ virtual void mouseMoveEvent(QMouseEvent *m);
+ virtual void mousePressEvent(QMouseEvent *m);
+ virtual void drawControls(QPainter* p);
+ void drawControlsPolygon(QPainter* pp, PageItem* currItem);
+
+private:
+
+ typedef enum
+ {
+ noPointDefined,
+ useControlOuter,
+ useControlInner,
+ useControlInnerCurve,
+ useControlOuterCurve
+ } ePolygonPoint;
+
+ inline bool GetItem(PageItem** pi);
+ double GetZeroFactor();
+ double GetMaxFactor();
+ double getUserValFromFactor(double factor);
+
+ double Mxp, Myp;
+ ScribusMainWindow* m_ScMW;
+ bool m_cursorVisible;
+ bool m_lastPosWasOverGuide;
+ QPointF startPoint;
+ QPointF endPoint;
+ QPointF centerPoint;
+ QPointF innerCPoint;
+ QPointF outerCPoint;
+ int polyCorners;
+ bool polyUseFactor;
+ double polyFactor;
+ double polyRotation;
+ double polyCurvature;
+ double polyInnerRot;
+ double polyOuterCurvature;
+ ePolygonPoint m_polygonPoint;
+ PolyVectorDialog *VectorDialog;
+
int m_blockUpdateFromItem;
void blockUpdateFromItem(bool block) { if (block) ++m_blockUpdateFromItem; else --m_blockUpdateFromItem; }
- bool updateFromItemBlocked() { return (m_blockUpdateFromItem > 0); }
-
-public slots:
- void applyValues(int polyC, double polyF, bool polyUseCF, double polyR, double polyCur, double polyIRot, double polyOCur);
- void updateFromItem();
- void endEditing();
-};
-
-
-#endif
+ bool updateFromItemBlocked() { return (m_blockUpdateFromItem > 0); }
+
+public slots:
+ void applyValues(int polyC, double polyF, bool polyUseCF, double polyR, double polyCur, double polyIRot, double polyOCur);
+ void updateFromItem();
+ void endEditing(bool active);
+ void endEditing();
+};
+
+
+#endif
Modified: branches/ScribusOIF/scribus/plugins/scriptplugin/scripts/Autoquote.py
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16308&path=/branches/ScribusOIF/scribus/plugins/scriptplugin/scripts/Autoquote.py
==============================================================================
--- branches/ScribusOIF/scribus/plugins/scriptplugin/scripts/Autoquote.py (original)
+++ branches/ScribusOIF/scribus/plugins/scriptplugin/scripts/Autoquote.py Tue Jan 25 21:50:10 2011
@@ -19,7 +19,7 @@
if scribus.haveDoc():
c = 0
- lang = scribus.valueDialog("Choose by language or country", 'Language: af, be, ch, de, en, es, et, fi, fr,\n hu, is, lt, mk, nl, pl, ru, se, sk, sl, sq and uk\n are current choices','en')
+ lang = scribus.valueDialog("Choose by language or country", 'Language: af, be, ch, cs, de, en, es, et, fi, fr,\n hu, is, lt, mk, nl, pl, ru, se, sk, sl, sq and uk\n are current choices','en')
if (lang == 'en'):
lead_double = u"\u201c"
follow_double = u"\u201d"
@@ -70,7 +70,7 @@
follow_double = u"\u00bb"
follow_double = u"\u201d"
lead_single = u"\u2018"
- elif ((lang == 'lt') or (lang == 'mk') or (lang == 'is') or (lang == 'sk') or (lang == 'sl') or (lang == 'et')):
+ elif ((lang == 'lt') or (lang == 'mk') or (lang == 'is') or (lang == 'sk') or (lang == 'sl') or (lang == 'cs') or (lang == 'et')):
lead_double = u"\u201e"
follow_double = u"\u201c"
lead_single = u"\u2019"
@@ -80,7 +80,7 @@
follow_double = u"\u201d"
lead_single = u"\u00bb"
follow_single = u"\u00ab"
- else:
+ else:
scribus.messageBox('Language Error', 'You need to choose an available language', icon=0, button1=1)
sys.exit(2)
Modified: branches/ScribusOIF/scribus/scpainter.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16308&path=/branches/ScribusOIF/scribus/scpainter.cpp
==============================================================================
--- branches/ScribusOIF/scribus/scpainter.cpp (original)
+++ branches/ScribusOIF/scribus/scpainter.cpp Tue Jan 25 21:50:10 2011
@@ -937,12 +937,14 @@
cairo_pattern_t *pat = NULL;
cairo_surface_t *img = NULL;
cairo_t *cr = NULL;
-#ifdef HAVE_PRIVATE_CAIRO
+// #ifdef HAVE_PRIVATE_CAIRO
+#if (CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 11, 2) || HAVE_PRIVATE_CAIRO)
cairo_pattern_t *mpat = NULL;
#endif
if (fill_gradient.type() == VGradient::fourcolor)
{
-#ifdef HAVE_PRIVATE_CAIRO
+//#ifdef HAVE_PRIVATE_CAIRO
+#if (CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 11, 2) || HAVE_PRIVATE_CAIRO)
double p1x = gradPatchP1.x();
double p1y = gradPatchP1.y();
double p2x = gradPatchP2.x();
@@ -958,25 +960,25 @@
cairo_set_tolerance(cr, 0.5 );
double r, g, b, a;
mpat = cairo_pattern_create_mesh();
- cairo_pattern_begin_patch(mpat);
- cairo_pattern_move_to(mpat, p1x, p1y);
- cairo_pattern_line_to(mpat, p2x, p2y);
- cairo_pattern_line_to(mpat, p3x, p3y);
- cairo_pattern_line_to(mpat, p4x, p4y);
- cairo_pattern_line_to(mpat, p1x, p1y);
- cairo_pattern_set_control_point(mpat, 0, gradControlP1.x(), gradControlP1.y());
- cairo_pattern_set_control_point(mpat, 1, gradControlP2.x(), gradControlP2.y());
- cairo_pattern_set_control_point(mpat, 2, gradControlP3.x(), gradControlP3.y());
- cairo_pattern_set_control_point(mpat, 3, gradControlP4.x(), gradControlP4.y());
+ cairo_pattern_mesh_begin_patch(mpat);
+ cairo_pattern_mesh_move_to(mpat, p1x, p1y);
+ cairo_pattern_mesh_line_to(mpat, p2x, p2y);
+ cairo_pattern_mesh_line_to(mpat, p3x, p3y);
+ cairo_pattern_mesh_line_to(mpat, p4x, p4y);
+ cairo_pattern_mesh_line_to(mpat, p1x, p1y);
+ cairo_pattern_mesh_set_control_point(mpat, 0, gradControlP1.x(), gradControlP1.y());
+ cairo_pattern_mesh_set_control_point(mpat, 1, gradControlP2.x(), gradControlP2.y());
+ cairo_pattern_mesh_set_control_point(mpat, 2, gradControlP3.x(), gradControlP3.y());
+ cairo_pattern_mesh_set_control_point(mpat, 3, gradControlP4.x(), gradControlP4.y());
gradPatchColor1.getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 0, r, g, b, a);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 0, r, g, b, a);
gradPatchColor2.getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 1, r, g, b, a);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 1, r, g, b, a);
gradPatchColor3.getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 2, r, g, b, a);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 2, r, g, b, a);
gradPatchColor4.getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 3, r, g, b, a);
- cairo_pattern_end_patch(mpat);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 3, r, g, b, a);
+ cairo_pattern_mesh_end_patch(mpat);
cairo_pattern_set_filter(mpat, CAIRO_FILTER_GOOD);
cairo_set_source(cr, mpat);
cairo_paint_with_alpha(cr, 1.0);
@@ -1014,7 +1016,8 @@
}
else if (fill_gradient.type() == VGradient::diamond)
{
-#ifdef HAVE_PRIVATE_CAIRO
+// #ifdef HAVE_PRIVATE_CAIRO
+#if (CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 11, 2) || HAVE_PRIVATE_CAIRO)
double p1x = gradControlP1.x();
double p1y = gradControlP1.y();
double p2x = gradControlP2.x();
@@ -1087,109 +1090,113 @@
e4s.setLength(edge4.length() * colorStops[ offset - 1 ]->rampPoint);
if (offset == 1)
{
- cairo_pattern_begin_patch(mpat);
- cairo_pattern_move_to(mpat, centerP.x(), centerP.y());
- cairo_pattern_line_to(mpat, e1.x2(), e1.y2());
- cairo_pattern_line_to(mpat, e2.x2(), e2.y2());
- cairo_pattern_line_to(mpat, centerP.x(), centerP.y());
+ cairo_pattern_mesh_begin_patch(mpat);
+ cairo_pattern_mesh_move_to(mpat, centerP.x(), centerP.y());
+ cairo_pattern_mesh_line_to(mpat, e1.x2(), e1.y2());
+ cairo_pattern_mesh_line_to(mpat, e2.x2(), e2.y2());
+#ifdef HAVE_PRIVATE_CAIRO
+ cairo_pattern_mesh_line_to(mpat, centerP.x(), centerP.y());
+#endif
qStopColors[0].getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 0, r, g, b, a);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 0, r, g, b, a);
qStopColors[1].getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 1, r, g, b, a);
- cairo_pattern_set_corner_color_rgba(mpat, 2, r, g, b, a);
- cairo_pattern_end_patch(mpat);
- cairo_pattern_begin_patch(mpat);
- cairo_pattern_move_to(mpat, centerP.x(), centerP.y());
- cairo_pattern_line_to(mpat, e2.x2(), e2.y2());
- cairo_pattern_line_to(mpat, e3.x2(), e3.y2());
- cairo_pattern_line_to(mpat, centerP.x(), centerP.y());
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 1, r, g, b, a);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 2, r, g, b, a);
+ cairo_pattern_mesh_end_patch(mpat);
+ cairo_pattern_mesh_begin_patch(mpat);
+ cairo_pattern_mesh_move_to(mpat, centerP.x(), centerP.y());
+ cairo_pattern_mesh_line_to(mpat, e2.x2(), e2.y2());
+ cairo_pattern_mesh_line_to(mpat, e3.x2(), e3.y2());
+#ifdef HAVE_PRIVATE_CAIRO
+ cairo_pattern_mesh_line_to(mpat, centerP.x(), centerP.y());
+#endif
qStopColors[0].getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 0, r, g, b, a);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 0, r, g, b, a);
qStopColors[1].getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 1, r, g, b, a);
- cairo_pattern_set_corner_color_rgba(mpat, 2, r, g, b, a);
- cairo_pattern_end_patch(mpat);
- cairo_pattern_begin_patch(mpat);
- cairo_pattern_move_to(mpat, centerP.x(), centerP.y());
- cairo_pattern_line_to(mpat, e3.x2(), e3.y2());
- cairo_pattern_line_to(mpat, e4.x2(), e4.y2());
- cairo_pattern_line_to(mpat, centerP.x(), centerP.y());
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 1, r, g, b, a);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 2, r, g, b, a);
+ cairo_pattern_mesh_end_patch(mpat);
+ cairo_pattern_mesh_begin_patch(mpat);
+ cairo_pattern_mesh_move_to(mpat, centerP.x(), centerP.y());
+ cairo_pattern_mesh_line_to(mpat, e3.x2(), e3.y2());
+ cairo_pattern_mesh_line_to(mpat, e4.x2(), e4.y2());
+#ifdef HAVE_PRIVATE_CAIRO
+ cairo_pattern_mesh_line_to(mpat, centerP.x(), centerP.y());
+#endif
qStopColors[0].getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 0, r, g, b, a);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 0, r, g, b, a);
qStopColors[1].getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 1, r, g, b, a);
- cairo_pattern_set_corner_color_rgba(mpat, 2, r, g, b, a);
- cairo_pattern_end_patch(mpat);
- cairo_pattern_begin_patch(mpat);
- cairo_pattern_move_to(mpat, centerP.x(), centerP.y());
- cairo_pattern_line_to(mpat, e4.x2(), e4.y2());
- cairo_pattern_line_to(mpat, e1.x2(), e1.y2());
- cairo_pattern_line_to(mpat, centerP.x(), centerP.y());
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 1, r, g, b, a);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 2, r, g, b, a);
+ cairo_pattern_mesh_end_patch(mpat);
+ cairo_pattern_mesh_begin_patch(mpat);
+ cairo_pattern_mesh_move_to(mpat, centerP.x(), centerP.y());
+ cairo_pattern_mesh_line_to(mpat, e4.x2(), e4.y2());
+ cairo_pattern_mesh_line_to(mpat, e1.x2(), e1.y2());
+#ifdef HAVE_PRIVATE_CAIRO
+ cairo_pattern_mesh_line_to(mpat, centerP.x(), centerP.y());
+#endif
qStopColors[0].getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 0, r, g, b, a);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 0, r, g, b, a);
qStopColors[1].getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 1, r, g, b, a);
- cairo_pattern_set_corner_color_rgba(mpat, 2, r, g, b, a);
- cairo_pattern_end_patch(mpat);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 1, r, g, b, a);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 2, r, g, b, a);
+ cairo_pattern_mesh_end_patch(mpat);
}
else
{
- cairo_pattern_begin_patch(mpat);
- cairo_pattern_move_to(mpat, e1s.x2(), e1s.y2());
- cairo_pattern_line_to(mpat, e1.x2(), e1.y2());
- cairo_pattern_line_to(mpat, e2.x2(), e2.y2());
- cairo_pattern_line_to(mpat, e2s.x2(), e2s.y2());
- cairo_pattern_move_to(mpat, e1s.x2(), e1s.y2());
+ cairo_pattern_mesh_begin_patch(mpat);
+ cairo_pattern_mesh_move_to(mpat, e1s.x2(), e1s.y2());
+ cairo_pattern_mesh_line_to(mpat, e1.x2(), e1.y2());
+ cairo_pattern_mesh_line_to(mpat, e2.x2(), e2.y2());
+ cairo_pattern_mesh_line_to(mpat, e2s.x2(), e2s.y2());
qStopColors[offset-1].getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 0, r, g, b, a);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 0, r, g, b, a);
qStopColors[offset].getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 1, r, g, b, a);
- cairo_pattern_set_corner_color_rgba(mpat, 2, r, g, b, a);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 1, r, g, b, a);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 2, r, g, b, a);
qStopColors[offset-1].getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 3, r, g, b, a);
- cairo_pattern_end_patch(mpat);
- cairo_pattern_begin_patch(mpat);
- cairo_pattern_move_to(mpat, e2s.x2(), e2s.y2());
- cairo_pattern_line_to(mpat, e2.x2(), e2.y2());
- cairo_pattern_line_to(mpat, e3.x2(), e3.y2());
- cairo_pattern_line_to(mpat, e3s.x2(), e3s.y2());
- cairo_pattern_move_to(mpat, e2s.x2(), e2s.y2());
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 3, r, g, b, a);
+ cairo_pattern_mesh_end_patch(mpat);
+ cairo_pattern_mesh_begin_patch(mpat);
+ cairo_pattern_mesh_move_to(mpat, e2s.x2(), e2s.y2());
+ cairo_pattern_mesh_line_to(mpat, e2.x2(), e2.y2());
+ cairo_pattern_mesh_line_to(mpat, e3.x2(), e3.y2());
+ cairo_pattern_mesh_line_to(mpat, e3s.x2(), e3s.y2());
qStopColors[offset-1].getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 0, r, g, b, a);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 0, r, g, b, a);
qStopColors[offset].getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 1, r, g, b, a);
- cairo_pattern_set_corner_color_rgba(mpat, 2, r, g, b, a);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 1, r, g, b, a);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 2, r, g, b, a);
qStopColors[offset-1].getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 3, r, g, b, a);
- cairo_pattern_end_patch(mpat);
- cairo_pattern_begin_patch(mpat);
- cairo_pattern_move_to(mpat, e3s.x2(), e3s.y2());
- cairo_pattern_line_to(mpat, e3.x2(), e3.y2());
- cairo_pattern_line_to(mpat, e4.x2(), e4.y2());
- cairo_pattern_line_to(mpat, e4s.x2(), e4s.y2());
- cairo_pattern_move_to(mpat, e3s.x2(), e3s.y2());
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 3, r, g, b, a);
+ cairo_pattern_mesh_end_patch(mpat);
+ cairo_pattern_mesh_begin_patch(mpat);
+ cairo_pattern_mesh_move_to(mpat, e3s.x2(), e3s.y2());
+ cairo_pattern_mesh_line_to(mpat, e3.x2(), e3.y2());
+ cairo_pattern_mesh_line_to(mpat, e4.x2(), e4.y2());
+ cairo_pattern_mesh_line_to(mpat, e4s.x2(), e4s.y2());
qStopColors[offset-1].getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 0, r, g, b, a);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 0, r, g, b, a);
qStopColors[offset].getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 1, r, g, b, a);
- cairo_pattern_set_corner_color_rgba(mpat, 2, r, g, b, a);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 1, r, g, b, a);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 2, r, g, b, a);
qStopColors[offset-1].getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 3, r, g, b, a);
- cairo_pattern_end_patch(mpat);
- cairo_pattern_begin_patch(mpat);
- cairo_pattern_move_to(mpat, e4s.x2(), e4s.y2());
- cairo_pattern_line_to(mpat, e4.x2(), e4.y2());
- cairo_pattern_line_to(mpat, e1.x2(), e1.y2());
- cairo_pattern_line_to(mpat, e1s.x2(), e1s.y2());
- cairo_pattern_move_to(mpat, e4s.x2(), e4s.y2());
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 3, r, g, b, a);
+ cairo_pattern_mesh_end_patch(mpat);
+ cairo_pattern_mesh_begin_patch(mpat);
+ cairo_pattern_mesh_move_to(mpat, e4s.x2(), e4s.y2());
+ cairo_pattern_mesh_line_to(mpat, e4.x2(), e4.y2());
+ cairo_pattern_mesh_line_to(mpat, e1.x2(), e1.y2());
+ cairo_pattern_mesh_line_to(mpat, e1s.x2(), e1s.y2());
qStopColors[offset-1].getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 0, r, g, b, a);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 0, r, g, b, a);
qStopColors[offset].getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 1, r, g, b, a);
- cairo_pattern_set_corner_color_rgba(mpat, 2, r, g, b, a);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 1, r, g, b, a);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 2, r, g, b, a);
qStopColors[offset-1].getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 3, r, g, b, a);
- cairo_pattern_end_patch(mpat);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 3, r, g, b, a);
+ cairo_pattern_mesh_end_patch(mpat);
}
}
cairo_pattern_set_filter(mpat, CAIRO_FILTER_GOOD);
@@ -1206,7 +1213,8 @@
}
else if (fill_gradient.type() == VGradient::mesh)
{
-#ifdef HAVE_PRIVATE_CAIRO
+// #ifdef HAVE_PRIVATE_CAIRO
+#if (CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 11, 2) || HAVE_PRIVATE_CAIRO)
double p3x = gradPatchP3.x();
double p3y = gradPatchP3.y();
img = cairo_surface_create_similar(cairo_get_target(m_cr), CAIRO_CONTENT_COLOR_ALPHA, p3x, p3y);
@@ -1224,21 +1232,21 @@
meshPoint mp2 = meshGradientArray[grow][gcol+1];
meshPoint mp3 = meshGradientArray[grow+1][gcol+1];
meshPoint mp4 = meshGradientArray[grow+1][gcol];
- cairo_pattern_begin_patch(mpat);
- cairo_pattern_move_to(mpat, mp1.gridPoint.x(), mp1.gridPoint.y());
- cairo_pattern_curve_to(mpat, mp1.controlRight.x(), mp1.controlRight.y(), mp2.controlLeft.x(), mp2.controlLeft.y(), mp2.gridPoint.x(), mp2.gridPoint.y());
- cairo_pattern_curve_to(mpat, mp2.controlBottom.x(), mp2.controlBottom.y(), mp3.controlTop.x(), mp3.controlTop.y(), mp3.gridPoint.x(), mp3.gridPoint.y());
- cairo_pattern_curve_to(mpat, mp3.controlLeft.x(), mp3.controlLeft.y(), mp4.controlRight.x(), mp4.controlRight.y(), mp4.gridPoint.x(), mp4.gridPoint.y());
- cairo_pattern_curve_to(mpat, mp4.controlTop.x(), mp4.controlTop.y(), mp1.controlBottom.x(), mp1.controlBottom.y(), mp1.gridPoint.x(), mp1.gridPoint.y());
+ cairo_pattern_mesh_begin_patch(mpat);
+ cairo_pattern_mesh_move_to(mpat, mp1.gridPoint.x(), mp1.gridPoint.y());
+ cairo_pattern_mesh_curve_to(mpat, mp1.controlRight.x(), mp1.controlRight.y(), mp2.controlLeft.x(), mp2.controlLeft.y(), mp2.gridPoint.x(), mp2.gridPoint.y());
+ cairo_pattern_mesh_curve_to(mpat, mp2.controlBottom.x(), mp2.controlBottom.y(), mp3.controlTop.x(), mp3.controlTop.y(), mp3.gridPoint.x(), mp3.gridPoint.y());
+ cairo_pattern_mesh_curve_to(mpat, mp3.controlLeft.x(), mp3.controlLeft.y(), mp4.controlRight.x(), mp4.controlRight.y(), mp4.gridPoint.x(), mp4.gridPoint.y());
+ cairo_pattern_mesh_curve_to(mpat, mp4.controlTop.x(), mp4.controlTop.y(), mp1.controlBottom.x(), mp1.controlBottom.y(), mp1.gridPoint.x(), mp1.gridPoint.y());
mp1.color.getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 0, r, g, b, a);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 0, r, g, b, a);
mp2.color.getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 1, r, g, b, a);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 1, r, g, b, a);
mp3.color.getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 2, r, g, b, a);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 2, r, g, b, a);
mp4.color.getRgbF(&r, &g, &b, &a);
- cairo_pattern_set_corner_color_rgba(mpat, 3, r, g, b, a);
- cairo_pattern_end_patch(mpat);
+ cairo_pattern_mesh_set_corner_color_rgba(mpat, 3, r, g, b, a);
+ cairo_pattern_mesh_end_patch(mpat);
}
}
cairo_pattern_set_filter(mpat, CAIRO_FILTER_BEST);
@@ -1384,7 +1392,8 @@
cairo_paint_with_alpha (m_cr, fill_trans);
}
cairo_pattern_destroy (pat);
-#ifdef HAVE_PRIVATE_CAIRO
+// #ifdef HAVE_PRIVATE_CAIRO
+#if (CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 11, 2) || HAVE_PRIVATE_CAIRO)
if ((fill_gradient.type() == VGradient::fourcolor) || (fill_gradient.type() == VGradient::diamond) || (fill_gradient.type() == VGradient::mesh))
{
cairo_surface_destroy(img);
Modified: branches/ScribusOIF/scribus/third_party/cairo/cairo-pattern.c
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16308&path=/branches/ScribusOIF/scribus/third_party/cairo/cairo-pattern.c
==============================================================================
--- branches/ScribusOIF/scribus/third_party/cairo/cairo-pattern.c (original)
+++ branches/ScribusOIF/scribus/third_party/cairo/cairo-pattern.c Tue Jan 25 21:50:10 2011
@@ -1157,7 +1157,7 @@
* Since: XXX
**/
cairo_public void
-cairo_pattern_begin_patch (cairo_pattern_t *pattern)
+cairo_pattern_mesh_begin_patch (cairo_pattern_t *pattern)
{
cairo_mesh_pattern_t *mesh;
cairo_status_t status;
@@ -1258,7 +1258,7 @@
* Since: XXX
**/
cairo_public void
-cairo_pattern_end_patch (cairo_pattern_t *pattern)
+cairo_pattern_mesh_end_patch (cairo_pattern_t *pattern)
{
cairo_mesh_pattern_t *mesh;
int i;
@@ -1279,7 +1279,7 @@
return;
while (mesh->current_side < 3) {
- cairo_pattern_line_to (pattern,
+ cairo_pattern_mesh_line_to (pattern,
mesh->current_patch->points[0][0][0],
mesh->current_patch->points[0][0][1]);
mesh->current_patch->colors[mesh->current_side] = mesh->current_patch->colors[0];
@@ -1315,7 +1315,7 @@
* Since: XXX
**/
cairo_public void
-cairo_pattern_curve_to (cairo_pattern_t *pattern,
+cairo_pattern_mesh_curve_to (cairo_pattern_t *pattern,
double x1,
double y1,
double x2,
@@ -1392,7 +1392,7 @@
* Since: XXX
**/
cairo_public void
-cairo_pattern_line_to (cairo_pattern_t *pattern,
+cairo_pattern_mesh_line_to (cairo_pattern_t *pattern,
double x,
double y)
{
@@ -1459,7 +1459,7 @@
* Since: XXX
**/
cairo_public void
-cairo_pattern_move_to (cairo_pattern_t *pattern,
+cairo_pattern_mesh_move_to (cairo_pattern_t *pattern,
double x,
double y)
{
@@ -1496,7 +1496,7 @@
* Since: XXX
**/
cairo_public void
-cairo_pattern_set_control_point (cairo_pattern_t *pattern,
+cairo_pattern_mesh_set_control_point (cairo_pattern_t *pattern,
int point_num,
double x,
double y)
@@ -1624,7 +1624,7 @@
* %CAIRO_STATUS_PATTERN_TYPE_MISMATCH.
**/
void
-cairo_pattern_set_corner_color_rgb (cairo_pattern_t *pattern,
+cairo_pattern_mesh_set_corner_color_rgb (cairo_pattern_t *pattern,
int corner_num,
double red, double green, double blue)
{
@@ -1665,7 +1665,7 @@
* %CAIRO_STATUS_PATTERN_TYPE_MISMATCH.
**/
void
-cairo_pattern_set_corner_color_rgba (cairo_pattern_t *pattern,
+cairo_pattern_mesh_set_corner_color_rgba (cairo_pattern_t *pattern,
int corner_num,
double red, double green, double blue,
double alpha)
Modified: branches/ScribusOIF/scribus/third_party/cairo/cairo.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16308&path=/branches/ScribusOIF/scribus/third_party/cairo/cairo.h
==============================================================================
--- branches/ScribusOIF/scribus/third_party/cairo/cairo.h (original)
+++ branches/ScribusOIF/scribus/third_party/cairo/cairo.h Tue Jan 25 21:50:10 2011
@@ -2298,13 +2298,13 @@
cairo_pattern_get_type (cairo_pattern_t *pattern);
cairo_public void
-cairo_pattern_begin_patch (cairo_pattern_t *pattern);
-
-cairo_public void
-cairo_pattern_end_patch (cairo_pattern_t *pattern);
-
-cairo_public void
-cairo_pattern_curve_to (cairo_pattern_t *pattern,
+cairo_pattern_mesh_begin_patch (cairo_pattern_t *pattern);
+
+cairo_public void
+cairo_pattern_mesh_end_patch (cairo_pattern_t *pattern);
+
+cairo_public void
+cairo_pattern_mesh_curve_to (cairo_pattern_t *pattern,
double x1,
double y1,
double x2,
@@ -2313,28 +2313,28 @@
double y3);
cairo_public void
-cairo_pattern_line_to (cairo_pattern_t *pattern,
+cairo_pattern_mesh_line_to (cairo_pattern_t *pattern,
double x,
double y);
cairo_public void
-cairo_pattern_move_to (cairo_pattern_t *pattern,
+cairo_pattern_mesh_move_to (cairo_pattern_t *pattern,
double x,
double y);
cairo_public void
-cairo_pattern_set_control_point (cairo_pattern_t *pattern,
+cairo_pattern_mesh_set_control_point (cairo_pattern_t *pattern,
int point_num,
double x,
double y);
cairo_public void
-cairo_pattern_set_corner_color_rgb (cairo_pattern_t *pattern,
+cairo_pattern_mesh_set_corner_color_rgb (cairo_pattern_t *pattern,
int point_num,
double red, double green, double blue);
cairo_public void
-cairo_pattern_set_corner_color_rgba (cairo_pattern_t *pattern,
+cairo_pattern_mesh_set_corner_color_rgba (cairo_pattern_t *pattern,
int point_num,
double red, double green, double blue,
double alpha);
Modified: branches/ScribusOIF/scribus/ui/about.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16308&path=/branches/ScribusOIF/scribus/ui/about.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/about.cpp (original)
+++ branches/ScribusOIF/scribus/ui/about.cpp Tue Jan 25 21:50:10 2011
@@ -112,7 +112,7 @@
buildID = new QLabel( tab );
buildID->setAlignment(Qt::AlignCenter);
buildID->setTextInteractionFlags(Qt::TextSelectableByMouse);
- QString BUILD_DAY = "02";
+ QString BUILD_DAY = "23";
QString BUILD_MONTH = CommonStrings::january;
QString BUILD_YEAR = "2011";
QString BUILD_TIME = "";
Modified: branches/ScribusOIF/scribus/ui/polyprops.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16308&path=/branches/ScribusOIF/scribus/ui/polyprops.cpp
==============================================================================
--- branches/ScribusOIF/scribus/ui/polyprops.cpp (original)
+++ branches/ScribusOIF/scribus/ui/polyprops.cpp Tue Jan 25 21:50:10 2011
@@ -14,18 +14,44 @@
#include "commonstrings.h"
#include "util_icon.h"
-PolygonProps::PolygonProps(QWidget* parent, int polyC, double polyF, bool polyS, double polyR, double polyCurvature, double polyInnerRot, double polyOuterCurvature, bool forEditMode) : QDialog( parent )
+PolyVectorDialog::PolyVectorDialog(QWidget* parent, int polyC, double polyF, bool polyS, double polyR, double polyCurvature, double polyInnerRot, double polyOuterCurvature) : ScrPaletteBase( parent, "PolyVectorDialog", false, 0 )
{
- if (forEditMode)
- setModal(false);
- else
- setModal(true);
setWindowTitle( tr( "Polygon Properties" ) );
setWindowIcon(QIcon(loadIcon ( "AppIcon.png" )));
PolygonPropsLayout = new QVBoxLayout( this );
PolygonPropsLayout->setMargin(10);
PolygonPropsLayout->setSpacing(5);
- polyWidget = new PolygonWidget(this, polyC, polyF, polyS, polyR, polyCurvature, polyInnerRot, polyOuterCurvature, forEditMode);
+ polyWidget = new PolygonWidget(this, polyC, polyF, polyS, polyR, polyCurvature, polyInnerRot, polyOuterCurvature, true);
+ PolygonPropsLayout->addWidget( polyWidget );
+ Layout1 = new QHBoxLayout;
+ Layout1->setMargin(0);
+ Layout1->setSpacing(5);
+ QSpacerItem* spacer_2 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
+ Layout1->addItem( spacer_2 );
+ okButton = new QPushButton(this);
+ okButton->setText( tr("End Edit"));
+ okButton->setDefault( true );
+ Layout1->addWidget( okButton );
+ PolygonPropsLayout->addLayout( Layout1 );
+ // signals and slots connections
+ connect(polyWidget, SIGNAL(NewVectors(int, double, bool, double, double, double, double)), this, SIGNAL(NewVectors(int, double, bool, double, double, double, double)));
+ connect(okButton, SIGNAL(clicked()), this, SIGNAL(endEdit()));
+}
+
+void PolyVectorDialog::setValues(int polyCorners, double polyF, bool polyUseConvexFactor, double polyRotation, double polyCurvature, double polyInnerRot, double polyOuterCurvature)
+{
+ polyWidget->setValues(polyCorners, polyF, polyUseConvexFactor, polyRotation, polyCurvature, polyInnerRot, polyOuterCurvature);
+}
+
+PolygonProps::PolygonProps(QWidget* parent, int polyC, double polyF, bool polyS, double polyR, double polyCurvature, double polyInnerRot, double polyOuterCurvature) : QDialog( parent )
+{
+ setModal(true);
+ setWindowTitle( tr( "Polygon Properties" ) );
+ setWindowIcon(QIcon(loadIcon ( "AppIcon.png" )));
+ PolygonPropsLayout = new QVBoxLayout( this );
+ PolygonPropsLayout->setMargin(10);
+ PolygonPropsLayout->setSpacing(5);
+ polyWidget = new PolygonWidget(this, polyC, polyF, polyS, polyR, polyCurvature, polyInnerRot, polyOuterCurvature);
PolygonPropsLayout->addWidget( polyWidget );
Layout1 = new QHBoxLayout;
Layout1->setMargin(0);
@@ -41,12 +67,6 @@
Layout1->addWidget( cancelButton );
PolygonPropsLayout->addLayout( Layout1 );
// signals and slots connections
- if (forEditMode)
- {
- connect(polyWidget, SIGNAL(NewVectors(int, double, bool, double, double, double, double)), this, SIGNAL(NewVectors(int, double, bool, double, double, double, double)));
- cancelButton->hide();
- okButton->setText( tr("End Edit"));
- }
connect(okButton, SIGNAL(clicked()), this, SLOT(accept()));
connect(cancelButton, SIGNAL(clicked()), this, SLOT(reject()));
}
Modified: branches/ScribusOIF/scribus/ui/polyprops.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16308&path=/branches/ScribusOIF/scribus/ui/polyprops.h
==============================================================================
--- branches/ScribusOIF/scribus/ui/polyprops.h (original)
+++ branches/ScribusOIF/scribus/ui/polyprops.h Tue Jan 25 21:50:10 2011
@@ -13,14 +13,36 @@
class QPushButton;
#include "scribusapi.h"
+#include "ui/scrpalettebase.h"
class PolygonWidget;
+
+class SCRIBUS_API PolyVectorDialog : public ScrPaletteBase
+{
+ Q_OBJECT
+
+public:
+ PolyVectorDialog(QWidget* parent, int polyC, double polyF, bool polyS, double polyR, double polyCurvature, double polyInnerRot, double polyOuterCurvature);
+ ~PolyVectorDialog() {};
+ void setValues(int polyC, double polyF, bool polyS, double polyR, double polyCurvature, double polyInnerRot, double polyOuterCurvature);
+ PolygonWidget* polyWidget;
+ QPushButton* okButton;
+
+signals:
+ void NewVectors(int, double, bool, double, double, double, double);
+ void endEdit();
+
+protected:
+ QVBoxLayout* PolygonPropsLayout;
+ QHBoxLayout* Layout1;
+
+};
class SCRIBUS_API PolygonProps : public QDialog
{
Q_OBJECT
public:
- PolygonProps(QWidget* parent, int polyC, double polyF, bool polyS, double polyR, double polyCurvature, double polyInnerRot, double polyOuterCurvature, bool forEditMode = false);
+ PolygonProps(QWidget* parent, int polyC, double polyF, bool polyS, double polyR, double polyCurvature, double polyInnerRot, double polyOuterCurvature);
~PolygonProps() {};
void getValues(int* polyC, double* polyF, bool* polyS, double* polyR, double* polyCurvature, double* polyInnerRot, double* polyOuterCurvature);
void setValues(int polyC, double polyF, bool polyS, double polyR, double polyCurvature, double polyInnerRot, double polyOuterCurvature);
More information about the scribus-commit
mailing list