Git commit 2918807bfad95db6909aeaa35f81c244f5578379 by Andreas Cord-Landweh= r. Committed on 30/09/2013 at 18:30. Pushed by cordlandwehr into branch 'master'. Fix i18n strings. Reported ambigious strings, missing KUIT markers. M +3 -3 src/models/coursemodel.cpp M +3 -3 src/models/languageresourcemodel.cpp M +3 -3 src/models/phonemegroupmodel.cpp M +3 -3 src/models/phonememodel.cpp M +3 -3 src/models/phonemeunitmodel.cpp M +3 -3 src/models/phrasemodel.cpp M +1 -1 src/models/skeletonmodel.cpp M +3 -3 src/models/unitmodel.cpp http://commits.kde.org/artikulate/2918807bfad95db6909aeaa35f81c244f5578379 diff --git a/src/models/coursemodel.cpp b/src/models/coursemodel.cpp index cd51d80..82de884 100644 --- a/src/models/coursemodel.cpp +++ b/src/models/coursemodel.cpp @@ -133,9 +133,9 @@ QVariant CourseModel::data(const QModelIndex& index, in= t role) const { case Qt::DisplayRole: return !course->title().isEmpty()? - QVariant(course->title()): QVariant(i18nc("@item:inlistbox= :", "")); + QVariant(course->title()): QVariant(i18nc("@item:inlistbox= :", "unknown")); case Qt::ToolTipRole: - return QVariant(i18n("

%1

", course->title())); + return QVariant(course->title()); case TitleRole: return course->title(); case DescriptionRole: @@ -212,7 +212,7 @@ QVariant CourseModel::headerData(int section, Qt::Orien= tation orientation, int r if (orientation =3D=3D Qt::Vertical) { return QVariant(section + 1); } - return QVariant(i18nc("@title:column", "Title")); + return QVariant(i18nc("@title:column", "Course")); } = void CourseModel::updateResources() diff --git a/src/models/languageresourcemodel.cpp b/src/models/languagereso= urcemodel.cpp index 0f549c7..b485440 100644 --- a/src/models/languageresourcemodel.cpp +++ b/src/models/languageresourcemodel.cpp @@ -101,9 +101,9 @@ QVariant LanguageResourceModel::data(const QModelIndex&= index, int role) const { case Qt::DisplayRole: return !language->title().isEmpty() ? - QVariant(language->title()): QVariant(i18nc("@item:inlistb= ox:", "")); + QVariant(language->title()): QVariant(i18nc("@item:inlistb= ox:", "unknown")); case Qt::ToolTipRole: - return QVariant(i18n("

%1

", language->title())); + return QVariant(language->title()); case TitleRole: return language->title(); case I18nTitleRole: @@ -185,7 +185,7 @@ QVariant LanguageResourceModel::headerData(int section,= Qt::Orientation orientat if (orientation =3D=3D Qt::Vertical) { return QVariant(section + 1); } - return QVariant(i18nc("@title:column", "Title")); + return QVariant(i18nc("@title:column", "Language")); } = void LanguageResourceModel::setView(LanguageModel::LanguageResourceView vi= ew) diff --git a/src/models/phonemegroupmodel.cpp b/src/models/phonemegroupmode= l.cpp index 2f5cd24..730faba 100644 --- a/src/models/phonemegroupmodel.cpp +++ b/src/models/phonemegroupmodel.cpp @@ -92,9 +92,9 @@ QVariant PhonemeGroupModel::data(const QModelIndex& index= , int role) const { case Qt::DisplayRole: return !phonemeGroup->title().isEmpty()? - QVariant(phonemeGroup->title()): QVariant(i18nc("@item:inl= istbox:", "")); + QVariant(phonemeGroup->title()): QVariant(i18nc("@item:inl= istbox:", "unknown")); case Qt::ToolTipRole: - return QVariant(i18n("

%1

", phonemeGroup->title())); + return QVariant(phonemeGroup->title()); case TitleRole: return phonemeGroup->title(); case IdRole: @@ -156,7 +156,7 @@ QVariant PhonemeGroupModel::headerData(int section, Qt:= :Orientation orientation, if (orientation =3D=3D Qt::Vertical) { return QVariant(section + 1); } - return QVariant(i18nc("@title:column", "Title")); + return QVariant(i18nc("@title:column", "Phoneme Group")); } = void PhonemeGroupModel::updateMappings() diff --git a/src/models/phonememodel.cpp b/src/models/phonememodel.cpp index 3d7b578..8dd2a25 100644 --- a/src/models/phonememodel.cpp +++ b/src/models/phonememodel.cpp @@ -73,9 +73,9 @@ QVariant PhonemeModel::data(const QModelIndex& index, int= role) const { case Qt::DisplayRole: return !phoneme->title().isEmpty()? - QVariant(phoneme->title()): QVariant(i18n("")); + QVariant(phoneme->title()): QVariant(i18nc("@item:inlistbo= x:", "unknown")); case Qt::ToolTipRole: - return QVariant(i18n("

