Git commit 0f246ed0d32c7caec170f93d5d429d125645bf28 by Lasse Liehu.
Committed on 18/05/2014 at 12:31.
Pushed by lliehu into branch 'calligra/2.8'.

Miscellaneous i18n fixes

Also some adjustments to command names that were
previously untranslatable because they were not extracted.

CCMAIL: kde-i18n-doc@kde.org
REVIEW: 118186

M  +2    -2    plugins/chartshape/Messages.sh
M  +8    -8    plugins/chartshape/commands/AxisCommand.cpp
M  +2    -2    plugins/chartshape/commands/ChartTextShapeCommand.cpp
M  +5    -5    plugins/chartshape/commands/DatasetCommand.cpp
M  +4    -4    plugins/chartshape/commands/LegendCommand.cpp
M  +2    -1    plugins/musicshape/MusicShape.cpp
M  +2    -2    plugins/musicshape/SimpleEntryTool.cpp
M  +1    -1    plugins/musicshape/commands/AddPartCommand.cpp
M  +2    -1    plugins/pictureshape/Messages.sh
M  +2    -1    plugins/videoshape/Messages.sh

http://commits.kde.org/calligra/0f246ed0d32c7caec170f93d5d429d125645bf28

diff --git a/plugins/chartshape/Messages.sh b/plugins/chartshape/Messages.sh
index 643cb5f..9ce6052 100755
--- a/plugins/chartshape/Messages.sh
+++ b/plugins/chartshape/Messages.sh
@@ -1,3 +1,3 @@
 #! /bin/sh
