On Fri, 25, Jul, 2003 at 03:14:28PM +0100, Richard Bown spoke thus..
> You should read this:
>
> rosegarden/docs/howtos/translation.txt
Thanks.
Having read that (and the other various docs), I notice that we're
supposed to use the en_US variant as the one in the code itself. I've
therefore changed all the references in strings from Colour to Color and
will update the en_GB translation file later with the correct spelling.
NOTE: This patch touches one part of code which I didn't write - I
noticed it because I found the occurances using grep and took the
liberty of updating that too (this code is
Patch is attached and requires the -p1 option to patch
Mark
--
Mark Hymers <markh at linuxfromscratch dot org>
"I got off at Durham... and fell in love with it instantly. Why, it's
wonderful - a perfect little city. If you have never been to Durham, go
there at once. Take my car. It's wonderful."
Notes from a Small Island, Bill Bryson
diff --exclude=CVS --exclude-from=rosegarden-i18n/.cvsignore -Naur
rosegarden-silvan/gui/colourwidgets.cpp rosegarden-i18n/gui/colourwidgets.cpp
--- rosegarden-silvan/gui/colourwidgets.cpp 2003-07-25 14:39:20.000000000 +0100
+++ rosegarden-i18n/gui/colourwidgets.cpp 2003-07-25 16:54:39.000000000 +0100
@@ -44,7 +44,7 @@
setSorting(FALSE);
setSelectionMode(QTable::SingleRow);
horizontalHeader()->setLabel(0, i18n("Name"));
- horizontalHeader()->setLabel(1, i18n("Colour"));
+ horizontalHeader()->setLabel(1, i18n("Color"));
populate_table(input, list);
connect(this, SIGNAL(doubleClicked(int, int, int, const QPoint&)),
SLOT(slotEditEntry(int, int)));
@@ -61,7 +61,7 @@
{
if (row == 0) return;
bool ok = false;
- QString newName = QInputDialog::getText(i18n("Modify Colour Name"),
i18n("Enter new name"),
+ QString newName = QInputDialog::getText(i18n("Modify Color Name"),
i18n("Enter new name"),
QLineEdit::Normal, item(row,
col)->text(), &ok);
if ((ok == true) && (!newName.isEmpty()))
@@ -104,7 +104,7 @@
for (Rosegarden::RCMap::const_iterator it=input.begin(); it!=input.end(); ++it)
{
if (it->second.second == std::string(""))
- name = i18n("Default Colour");
+ name = i18n("Default Color");
else
name = strtoqstr(it->second.second);
diff --exclude=CVS --exclude-from=rosegarden-i18n/.cvsignore -Naur
rosegarden-silvan/gui/controleditor.cpp rosegarden-i18n/gui/controleditor.cpp
--- rosegarden-silvan/gui/controleditor.cpp 2003-07-04 10:01:56.000000000 +0100
+++ rosegarden-i18n/gui/controleditor.cpp 2003-07-25 17:00:53.000000000 +0100
@@ -56,7 +56,7 @@
m_listView->addColumn(i18n("Max "));
m_listView->addColumn(i18n("Min "));
m_listView->addColumn(i18n("Default "));
- m_listView->addColumn(i18n("Colour "));
+ m_listView->addColumn(i18n("Color "));
// Align centrally
for (int i = 0; i < 8; ++i)
@@ -430,7 +430,7 @@
m_defaultBox = new QSpinBox(frame);
layout->addWidget(m_defaultBox, 6, 1);
- layout->addWidget(new QLabel(i18n("Colour:"), frame), 7, 0);
+ layout->addWidget(new QLabel(i18n("Color:"), frame), 7, 0);
m_colourCombo = new RosegardenComboBox(frame);
layout->addWidget(m_colourCombo, 7, 1);
diff --exclude=CVS --exclude-from=rosegarden-i18n/.cvsignore -Naur
rosegarden-silvan/gui/rosegardenconfigurationpage.h
rosegarden-i18n/gui/rosegardenconfigurationpage.h
--- rosegarden-silvan/gui/rosegardenconfigurationpage.h 2003-07-24 14:44:10.000000000
+0100
+++ rosegarden-i18n/gui/rosegardenconfigurationpage.h 2003-07-25 16:55:25.000000000
+0100
@@ -414,8 +414,8 @@
void populate_table();
- static QString iconLabel() { return i18n("Colour"); }
- static QString title() { return i18n("Colour Settings"); }
+ static QString iconLabel() { return i18n("Color"); }
+ static QString title() { return i18n("Color Settings"); }
signals:
void docColoursChanged();
diff --exclude=CVS --exclude-from=rosegarden-i18n/.cvsignore -Naur
rosegarden-silvan/gui/rosegardenconfiguredialog.cpp
rosegarden-i18n/gui/rosegardenconfiguredialog.cpp
--- rosegarden-silvan/gui/rosegardenconfiguredialog.cpp 2003-07-25 14:46:37.000000000
+0100
+++ rosegarden-i18n/gui/rosegardenconfiguredialog.cpp 2003-07-25 16:57:13.000000000
+0100
@@ -1716,11 +1716,11 @@
layout->addMultiCellWidget(m_colourtable, 0, 0, 0, 1);
- QPushButton* addColourButton = new QPushButton(i18n("Add New Colour"),
+ QPushButton* addColourButton = new QPushButton(i18n("Add New Color"),
frame);
layout->addWidget(addColourButton, 1, 0, Qt::AlignHCenter);
- QPushButton* deleteColourButton = new QPushButton(i18n("Delete Colour"),
+ QPushButton* deleteColourButton = new QPushButton(i18n("Delete Color"),
frame);
layout->addWidget(deleteColourButton, 1, 1, Qt::AlignHCenter);
@@ -1739,7 +1739,7 @@
connect(m_colourtable, SIGNAL(entryColourChanged(unsigned int, QColor)),
this, SLOT(slotColourChanged(unsigned int, QColor)));
- addTab(frame, i18n("Colour Map"));
+ addTab(frame, i18n("Color Map"));
}
@@ -1772,7 +1772,7 @@
bool ok = false;
- QString newName = QInputDialog::getText(i18n("New Colour Name"), i18n("Enter new
name"),
+ QString newName = QInputDialog::getText(i18n("New Color Name"), i18n("Enter new
name"),
QLineEdit::Normal, i18n("New"), &ok);
if ((ok == true) && (!newName.isEmpty()))
{
diff --exclude=CVS --exclude-from=rosegarden-i18n/.cvsignore -Naur
rosegarden-silvan/gui/segmentcommands.cpp rosegarden-i18n/gui/segmentcommands.cpp
--- rosegarden-silvan/gui/segmentcommands.cpp 2003-07-24 14:44:27.000000000 +0100
+++ rosegarden-i18n/gui/segmentcommands.cpp 2003-07-25 17:00:04.000000000 +0100
@@ -2075,7 +2075,7 @@
SegmentColourCommand::SegmentColourCommand(
const Rosegarden::SegmentSelection &segments,
const unsigned int index):
- KNamedCommand(i18n("Change Segment Colour")),
+ KNamedCommand(i18n("Change Segment Color")),
m_newColourIndex(index)
{
for (Rosegarden::SegmentSelection::iterator i = segments.begin(); i !=
segments.end(); ++i)
@@ -2107,7 +2107,7 @@
SegmentColourMapCommand::SegmentColourMapCommand(
RosegardenGUIDoc *doc,
const Rosegarden::ColourMap &map):
- KNamedCommand(i18n("Change Segment Colour Map")),
+ KNamedCommand(i18n("Change Segment Color Map")),
m_doc(doc),
m_oldMap(m_doc->getComposition().getSegmentColourMap()),
m_newMap(map)
diff --exclude=CVS --exclude-from=rosegarden-i18n/.cvsignore -Naur
rosegarden-silvan/gui/segmentcommands.h rosegarden-i18n/gui/segmentcommands.h
--- rosegarden-silvan/gui/segmentcommands.h 2003-07-24 14:44:27.000000000 +0100
+++ rosegarden-i18n/gui/segmentcommands.h 2003-07-25 16:58:48.000000000 +0100
@@ -686,7 +686,7 @@
virtual ~SegmentColourCommand();
static QString getGlobalName()
- { return i18n("Change Segment Colour..."); }
+ { return i18n("Change Segment Color..."); }
virtual void execute();
virtual void unexecute();
@@ -705,7 +705,7 @@
virtual ~SegmentColourMapCommand();
static QString getGlobalName()
- { return i18n("Change Segment Colour Map..."); }
+ { return i18n("Change Segment Color Map..."); }
virtual void execute();
virtual void unexecute();
diff --exclude=CVS --exclude-from=rosegarden-i18n/.cvsignore -Naur
rosegarden-silvan/gui/segmentparameterbox.cpp
rosegarden-i18n/gui/segmentparameterbox.cpp
--- rosegarden-silvan/gui/segmentparameterbox.cpp 2003-07-24 14:44:28.000000000
+0100
+++ rosegarden-i18n/gui/segmentparameterbox.cpp 2003-07-25 17:00:31.000000000 +0100
@@ -80,7 +80,7 @@
QLabel *quantizeLabel = new QLabel(i18n("Quantize"), this);
QLabel *transposeLabel = new QLabel(i18n("Transpose"), this);
QLabel *delayLabel = new QLabel(i18n("Delay"), this);
- QLabel *colourLabel = new QLabel(i18n("Colour"), this);
+ QLabel *colourLabel = new QLabel(i18n("Color"), this);
// HBox for label
//
@@ -281,7 +281,7 @@
QPixmap colour(15,15);
colour.fill(RosegardenGUIColours::convertColour(it->second.first));
if (it->second.second == std::string(""))
- m_colourValue->insertItem(colour, i18n("Default Colour"), i);
+ m_colourValue->insertItem(colour, i18n("Default Color"), i);
else
m_colourValue->insertItem(colour, strtoqstr(it->second.second), i);
m_colourList[it->first] = i;