%1

", phoneme->title())); + return QVariant(phoneme->title()); case TitleRole: return phoneme->title(); case IdRole: @@ -135,7 +135,7 @@ QVariant PhonemeModel::headerData(int section, Qt::Orie= ntation orientation, int if (orientation =3D=3D Qt::Vertical) { return QVariant(section + 1); } - return QVariant(i18n("Title")); + return QVariant(i18nc("@title:column", "Phoneme")); } = void PhonemeModel::updateMappings() diff --git a/src/models/phonemeunitmodel.cpp b/src/models/phonemeunitmodel.= cpp index d575f1f..2d1fe7b 100644 --- a/src/models/phonemeunitmodel.cpp +++ b/src/models/phonemeunitmodel.cpp @@ -115,9 +115,9 @@ QVariant PhonemeUnitModel::data(const QModelIndex& inde= x, int role) const { case Qt::DisplayRole: return !unit->title().isEmpty()? - QVariant(unit->title()): QVariant(i18nc("@item:inlistbox:"= , "")); + QVariant(unit->title()): QVariant(i18nc("@item:inlistbox:"= , "unknown")); case Qt::ToolTipRole: - return QVariant(i18n("

%1

", unit->title())); + return QVariant(unit->title()); case TitleRole: return unit->title(); case NumberPhrasesRole: @@ -185,7 +185,7 @@ QVariant PhonemeUnitModel::headerData(int section, Qt::= Orientation orientation, if (orientation =3D=3D Qt::Vertical) { return QVariant(section + 1); } - return QVariant(i18nc("@title:column", "Title")); + return QVariant(i18nc("@title:column", "Phoneme Unit")); } = int PhonemeUnitModel::count() const diff --git a/src/models/phrasemodel.cpp b/src/models/phrasemodel.cpp index 4344119..2111a85 100644 --- a/src/models/phrasemodel.cpp +++ b/src/models/phrasemodel.cpp @@ -109,9 +109,9 @@ QVariant PhraseModel::data(const QModelIndex &index, in= t role) const { case Qt::DisplayRole: return !phrase->text().isEmpty()? - QVariant(phrase->text()): QVariant(i18nc("@item:inlistbox:= ", "")); + QVariant(phrase->text()): QVariant(i18nc("@item:inlistbox:= ", "unknown")); case Qt::ToolTipRole: - return QVariant(i18n("

%1

", phrase->text())); + return QVariant(phrase->text()); case TextRole: return phrase->text(); case SoundFileRole: @@ -181,7 +181,7 @@ QVariant PhraseModel::headerData(int section, Qt::Orien= tation orientation, int r if (orientation =3D=3D Qt::Vertical) { return QVariant(section + 1); } - return QVariant(i18nc("@title:column", "Title")); + return QVariant(i18nc("@title:column", "Phrase")); } = int PhraseModel::count() const diff --git a/src/models/skeletonmodel.cpp b/src/models/skeletonmodel.cpp index 69502c2..ad98987 100644 --- a/src/models/skeletonmodel.cpp +++ b/src/models/skeletonmodel.cpp @@ -160,7 +160,7 @@ QVariant SkeletonModel::headerData(int section, Qt::Ori= entation orientation, int if (orientation =3D=3D Qt::Vertical) { return QVariant(section + 1); } - return QVariant(i18nc("@title:column", "Title")); + return QVariant(i18nc("@title:column", "Skeleton")); } = int SkeletonModel::count() const diff --git a/src/models/unitmodel.cpp b/src/models/unitmodel.cpp index aa7db1e..59b3407 100644 --- a/src/models/unitmodel.cpp +++ b/src/models/unitmodel.cpp @@ -94,9 +94,9 @@ QVariant UnitModel::data(const QModelIndex& index, int ro= le) const { case Qt::DisplayRole: return !unit->title().isEmpty()? - QVariant(unit->title()): QVariant(i18nc("@item:inlistbox:"= , "")); + QVariant(unit->title()): QVariant(i18nc("@item:inlistbox:"= , "unknown")); case Qt::ToolTipRole: - return QVariant(i18n("

%1

", unit->title())); + return QVariant(unit->title()); case TitleRole: return unit->title(); case NumberPhrasesRole: @@ -160,7 +160,7 @@ QVariant UnitModel::headerData(int section, Qt::Orienta= tion orientation, int rol if (orientation =3D=3D Qt::Vertical) { return QVariant(section + 1); } - return QVariant(i18nc("@title:column", "Title")); + return QVariant(i18nc("@title:column", "Unit")); } = void UnitModel::updateMappings()