r21490 by craig - #14299: Fix strings in PP and related numbered lists strings <FirasH>
scribus-commit
scribus-commit at lists.scribus.net
Tue Nov 1 13:05:44 UTC 2016
Author: craig
Date: Tue Nov 1 13:05:44 2016
New Revision: 21490
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21490
Log:
#14299: Fix strings in PP and related numbered lists strings <FirasH>
Modified:
trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
trunk/Scribus/scribus/ui/propertywidget_pareffectbase.ui
trunk/Scribus/scribus/ui/smpstylewidget.cpp
trunk/Scribus/scribus/ui/smpstylewidget.ui
Modified: trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21490&path=/trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp Tue Nov 1 13:05:44 2016
@@ -566,24 +566,7 @@
void PropertyWidget_ParEffect::languageChange()
{
fillPECombo();
- dropCapLinesLabel->setText(tr("Lines:"));
- dropCapsGroup->setTitle(tr("Drop Caps"));
- bullGroup->setTitle(tr("Bulleted List"));
- bulletCharLabel->setText(tr("Bullet Char(s):"));
- bulletCharTableButton->setToolTip(tr("Enhanced char table to choose bullet chars"));
- bulletCharTableButton->setText(tr("Char Table"));
- numGroup->setTitle(tr("Numbered List"));
- numLevelLabel->setText(tr("Level:"));
- numComboLabel->setText(tr("Set:"));
- numFormatLabel->setText(tr("Format:"));
- numStartLabel->setText(tr("Start:"));
- numPrefixLabel->setText(tr("Prefix:"));
- numSuffixLabel->setText(tr("Suffix:"));
- peGroup->setTitle(tr("Effect Parameters"));
- peIndent->setText(tr("Auto-Indent"));
- peOffsetLabel->setText(tr("Offset:"));
- peCharStyleLabel->setText(tr("Char Style:"));
- peCharStyleCombo->setToolTip(tr("Choose character style or leave blank for use default paragraph style"));
+ retranslateUi(this);
}
void PropertyWidget_ParEffect::openEnhanced()
Modified: trunk/Scribus/scribus/ui/propertywidget_pareffectbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21490&path=/trunk/Scribus/scribus/ui/propertywidget_pareffectbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pareffectbase.ui (original)
+++ trunk/Scribus/scribus/ui/propertywidget_pareffectbase.ui Tue Nov 1 13:05:44 2016
@@ -29,7 +29,7 @@
<string>Number of lines used by the drop cap</string>
</property>
<property name="text">
- <string>Lines</string>
+ <string>Lines:</string>
</property>
</widget>
</item>
@@ -84,7 +84,7 @@
<item row="0" column="0">
<widget class="QLabel" name="bulletCharLabel">
<property name="text">
- <string>Bullet Char(s)</string>
+ <string>Bullet Char(s):</string>
</property>
<property name="buddy">
<cstring>bulletStrEdit</cstring>
@@ -99,6 +99,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="toolTip">
+ <string>Enhanced Character Table to choose bullet characters</string>
+ </property>
<property name="text">
<string>Char Table</string>
</property>
@@ -121,7 +124,7 @@
<item>
<widget class="QLabel" name="numLevelLabel">
<property name="text">
- <string>Level</string>
+ <string>Level:</string>
</property>
<property name="buddy">
<cstring>numLevelSpin</cstring>
@@ -151,7 +154,7 @@
<item>
<widget class="QLabel" name="numStartLabel">
<property name="text">
- <string>Start</string>
+ <string>Start:</string>
</property>
</widget>
</item>
@@ -172,7 +175,7 @@
<item>
<widget class="QLabel" name="numComboLabel">
<property name="text">
- <string>Set</string>
+ <string>Set:</string>
</property>
</widget>
</item>
@@ -199,7 +202,7 @@
<item>
<widget class="QLabel" name="numFormatLabel">
<property name="text">
- <string>Format</string>
+ <string>Format:</string>
</property>
<property name="buddy">
<cstring>numFormatCombo</cstring>
@@ -223,7 +226,7 @@
<item>
<widget class="QLabel" name="numPrefixLabel">
<property name="text">
- <string>Prefix</string>
+ <string>Prefix:</string>
</property>
<property name="buddy">
<cstring>numPrefix</cstring>
@@ -249,7 +252,7 @@
<item>
<widget class="QLabel" name="numSuffixLabel">
<property name="text">
- <string>Suffix</string>
+ <string>Suffix:</string>
</property>
<property name="buddy">
<cstring>numSuffix</cstring>
@@ -273,7 +276,7 @@
<item row="6" column="0">
<widget class="QLabel" name="peCharStyleLabel">
<property name="text">
- <string>Char Style</string>
+ <string>Char Style:</string>
</property>
<property name="buddy">
<cstring>peCharStyleCombo</cstring>
@@ -281,14 +284,18 @@
</widget>
</item>
<item row="6" column="1">
- <widget class="CharStyleComboBox" name="peCharStyleCombo"/>
+ <widget class="CharStyleComboBox" name="peCharStyleCombo">
+ <property name="toolTip">
+ <string>Choose Character Style or leave blank to use default Paragraph Style</string>
+ </property>
+ </widget>
</item>
<item row="1" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QCheckBox" name="peIndent">
<property name="text">
- <string>AutoIndent</string>
+ <string>Auto-Indent</string>
</property>
</widget>
</item>
@@ -308,7 +315,7 @@
<item>
<widget class="QLabel" name="peOffsetLabel">
<property name="text">
- <string>Offset</string>
+ <string>Offset:</string>
</property>
<property name="buddy">
<cstring>peOffset</cstring>
Modified: trunk/Scribus/scribus/ui/smpstylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21490&path=/trunk/Scribus/scribus/ui/smpstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.cpp Tue Nov 1 13:05:44 2016
@@ -101,56 +101,11 @@
void SMPStyleWidget::languageChange()
{
-/***********************************/
-/* Begin Tooltips */
-/***********************************/
-// These are for the paragraph style
-
- parentCombo->setToolTip( tr("Parent Style"));
- lineSpacingMode->setToolTip( tr("Line Spacing Mode"));
- lineSpacing->setToolTip( tr("Line Spacing"));
- spaceAbove->setToolTip( tr("Space Above"));
- spaceBelow->setToolTip( tr("Space Below"));
- lineSpacingLabel->setToolTip(lineSpacing->toolTip());
- spaceAboveLabel->setToolTip(spaceAbove->toolTip());
- spaceBelowLabel->setToolTip(spaceBelow->toolTip());
-// optMarginCombo->setToolTip(tr("Activate an optical margins layout"));
-// optMarginLabel->setToolTip(optMarginCombo->toolTip());
- //CB Unneeded, gets in the way of single widget tooltips
- //dropCapsBox->setToolTip( tr("Enable or disable drop cap"));
- dropCapLines->setToolTip( tr("Drop Cap Lines"));
- bulletCharTableButton->setToolTip(tr("Enhanced Char Table for inserting customs chars as bullets"));
- parEffectOffset->setToolTip( tr("Paragraph Effects Chars Offset"));
- parEffectIndentBox->setToolTip( tr("Hang Paragraph Effect before paragraph indent"));
- parEffectCharStyleCombo->setToolTip( tr("Choose character style or leave blank for use default paragraph style"));
+ retranslateUi(this);
alignment->languageChange();
tabList->first_->setToolTip( tr("First Line Indent"));
tabList->left_->setToolTip( tr("Left Indent"));
tabList->right_->setToolTip( tr("Right Indent"));
- //CB Unneeded, gets in the way of single widget tooltips
- //tabList->setToolTip( tr("Tabulators"));
-
- minSpaceSpin->setToolTip( tr("Maximum white space compression allowed.\nExpressed as a percentage of the current white space value."));
- minSpaceLabel->setToolTip(minSpaceSpin->toolTip());
- minGlyphExtSpin->setToolTip(tr("Maximum compression of glyphs"));
- minGlyphExtLabel->setToolTip(minGlyphExtSpin->toolTip());
- maxGlyphExtSpin->setToolTip(tr("Maximum extension of glyphs"));
- maxGlyphExtLabel->setToolTip(maxGlyphExtSpin->toolTip());
-
- keepLinesStart->setToolTip("<qt>" + tr("Ensure that first lines of a paragraph won't end up separated from the rest (known as widow/orphan control)") + "</qt>");
- keepLinesEnd->setToolTip("<qt>" + tr("Ensure that last lines of a paragraph won't end up separated from the rest (known as widow/orphan control)") + "</qt>");
- keepLabelStart->setToolTip(keepLinesStart->toolTip());
- keepLabelEnd->setToolTip(keepLinesEnd->toolTip());
- keepTogether->setToolTip("<qt>" + tr("If checked, ensures that the paragraph won't be split across multiple pages or columns") + "</qt>");
- keepWithNext->setToolTip("<qt>" + tr("If checked, automatically moves the paragraph to the next column or page if the next paragraph isn't on the same page or column") + "</qt>");
- backColor_->setToolTip( tr("Background Color"));
- backShade_->setToolTip( tr("Background Shade"));
- backIcon->setToolTip(backColor_->toolTip());
- backShadeLabel->setToolTip(backShade_->toolTip());
-
-/***********************************/
-/* End Tooltips */
-/***********************************/
int oldLineSpacingModeIndex = lineSpacingMode->currentIndex();
bool lineSpacingModeBlocked = lineSpacingMode->blockSignals(true);
@@ -161,59 +116,18 @@
lineSpacingMode->setCurrentIndex(oldLineSpacingModeIndex);
lineSpacingMode->blockSignals(lineSpacingModeBlocked);
-// optMarginCombo->clear();
-// optMarginCombo->addItem(tr("None"), ParagraphStyle::OM_None);
-// optMarginCombo->addItem(tr("Left Protruding"), ParagraphStyle::OM_LeftProtruding);
-// optMarginCombo->addItem(tr("Right Protruding"), ParagraphStyle::OM_RightProtruding);
-// optMarginCombo->addItem(tr("Left Hanging Punctuation"), ParagraphStyle::OM_LeftHangingPunct);
-// optMarginCombo->addItem(tr("Right Hanging Punctuation"), ParagraphStyle::OM_RightHangingPunct);
-// optMarginCombo->addItem(tr("Default"), ParagraphStyle::OM_Default);
-//
-// optMarginLabel->setText(tr("Optical Margins:"));
-
lineSpacing->setSuffix(unitGetSuffixFromIndex(0));
spaceAbove->setSuffix(unitGetSuffixFromIndex(0));
spaceBelow->setSuffix(unitGetSuffixFromIndex(0));
- parentLabel->setText( tr("Based On:"));
- distancesBox->setTitle( tr("Alignment and Distances"));
-
- textFlowBox->setTitle( tr("Orphans and Widows"));
- keepLabelStart->setText( tr("Don't separate first"));
+
keepLinesStart->setSuffix( tr(" lines"));
- keepLabelEnd->setText( tr("Don't separate last"));
keepLinesEnd->setSuffix( tr(" lines"));
- keepTogether->setText( tr("Do not split paragraph"));
- keepWithNext->setText( tr("Keep with next paragraph"));
-
- //parEffectsBox->setTitle(tr("Paragraph Effects"));
- bulletBox->setTitle( tr("Bullets"));
- bulletCharLabel->setText( tr("Bullet Character(s):"));
- bulletCharTableButton->setText(tr("Character Table"));
-
- numBox->setTitle( tr("Numbering"));
- numLevelLabel->setText( tr("Level:"));
- numNewLabel->setText( tr("Create New Set:"));
- numFormatLabel->setText(tr("Numbering Style:"));
- numStartLabel->setText( tr("Start with:"));
- numPrefixLabel->setText(tr("Prefix:"));
- numSuffixLabel->setText(tr("Suffix:"));
- numRestartLabel->setText( tr("Restart:"));
- numRestartOtherBox->setText( tr("Restart after other format"));
- numRestartHigherBox->setText(tr("Restart after higher level"));
int oldNumRestartIndex = numRestartCombo->currentIndex();
bool numRestartComboBlocked = numRestartCombo->blockSignals(true);
fillNumRestartCombo();
numRestartCombo->setCurrentIndex(oldNumRestartIndex);
numRestartCombo->blockSignals(numRestartComboBlocked);
-
- dropCapsBox->setTitle( tr("Drop Caps"));
- dropCapsLineLabel->setText( tr("Lines:"));
-
- parEffectCharStyleComboLabel->setText(tr("Character Style for Effect:"));
- distFromTextLabel->setText(tr("Distance from Text:"));
- parEffectIndentBox->setText(tr("AutoIndent"));
- parentParEffectsButton->setText(tr("Use Parent`s Values"));
/* #13455 stop making the font 2ce as big
QFont font1;
@@ -224,25 +138,6 @@
((QComboBox*) bulletStrEdit)->setFont(font1);
(bulletStrEdit->lineEdit())->setFont(font1);
*/
- tabsBox->setTitle(tr("Tabulators and Indentation"));
- tabWidget->setTabText(0, tr("Properties"));
- tabWidget->setTabText(1, tr("Paragraph Effects"));
- tabWidget->setTabText(2, tr("Character Style"));
-
- advSettingsGroupBox->setTitle( tr("Advanced Settings"));
- minSpaceLabel->setText( tr("Min. Space Width:"));
- glyphExtensionLabel->setText( tr("Glyph Extension "));
- minGlyphExtLabel->setText( tr("Min:", "Glyph Extension"));
- maxGlyphExtLabel->setText( tr("Max:", "Glyph Extension"));
-
- opticalMarginsGroupBox->setTitle( tr("Optical Margins"));
- optMarginRadioNone->setText( tr("None", "Optical Margins"));
- optMarginRadioBoth->setText( tr("Both Sides", "Optical Margins"));
- optMarginRadioLeft->setText( tr("Left Only", "Optical Margins"));
- optMarginRadioRight->setText( tr("Right Only", "Optical Margins"));
-
- optMarginDefaultButton->setText( tr("Reset to Default"));
- optMarginParentButton->setText( tr("Use Parent Value"));
if (backColor_->count() > 0)
{
Modified: trunk/Scribus/scribus/ui/smpstylewidget.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21490&path=/trunk/Scribus/scribus/ui/smpstylewidget.ui
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.ui (original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.ui Tue Nov 1 13:05:44 2016
@@ -44,6 +44,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="toolTip">
+ <string>Parent Style</string>
+ </property>
</widget>
</item>
</layout>
@@ -115,10 +118,16 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="toolTip">
+ <string>Line Spacing Mode</string>
+ </property>
</widget>
</item>
<item>
<widget class="SMScrSpinBox" name="lineSpacing">
+ <property name="toolTip">
+ <string>Line Spacing</string>
+ </property>
<property name="minimum">
<number>1</number>
</property>
@@ -162,6 +171,9 @@
</item>
<item>
<widget class="SMScrSpinBox" name="spaceAbove">
+ <property name="toolTip">
+ <string>Space Above</string>
+ </property>
<property name="maximum">
<number>300</number>
</property>
@@ -198,6 +210,9 @@
</item>
<item>
<widget class="SMScrSpinBox" name="spaceBelow">
+ <property name="toolTip">
+ <string>Space Below</string>
+ </property>
<property name="maximum">
<number>300</number>
</property>
@@ -247,6 +262,9 @@
</item>
<item>
<widget class="SMSpinBox" name="keepLinesStart">
+ <property name="toolTip">
+ <string>Ensure that first lines of a paragraph won't end up separated from the rest (known as widow/orphan control)</string>
+ </property>
<property name="suffix">
<string> lines</string>
</property>
@@ -281,6 +299,9 @@
</item>
<item>
<widget class="SMSpinBox" name="keepLinesEnd">
+ <property name="toolTip">
+ <string>Ensure that last lines of a paragraph won't end up separated from the rest (known as widow/orphan control)</string>
+ </property>
<property name="suffix">
<string> lines</string>
</property>
@@ -306,6 +327,9 @@
</item>
<item>
<widget class="SMCheckBox" name="keepTogether">
+ <property name="toolTip">
+ <string>If checked, ensures that the paragraph won't be split across multiple pages or columns</string>
+ </property>
<property name="text">
<string>Do not split paragraph</string>
</property>
@@ -313,6 +337,9 @@
</item>
<item>
<widget class="SMCheckBox" name="keepWithNext">
+ <property name="toolTip">
+ <string>If checked, automatically moves the paragraph to the next column or page if the next paragraph isn't on the same page or column</string>
+ </property>
<property name="text">
<string>Keep with next paragraph</string>
</property>
@@ -429,7 +456,7 @@
<item row="0" column="0">
<widget class="QLabel" name="minSpaceLabel">
<property name="text">
- <string>TextLabel</string>
+ <string>Min. Space Width:</string>
</property>
<property name="buddy">
<cstring>minSpaceSpin</cstring>
@@ -450,12 +477,15 @@
<height>0</height>
</size>
</property>
+ <property name="toolTip">
+ <string>Maximum white space compression allowed. Expressed as a percentage of the current white space value.</string>
+ </property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="glyphExtensionLabel">
<property name="text">
- <string>TextLabel</string>
+ <string>Glyph Extension </string>
</property>
</widget>
</item>
@@ -464,7 +494,7 @@
<item>
<widget class="QLabel" name="minGlyphExtLabel">
<property name="text">
- <string>TextLabel</string>
+ <string>Min:</string>
</property>
<property name="buddy">
<cstring>minGlyphExtSpin</cstring>
@@ -479,6 +509,9 @@
<height>0</height>
</size>
</property>
+ <property name="toolTip">
+ <string>Maximum compression of glyphs</string>
+ </property>
</widget>
</item>
</layout>
@@ -488,7 +521,7 @@
<item>
<widget class="QLabel" name="maxGlyphExtLabel">
<property name="text">
- <string>TextLabel</string>
+ <string>Max:</string>
</property>
<property name="buddy">
<cstring>maxGlyphExtSpin</cstring>
@@ -502,6 +535,9 @@
<width>0</width>
<height>0</height>
</size>
+ </property>
+ <property name="toolTip">
+ <string>Maximum extension of glyphs</string>
</property>
</widget>
</item>
@@ -627,7 +663,11 @@
</widget>
</item>
<item>
- <widget class="SMColorCombo" name="backColor_"/>
+ <widget class="SMColorCombo" name="backColor_">
+ <property name="toolTip">
+ <string>Background Color</string>
+ </property>
+ </widget>
</item>
<item>
<widget class="QLabel" name="backShadeLabel">
@@ -650,6 +690,9 @@
</item>
<item>
<widget class="SMShadeButton" name="backShade_">
+ <property name="toolTip">
+ <string>Background Shade</string>
+ </property>
<property name="text">
<string/>
</property>
@@ -702,7 +745,7 @@
</sizepolicy>
</property>
<property name="title">
- <string>Bullets</string>
+ <string>Bulleted List</string>
</property>
<property name="checkable">
<bool>true</bool>
@@ -716,7 +759,7 @@
<item>
<widget class="QLabel" name="bulletCharLabel">
<property name="text">
- <string>Bullet Character(s)</string>
+ <string>Bullet Char(s):</string>
</property>
</widget>
</item>
@@ -760,8 +803,11 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text">
- <string>Character Table</string>
+ <property name="toolTip">
+ <string>Enhanced Character Table for inserting custom characters as bullets</string>
+ </property>
+ <property name="text">
+ <string>Char Table</string>
</property>
<property name="checkable">
<bool>true</bool>
@@ -795,7 +841,7 @@
</sizepolicy>
</property>
<property name="title">
- <string>Numbering</string>
+ <string>Numbered List</string>
</property>
<property name="checkable">
<bool>true</bool>
@@ -960,7 +1006,7 @@
</sizepolicy>
</property>
<property name="text">
- <string>Restart</string>
+ <string>Restart:</string>
</property>
</widget>
</item>
@@ -1035,7 +1081,7 @@
<item>
<widget class="QLabel" name="dropCapsLineLabel">
<property name="text">
- <string>&Lines:</string>
+ <string>Lines:</string>
</property>
<property name="buddy">
<cstring>dropCapLines</cstring>
@@ -1044,6 +1090,9 @@
</item>
<item>
<widget class="SMSpinBox" name="dropCapLines">
+ <property name="toolTip">
+ <string>Drop Cap Lines</string>
+ </property>
<property name="minimum">
<number>2</number>
</property>
@@ -1086,7 +1135,11 @@
</widget>
</item>
<item>
- <widget class="SMScComboBox" name="parEffectCharStyleCombo"/>
+ <widget class="SMScComboBox" name="parEffectCharStyleCombo">
+ <property name="toolTip">
+ <string>Choose Character Style or leave blank to use default Paragraph Style</string>
+ </property>
+ </widget>
</item>
<item>
<spacer name="spacer_6">
@@ -1119,6 +1172,9 @@
</item>
<item>
<widget class="SMScrSpinBox" name="parEffectOffset">
+ <property name="toolTip">
+ <string>Paragraph Effects characters offset</string>
+ </property>
<property name="minimum">
<number>-3000</number>
</property>
@@ -1142,8 +1198,11 @@
</item>
<item>
<widget class="SMCheckBox" name="parEffectIndentBox">
+ <property name="toolTip">
+ <string>Hang Paragraph Effect before paragraph indent</string>
+ </property>
<property name="text">
- <string>AutoIndent</string>
+ <string>Auto-Indent</string>
</property>
</widget>
</item>
@@ -1170,7 +1229,7 @@
<bool>true</bool>
</property>
<property name="text">
- <string>Use Parent's Values</string>
+ <string>Use Parent Values</string>
</property>
</widget>
</item>
@@ -1196,7 +1255,7 @@
</widget>
<widget class="QWidget" name="tabCharacterStyle">
<attribute name="title">
- <string>Ch&aracter Style</string>
+ <string>Character Style</string>
</attribute>
<layout class="QVBoxLayout">
<property name="spacing">
More information about the scribus-commit
mailing list