Miroirs/eliot
1
0
Fork 0
mirror of git://git.savannah.nongnu.org/eliot.git synced 2025-01-13 20:03:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Improved some strings

Browse source 
- Update of the French translation
 - Fixed make distcheck (compdic.cpp contains non-ascii chars)
This commit is contained in:
Olivier Teulière 2009-06-28 12:11:10 +00:00
parent e42bc55965
commit 8485e317b5
7 changed files with 946 additions and 966 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dic/compdic.cpp
View file

@ -444,7 +444,7 @@ void printUsage(const string &iBinaryName)
<< _("Example for catalan:") << endl
<< "A 1 12 1 0" << endl
<< "[...]" << endl
// Translators: the first "L.L" must be translated "L·L",
// TRANSLATORS: the first "L.L" must be translated "L·L",
// and the last one translated "ĿL"
<< _("W 10 1 0 1 L.L L.L L-L L.L") << endl
<< "X 10 1 0 1" << endl

22
dic/header.cpp
View file

@ -708,26 +708,26 @@ void Header::print() const
cout << fmt("Nodes: %1% used + %2% saved") % m_nodesUsed % m_nodesSaved << endl;
cout << fmt("Edges: %1% used + %2% saved") % m_edgesUsed % m_edgesSaved << endl;
#undef fmt
cout << "===============================================================" << endl;
cout << "====================================================================" << endl;
cout << format("%1% | %2% | %3% | %4% | %5% | %6% | %7%")
% _("letter") % _("points") % _("frequency") % _("vowel")
% _("consonant") % _("disp.") % _("input") << endl;
% _("Letter") % _("Points") % _("Frequency") % _("Vowel")
% _("Consonant") % _("Display") % _("Alt. input") << endl;
cout << "-------+--------+-----------+-------+-----------+-------+------" << endl;
#define sz(x) strlen(_(x))
for (unsigned int i = 0; i < m_letters.size(); ++i)
{
format fmter("%1% | %2% | %3% | %4% | %5% | %6% | %7%");
fmter % centerAndConvert(wstring(1, m_letters[i]), sz("letter"));
fmter % centerAndConvert(str(wformat(L"%1%") % m_points[i]), sz("points"));
fmter % centerAndConvert(str(wformat(L"%1%") % m_frequency[i]), sz("frequency"));
fmter % centerAndConvert(str(wformat(L"%1%") % m_vowels[i]), sz("vowel"));
fmter % centerAndConvert(str(wformat(L"%1%") % m_consonants[i]), sz("consonant"));
fmter % centerAndConvert(wstring(1, m_letters[i]), sz("Letter"));
fmter % centerAndConvert(str(wformat(L"%1%") % m_points[i]), sz("Points"));
fmter % centerAndConvert(str(wformat(L"%1%") % m_frequency[i]), sz("Frequency"));
fmter % centerAndConvert(str(wformat(L"%1%") % m_vowels[i]), sz("Vowel"));
fmter % centerAndConvert(str(wformat(L"%1%") % m_consonants[i]), sz("Consonant"));
map<wchar_t, vector<wstring> >::const_iterator it =
m_displayAndInputData.find(m_letters[i]);
if (it != m_displayAndInputData.end())
{
const vector<wstring> &inputs = it->second;
fmter % centerAndConvert(str(wformat(L"%1%") % inputs[0]), sz("disp."));
fmter % centerAndConvert(str(wformat(L"%1%") % inputs[0]), sz("Display"));
bool first = true;
string s;
for (uint8_t j = 1; j < inputs.size(); ++j)
@ -742,11 +742,11 @@ void Header::print() const
}
else
{
fmter % string(sz("disp."), ' ') % string(sz("input"), ' ');
fmter % string(sz("Display"), ' ') % string(sz("Alt. input"), ' ');
}
cout << fmter.str() << endl;
}
#undef sz
cout << "===============================================================" << endl;
cout << "====================================================================" << endl;
}

2
po/Makevars
View file

@ -8,7 +8,7 @@ subdir = po
top_builddir = ..
# These options get passed to xgettext.
XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=_q --language=C++
XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=_q --language=C++ --from-code=utf-8
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding

679
po/ca.po
View file

File diff suppressed because it is too large Load diff

517
po/eliot.pot
View file

File diff suppressed because it is too large Load diff

686
po/fr.po
View file

File diff suppressed because it is too large Load diff

4
qt/dic_tools_widget.cpp
View file

@ -105,7 +105,7 @@ DicToolsWidget::DicToolsWidget(QWidget *parent)
m_dicInfoModel->setHeaderData(2, Qt::Horizontal, _q("Frequency"), Qt::DisplayRole);
m_dicInfoModel->setHeaderData(3, Qt::Horizontal, _q("Vowel?"), Qt::DisplayRole);
m_dicInfoModel->setHeaderData(4, Qt::Horizontal, _q("Consonant?"), Qt::DisplayRole);
m_dicInfoModel->setHeaderData(5, Qt::Horizontal, _q("Alternative input"), Qt::DisplayRole);
m_dicInfoModel->setHeaderData(5, Qt::Horizontal, _q("Alternative inputs"), Qt::DisplayRole);
}
@ -153,7 +153,7 @@ void DicToolsWidget::refreshCheck()
{
if (!rack->hasAcceptableInput())
{
labelCheck->setText(_q("Invalid or incomplete characters"));
labelCheck->setText(_q("Invalid or incomplete letters"));
labelCheck->setPalette(darkYellowPalette);
return;
}