-$EXTRACTRC *.ui dialogs/*.ui  >> rc.cpp
-$XGETTEXT *.cpp dialogs/*.cpp -o $podir/ChartShape.pot
+$EXTRACTRC `find . -name \*.ui` >> rc.cpp
+$XGETTEXT `find . -name \*.cpp` -o $podir/ChartShape.pot
diff --git a/plugins/chartshape/commands/AxisCommand.cpp b/plugins/chartsha=
pe/commands/AxisCommand.cpp
index 1c63e3d..398e803 100644
--- a/plugins/chartshape/commands/AxisCommand.cpp
+++ b/plugins/chartshape/commands/AxisCommand.cpp
@@ -113,7 +113,7 @@ void AxisCommand::setAxisTitle(const QString &title)
 {
     m_newTitleText =3D title;
 =

-    setText(i18nc("(qtundo-format)", "Axis Title"));
+    setText(i18nc("(qtundo-format)", "Set Axis Title"));
 }
 =

 void AxisCommand::setAxisShowGridLines(bool show)
@@ -142,14 +142,14 @@ void AxisCommand::setAxisStepWidth(qreal width)
 {
     m_newStepWidth =3D width;
 =

-    setText(i18nc("(qtundo-format)", "Axis step width"));
+    setText(i18nc("(qtundo-format)", "Set Axis Step Width"));
 }
 =

 void AxisCommand::setAxisSubStepWidth(qreal width)
 {
     m_newSubStepWidth =3D width;
 =

-    setText(i18nc("(qtundo-format)", "Axis substep width"));
+    setText(i18nc("(qtundo-format)", "Set Axis Substep Width"));
 }
 =

 void AxisCommand::setAxisUseAutomaticStepWidth(bool automatic)
@@ -157,9 +157,9 @@ void AxisCommand::setAxisUseAutomaticStepWidth(bool aut=
omatic)
     m_newShowGridLines =3D automatic;
 =

     if (automatic) {
-        setText(i18nc("(qtundo-format)", "Automatic step width"));
+        setText(i18nc("(qtundo-format)", "Set Automatic Step Width"));
     } else {
-        setText(i18nc("(qtundo-format)", "Manual step width"));
+        setText(i18nc("(qtundo-format)", "Set Manual Step Width"));
     }
 }
 =

@@ -168,9 +168,9 @@ void AxisCommand::setAxisUseAutomaticSubStepWidth(bool =
automatic)
     m_newShowGridLines =3D automatic;
 =

     if (automatic) {
-        setText(i18nc("(qtundo-format)", "Automatic substep width"));
+        setText(i18nc("(qtundo-format)", "Automatic Substep Width"));
     } else {
-        setText(i18nc("(qtundo-format)", "Manual substep width"));
+        setText(i18nc("(qtundo-format)", "Manual Substep Width"));
     }
 }
 =

@@ -178,5 +178,5 @@ void AxisCommand::setAxisLabelsFont(const QFont &font)
 {
     m_newLabelsFont =3D font;
 =

-    setText(i18nc("(qtundo-format)", "Axis Label Font"));
+    setText(i18nc("(qtundo-format)", "Set Axis Label Font"));
 }
diff --git a/plugins/chartshape/commands/ChartTextShapeCommand.cpp b/plugin=
s/chartshape/commands/ChartTextShapeCommand.cpp
index d85dbdb..767038b 100644
--- a/plugins/chartshape/commands/ChartTextShapeCommand.cpp
+++ b/plugins/chartshape/commands/ChartTextShapeCommand.cpp
@@ -37,9 +37,9 @@ ChartTextShapeCommand::ChartTextShapeCommand(KoShape* tex=
tShape, ChartShape *cha
     , m_newIsVisible(isVisible)
 {
     if (m_newIsVisible) {
-        setText(i18nc("(qtundo-format)", "Show Textshape"));
+        setText(i18nc("(qtundo-format)", "Show Text Shape"));
     } else {
-        setText(i18nc("(qtundo-format)", "Hide Textshape"));
+        setText(i18nc("(qtundo-format)", "Hide Text Shape"));
     }
 }
 =

diff --git a/plugins/chartshape/commands/DatasetCommand.cpp b/plugins/chart=
shape/commands/DatasetCommand.cpp
index 4d76b68..53f8e00 100644
--- a/plugins/chartshape/commands/DatasetCommand.cpp
+++ b/plugins/chartshape/commands/DatasetCommand.cpp
@@ -110,7 +110,7 @@ void DatasetCommand::setDataSetChartType(ChartType type=
, ChartSubtype subtype)
     m_newType    =3D type;
     m_newSubtype =3D subtype;
 =

-    setText(i18nc("(qtundo-format)", "Dataset Chart Type"));
+    setText(i18nc("(qtundo-format)", "Set Dataset Chart Type"));
 }
 =

 void DatasetCommand::setDataSetShowCategory(bool show)
@@ -161,26 +161,26 @@ void DatasetCommand::setDataSetBrush(const QColor &co=
lor)
 {
     m_newBrushColor =3D color;
 =

-    setText(i18nc("(qtundo-format)", "Dataset Brush color"));
+    setText(i18nc("(qtundo-format)", "Set Dataset Brush Color"));
 }
 =

 void DatasetCommand::setDataSetPen(const QColor &color)
 {
     m_newPenColor =3D color;
 =

-    setText(i18nc("(qtundo-format)", "Dataset Pen color"));
+    setText(i18nc("(qtundo-format)", "Set Dataset Pen Color"));
 }
 =

 void DatasetCommand::setDataSetMarker(OdfMarkerStyle style)
 {
     m_newMarkerStyle =3D style;
 =

-    setText(i18nc("(qtundo-format)", "Dataset Marker style"));
+    setText(i18nc("(qtundo-format)", "Set Dataset Marker Style"));
 }
 =

 void DatasetCommand::setDataSetAxis(Axis *axis)
 {
     m_newAxis =3D axis;
 =

-    setText(i18nc("(qtundo-format)", "Dataset Axis"));
+    setText(i18nc("(qtundo-format)", "Set Dataset Axis"));
 }
diff --git a/plugins/chartshape/commands/LegendCommand.cpp b/plugins/charts=
hape/commands/LegendCommand.cpp
index 4e71802..ad8e2e0 100644
--- a/plugins/chartshape/commands/LegendCommand.cpp
+++ b/plugins/chartshape/commands/LegendCommand.cpp
@@ -83,7 +83,7 @@ void LegendCommand::setLegendTitle(const QString &title)
 {
     m_newTitle =3D title;
 =

-    setText(i18nc("(qtundo-format)", "Legend Title"));
+    setText(i18nc("(qtundo-format)", "Set Legend Title"));
 }
 =

 void LegendCommand::setLegendFont(const QFont &font)
@@ -91,21 +91,21 @@ void LegendCommand::setLegendFont(const QFont &font)
     m_newFont =3D font;
     m_newFontSize =3D font.pointSize();
 =

-    setText(i18nc("(qtundo-format)", "Legend Font"));
+    setText(i18nc("(qtundo-format)", "Set Legend Font"));
 }
 =

 void LegendCommand::setLegendFontSize(int size)
 {
     m_newFontSize =3D size;
 =

-    setText(i18nc("(qtundo-format)", "Legend Font size"));
+    setText(i18nc("(qtundo-format)", "Set Legend Font size"));
 }
 =

 void LegendCommand::setLegendExpansion(LegendExpansion expansion)
 {
     m_newExpansion =3D expansion;
 =

-    setText(i18nc("(qtundo-format)", "Legend Orientation"));
+    setText(i18nc("(qtundo-format)", "Set Legend Orientation"));
 }
 =

 void LegendCommand::setLegendShowFrame(bool show)
diff --git a/plugins/musicshape/MusicShape.cpp b/plugins/musicshape/MusicSh=
ape.cpp
index 6ddf99f..bb1a989 100644
--- a/plugins/musicshape/MusicShape.cpp
+++ b/plugins/musicshape/MusicShape.cpp
@@ -27,6 +27,7 @@
 #include <QSvgGenerator>
 =

 #include <kdebug.h>
+#include <klocalizedstring.h>
 =

 #include <KoViewConverter.h>
 #include <KoShapeSavingContext.h>
@@ -80,7 +81,7 @@ MusicShape::MusicShape()
         m_sheet =3D new Sheet();
         Bar* bar =3D m_sheet->addBar();
 =

-        Part* part =3D m_sheet->addPart("Part 1");
+        Part* part =3D m_sheet->addPart(i18n("Part 1"));
         Staff* staff =3D part->addStaff();
         part->addVoice();
         bar->addStaffElement(new Clef(staff, 0, Clef::Trebble, 2, 0));
diff --git a/plugins/musicshape/SimpleEntryTool.cpp b/plugins/musicshape/Si=
mpleEntryTool.cpp
index 0d888e0..4e68fdb 100644
--- a/plugins/musicshape/SimpleEntryTool.cpp
+++ b/plugins/musicshape/SimpleEntryTool.cpp
@@ -747,7 +747,7 @@ void SimpleEntryTool::setSelection(int firstBar, int la=
stBar, Staff* startStaff,
 =

 void SimpleEntryTool::importSheet()
 {
-    QString file =3D KFileDialog::getOpenFileName(KUrl(), "*xml|MusicXML f=
iles (*.xml)", 0, "Import");
+    QString file =3D KFileDialog::getOpenFileName(KUrl(), i18n("*xml|Music=
XML files (*.xml)"), 0, i18nc("@title:window", "Import"));
     if (file.isEmpty() || file.isNull()) return;
     QFile f(file);
     f.open(QIODevice::ReadOnly);
@@ -764,7 +764,7 @@ void SimpleEntryTool::importSheet()
 =

 void SimpleEntryTool::exportSheet()
 {
-    QString file =3D KFileDialog::getSaveFileName(KUrl(), "*xml|MusicXML f=
iles (*.xml)", 0, "Export");
+    QString file =3D KFileDialog::getSaveFileName(KUrl(), i18n("*xml|Music=
XML files (*.xml)"), 0, i18nc("@title:window", "Export"));
     if (file.isEmpty() || file.isNull()) return;
 =

     QBuffer b;
diff --git a/plugins/musicshape/commands/AddPartCommand.cpp b/plugins/music=
shape/commands/AddPartCommand.cpp
index 9ee7dcb..dde9e23 100644
--- a/plugins/musicshape/commands/AddPartCommand.cpp
+++ b/plugins/musicshape/commands/AddPartCommand.cpp
@@ -36,7 +36,7 @@ AddPartCommand::AddPartCommand(MusicShape* shape)
     m_shape(shape)
 {
     setText(i18nc("(qtundo-format)", "Add part"));
-    m_part =3D new Part(m_sheet, QString("Part %1").arg(m_sheet->partCount=
() + 1));
+    m_part =3D new Part(m_sheet, i18n("Part %1").arg(m_sheet->partCount() =
+ 1));
     Staff* s =3D m_part->addStaff();
     m_part->sheet()->bar(0)->addStaffElement(new Clef(s, 0, Clef::GClef, 2=
));
     // figure out time signature
diff --git a/plugins/pictureshape/Messages.sh b/plugins/pictureshape/Messag=
es.sh
index e82261f..4c74647 100755
--- a/plugins/pictureshape/Messages.sh
+++ b/plugins/pictureshape/Messages.sh
@@ -1,2 +1,3 @@
 #! /bin/sh
-$XGETTEXT *.cpp -o $podir/PictureShape.pot
+$EXTRACTRC `find . -name \*.ui` >> rc.cpp || exit 11
+$XGETTEXT `find . -name \*.cpp` -o $podir/PictureShape.pot
diff --git a/plugins/videoshape/Messages.sh b/plugins/videoshape/Messages.sh
index afce784..7a67cd8 100755
--- a/plugins/videoshape/Messages.sh
+++ b/plugins/videoshape/Messages.sh
@@ -1,2 +1,3 @@
 #! /bin/sh
-$XGETTEXT *.cpp -o $podir/VideoShape.pot
+$EXTRACTRC `find . -name \*.ui` >> rc.cpp || exit 11
+$XGETTEXT `find . -name \*.cpp` -o $podir/VideoShape.pot