diff --git a/src/private/sortproxies.cpp b/src/private/sortproxies.cpp
index 67448b48ab20ef2971ebc93f0c1e28595067cb63..0e5cb1d77d1d814c108f92a92de44f96f6f78f62 100644
--- a/src/private/sortproxies.cpp
+++ b/src/private/sortproxies.cpp
@@ -46,19 +46,19 @@ namespace CategoryModelCommon {
}
static const Matrix1D<CategorizedContactModel::SortedProxy::Categories,QString> contactSortNames = {{
- QObject::tr("Name" ),
- QObject::tr("Organisation" ),
- QObject::tr("Recently used"),
- QObject::tr("Group" ),
- QObject::tr("Department" ),
+ QT_TRANSLATE_NOOP("ContactSortingCategoryModel", "Name" ),
+ QT_TRANSLATE_NOOP("ContactSortingCategoryModel", "Organisation" ),
+ QT_TRANSLATE_NOOP("ContactSortingCategoryModel", "Recently used"),
+ QT_TRANSLATE_NOOP("ContactSortingCategoryModel", "Group" ),
+ QT_TRANSLATE_NOOP("ContactSortingCategoryModel", "Department" ),
}};
static const Matrix1D<CategorizedHistoryModel::SortedProxy::Categories,QString> historySortNames = {{
- QObject::tr("Date" ),
- QObject::tr("Name" ),
- QObject::tr("Popularity" ),
- QObject::tr("Duration" ),
- QObject::tr("Total time" ),
+ QT_TRANSLATE_NOOP("HistorySortingCategoryModel", "Date" ),
+ QT_TRANSLATE_NOOP("HistorySortingCategoryModel", "Name" ),
+ QT_TRANSLATE_NOOP("HistorySortingCategoryModel", "Popularity" ),
+ QT_TRANSLATE_NOOP("HistorySortingCategoryModel", "Duration" ),
+ QT_TRANSLATE_NOOP("HistorySortingCategoryModel", "Total time" ),
}};
}
@@ -126,31 +126,31 @@ void sortContact(QSortFilterProxyModel* p, int roleIdx)
switch(static_cast<CategorizedContactModel::SortedProxy::Categories>(roleIdx)) {
case CategorizedContactModel::SortedProxy::Categories::NAME:
m->setSortAlphabetical(true);
- m->setDefaultCategory(QObject::tr("Empty"));
+ m->setDefaultCategory(QT_TRANSLATE_NOOP("CategorizedContactModel", "Empty"));
p->setSortRole(Qt::DisplayRole);
m->setRole(Qt::DisplayRole);
break;
case CategorizedContactModel::SortedProxy::Categories::ORGANIZATION:
m->setSortAlphabetical(false);
- m->setDefaultCategory(QObject::tr("Unknown"));
+ m->setDefaultCategory(QT_TRANSLATE_NOOP("CategorizedContactModel", "Unknown"));
p->setSortRole((int)Person::Role::Organization);
m->setRole((int)Person::Role::Organization);
break;
case CategorizedContactModel::SortedProxy::Categories::RECENTLYUSED:
m->setSortAlphabetical(false);
- m->setDefaultCategory(QObject::tr("Never"));
+ m->setDefaultCategory(QT_TRANSLATE_NOOP("CategorizedContactModel", "Never"));
p->setSortRole((int)Person::Role::IndexedLastUsed);
m->setRole((int)Person::Role::FormattedLastUsed);
break;
case CategorizedContactModel::SortedProxy::Categories::GROUP:
m->setSortAlphabetical(false);
- m->setDefaultCategory(QObject::tr("Other"));
+ m->setDefaultCategory(QT_TRANSLATE_NOOP("CategorizedContactModel", "Other"));
p->setSortRole((int)Person::Role::Group);
m->setRole((int)Person::Role::Group);
break;
case CategorizedContactModel::SortedProxy::Categories::DEPARTMENT:
m->setSortAlphabetical(false);
- m->setDefaultCategory(QObject::tr("Unknown"));
+ m->setDefaultCategory(QT_TRANSLATE_NOOP("CategorizedContactModel", "Unknown"));
p->setSortRole((int)Person::Role::Department);
m->setRole((int)Person::Role::Department);
break;
diff --git a/translations/lrc_en.ts b/translations/lrc_en.ts
index 0b0aded163ec813f74675a6249b88124fe8d0b5d..02c1d4e7206bdfa6a104a6beb64703c349e2827c 100644
--- a/translations/lrc_en.ts
+++ b/translations/lrc_en.ts
@@ -98,104 +98,104 @@
<context>
<name>Call</name>
<message>
- <location filename="../src/call.cpp" line="661"/>
+ <location filename="../src/call.cpp" line="658"/>
<source>New</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/call.cpp" line="663"/>
+ <location filename="../src/call.cpp" line="660"/>
<source>Ringing (in)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/call.cpp" line="665"/>
+ <location filename="../src/call.cpp" line="662"/>
<source>Ringing (out)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/call.cpp" line="667"/>
+ <location filename="../src/call.cpp" line="664"/>
<source>Talking</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/call.cpp" line="669"/>
+ <location filename="../src/call.cpp" line="666"/>
<source>Dialing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/call.cpp" line="671"/>
+ <location filename="../src/call.cpp" line="668"/>
<source>Hold</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/call.cpp" line="673"/>
+ <location filename="../src/call.cpp" line="670"/>
<source>Failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/call.cpp" line="675"/>
+ <location filename="../src/call.cpp" line="672"/>
<source>Busy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/call.cpp" line="677"/>
+ <location filename="../src/call.cpp" line="674"/>
<source>Transfer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/call.cpp" line="679"/>
+ <location filename="../src/call.cpp" line="676"/>
<source>Transfer hold</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/call.cpp" line="681"/>
+ <location filename="../src/call.cpp" line="678"/>
<source>Over</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/call.cpp" line="683"/>
+ <location filename="../src/call.cpp" line="680"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/call.cpp" line="685"/>
- <location filename="../src/call.cpp" line="767"/>
- <location filename="../src/call.cpp" line="2002"/>
+ <location filename="../src/call.cpp" line="682"/>
+ <location filename="../src/call.cpp" line="764"/>
+ <location filename="../src/call.cpp" line="2000"/>
<source>Conference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/call.cpp" line="687"/>
+ <location filename="../src/call.cpp" line="684"/>
<source>Conference (hold)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/call.cpp" line="689"/>
+ <location filename="../src/call.cpp" line="686"/>
<source>ERROR</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/call.cpp" line="691"/>
+ <location filename="../src/call.cpp" line="688"/>
<source>Searching for</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/call.cpp" line="693"/>
+ <location filename="../src/call.cpp" line="690"/>
<source>Aborted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/call.cpp" line="695"/>
+ <location filename="../src/call.cpp" line="692"/>
<source>Communication established</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/call.cpp" line="777"/>
+ <location filename="../src/call.cpp" line="774"/>
<source>Unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/call.cpp" line="2007"/>
+ <location filename="../src/call.cpp" line="2005"/>
<source>Account: </source>
<translation type="unfinished"></translation>
</message>
@@ -203,7 +203,7 @@
<context>
<name>CallModel</name>
<message>
- <location filename="../src/callmodel.cpp" line="850"/>
+ <location filename="../src/callmodel.cpp" line="848"/>
<source>Calls</source>
<translation type="unfinished"></translation>
</message>
@@ -219,12 +219,12 @@
<context>
<name>CallPrivate</name>
<message>
- <location filename="../src/call.cpp" line="1597"/>
+ <location filename="../src/call.cpp" line="1595"/>
<source>Failure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/call.cpp" line="1610"/>
+ <location filename="../src/call.cpp" line="1608"/>
<source>No account registered!</source>
<translation type="unfinished"></translation>
</message>
@@ -249,6 +249,27 @@
<source>Contacts</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/private/sortproxies.cpp" line="129"/>
+ <source>Empty</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/private/sortproxies.cpp" line="135"/>
+ <location filename="../src/private/sortproxies.cpp" line="153"/>
+ <source>Unknown</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/private/sortproxies.cpp" line="141"/>
+ <source>Never</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/private/sortproxies.cpp" line="147"/>
+ <source>Other</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>CategorizedHistoryModel</name>
@@ -285,6 +306,62 @@
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>ContactSortingCategoryModel</name>
+ <message>
+ <location filename="../src/private/sortproxies.cpp" line="49"/>
+ <source>Name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/private/sortproxies.cpp" line="50"/>
+ <source>Organisation</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/private/sortproxies.cpp" line="51"/>
+ <source>Recently used</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/private/sortproxies.cpp" line="52"/>
+ <source>Group</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/private/sortproxies.cpp" line="53"/>
+ <source>Department</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>HistorySortingCategoryModel</name>
+ <message>
+ <location filename="../src/private/sortproxies.cpp" line="57"/>
+ <source>Date</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/private/sortproxies.cpp" line="58"/>
+ <source>Name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/private/sortproxies.cpp" line="59"/>
+ <source>Popularity</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/private/sortproxies.cpp" line="60"/>
+ <source>Duration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/private/sortproxies.cpp" line="61"/>
+ <source>Total time</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>HistoryTimeCategoryModel</name>
<message>
@@ -627,17 +704,17 @@
<context>
<name>ProfileContentBackend</name>
<message>
- <location filename="../src/profilemodel.cpp" line="220"/>
+ <location filename="../src/profilemodel.cpp" line="222"/>
<source>Profile backend</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/profilemodel.cpp" line="225"/>
+ <location filename="../src/profilemodel.cpp" line="227"/>
<source>Profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/profilemodel.cpp" line="316"/>
+ <location filename="../src/profilemodel.cpp" line="318"/>
<source>Default</source>
<translation type="unfinished"></translation>
</message>
@@ -645,7 +722,7 @@
<context>
<name>ProfileModel</name>
<message>
- <location filename="../src/profilemodel.cpp" line="829"/>
+ <location filename="../src/profilemodel.cpp" line="873"/>
<source>Profiles</source>
<translation type="unfinished"></translation>
</message>
@@ -979,12 +1056,6 @@
<source>History</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/private/sortproxies.cpp" line="135"/>
- <location filename="../src/private/sortproxies.cpp" line="153"/>
- <source>Unknown</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/localmacrocollection.cpp" line="190"/>
<source>Local macros</source>
@@ -1028,66 +1099,9 @@
</message>
<message>
<location filename="../src/numbercategorymodel.cpp" line="191"/>
- <location filename="../src/private/sortproxies.cpp" line="147"/>
<source>Other</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/private/sortproxies.cpp" line="49"/>
- <location filename="../src/private/sortproxies.cpp" line="58"/>
- <source>Name</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/private/sortproxies.cpp" line="50"/>
- <source>Organisation</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/private/sortproxies.cpp" line="51"/>
- <source>Recently used</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/private/sortproxies.cpp" line="52"/>
- <source>Group</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/private/sortproxies.cpp" line="53"/>
- <source>Department</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/private/sortproxies.cpp" line="57"/>
- <source>Date</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/private/sortproxies.cpp" line="59"/>
- <source>Popularity</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/private/sortproxies.cpp" line="60"/>
- <source>Duration</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/private/sortproxies.cpp" line="61"/>
- <source>Total time</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/private/sortproxies.cpp" line="129"/>
- <source>Empty</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/private/sortproxies.cpp" line="141"/>
- <source>Never</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/protocolmodel.cpp" line="52"/>
<source>Ring Account</source>