Commit f3cfc4e9 authored by Glen Ditchfield's avatar Glen Ditchfield 🐛
Browse files

Use "item" terminology consistently in the UI

Most of the user interface refers to events and to-dos as "items", not
"instances".  For example, look at the dialog that "Archive Old Incidences..."
opens.

GUI:
parent d4008e5e
Pipeline #51594 passed with stage
in 12 minutes and 44 seconds
......@@ -555,7 +555,7 @@ items, follow the procedure below:</para>
<procedure>
<step><para>Choose the <menuchoice><guimenu>File</guimenu><guimenuitem>Archive
Old Entries...</guimenuitem></menuchoice> menu item.</para></step>
Old Items...</guimenuitem></menuchoice> menu item.</para></step>
<step><para>Fill in the date in <guilabel>Archive now items older than</guilabel> field or
use the Calendar Widget to choose the date. Alternatively, you can automatically
archive all items older than a certain period of time.</para></step>
......@@ -2892,7 +2892,7 @@ special events, &etc;</para>
<varlistentry id="menu-file-archive-old">
<term><menuchoice>
<guimenu>File</guimenu>
<guimenuitem>Archive Old Entries...</guimenuitem>
<guimenuitem>Archive Old Items...</guimenuitem>
</menuchoice></term>
<listitem><para><action>From time to time you should delete your old
events.</action></para>
......
......@@ -266,12 +266,12 @@ void ActionManager::initActions()
/** Archive Action **/
// TODO: Icon
action = new QAction(i18n("Archive O&ld Incidences..."), this);
action->setStatusTip(i18nc("@info:status", "Archive incidences to file"));
action->setToolTip(i18nc("@info:tooltip", "Archive old incidences to an iCalendar file"));
action = new QAction(i18n("Archive O&ld Items..."), this);
action->setStatusTip(i18nc("@info:status", "Archive items to a file"));
action->setToolTip(i18nc("@info:tooltip", "Archive old items to an iCalendar file"));
action->setWhatsThis(i18nc("@info:whatsthis",
"This menu entry opens a dialog that allows you to select old events and to-dos "
"that you can archive into an iCalendar file. The archived incidences will "
"that you can archive into an iCalendar file. The archived items will "
"be removed from your existing calendar collection."));
mACollection->addAction(QStringLiteral("file_archive"), action);
connect(action, &QAction::triggered, this, &ActionManager::file_archive);
......@@ -413,8 +413,8 @@ void ActionManager::initActions()
/** Filter Action **/
// TODO: icon
mFilterAction = new KSelectAction(i18n("F&ilter"), this);
mFilterAction->setStatusTip(i18nc("@info:status", "Filter incidences"));
mFilterAction->setToolTip(i18nc("@info:tooltip", "Filter incidences from the calendar"));
mFilterAction->setStatusTip(i18nc("@info:status", "Filter items"));
mFilterAction->setToolTip(i18nc("@info:tooltip", "Filter items from the calendar"));
mFilterAction->setWhatsThis(i18nc("@info:whatsthis",
"Runs user-defined view filters on the calendar collection. Filters must be "
"created first. See \"Manage View Filters\" option in the Settings menu."));
......@@ -740,7 +740,7 @@ void ActionManager::slotMergeFinished(bool success, int total)
auto importer = qobject_cast<Akonadi::ICalImporter *>(sender());
if (success) {
mCalendarView->showMessage(i18np("1 incidence was imported successfully.", "%1 incidences were imported successfully.", total),
mCalendarView->showMessage(i18np("1 item was imported successfully.", "%1 items were imported successfully.", total),
KMessageWidget::Information);
} else {
mCalendarView->showMessage(i18n("There was an error while merging the calendar: %1", importer->errorMessage()), KMessageWidget::Error);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment