Git commit b35f9207200a0bb849b913d7b8335533672d76d7 by Glen Ditchfield, on behalf of Glen Ditchfield. Committed on 26/02/2021 at 15:26. Pushed by gditchfield into branch 'master'.
Use "tag" terminology consistently in the UI The user interface uses "tag" and "category" as terms for the same thing. Settle on "tag", for consistency among Akonadi applications. GUI: M +3 -3 src/kcalprefs.kcfg M +1 -1 src/printing/calprintdayconfig_base.ui M +3 -3 src/printing/calprintdefaultplugins.cpp M +1 -1 src/printing/calprintincidenceconfig_base.ui M +1 -1 src/printing/calprintmonthconfig_base.ui M +1 -1 src/printing/calprintweekconfig_base.ui https://invent.kde.org/pim/calendarsupport/commit/b35f9207200a0bb849b913d7b8335533672d76d7 diff --git a/src/kcalprefs.kcfg b/src/kcalprefs.kcfg index b7de260..fbf7098 100644 --- a/src/kcalprefs.kcfg +++ b/src/kcalprefs.kcfg @@ -217,9 +217,9 @@ <group name="Colors"> <entry type="Color" key="Unset Category Color"> - <label>"No category" color (for "Only category" drawing schemes)</label> - <whatsthis>Select a color to use for the "no category" or "unset category" situation, when an item does not belong to any category. This color is used when drawing items in the agenda or month views using the "Only category" scheme.</whatsthis> - <tooltip>Use this color when drawing items without a category</tooltip> + <label>"No tag" color (for "Only tag" drawing schemes)</label> + <whatsthis>Select a color to use for the "no tag" or "unset tag" situation, when an item does not have any tags. This color is used when drawing items in the agenda or month views using the "Only tag" scheme.</whatsthis> + <tooltip>Use this color when drawing items without any tags</tooltip> <default>151, 235, 121</default> </entry> </group> diff --git a/src/printing/calprintdayconfig_base.ui b/src/printing/calprintdayconfig_base.ui index 78a71b2..580d386 100644 --- a/src/printing/calprintdayconfig_base.ui +++ b/src/printing/calprintdayconfig_base.ui @@ -378,7 +378,7 @@ p, li { white-space: pre-wrap; } <string>Print in color</string> </property> <property name="whatsThis"> - <string>If you want to use colors to distinguish certain categories on the print, check this option.</string> + <string>If you want to use colors to distinguish certain tags in the printed output, check this option.</string> </property> <property name="text"> <string>&Use colors</string> diff --git a/src/printing/calprintdefaultplugins.cpp b/src/printing/calprintdefaultplugins.cpp index 28b7122..a145e0c 100644 --- a/src/printing/calprintdefaultplugins.cpp +++ b/src/printing/calprintdefaultplugins.cpp @@ -356,7 +356,7 @@ void CalPrintIncidence::print(QPainter &p, int width, int height) } alarmStrings << offsetstr.toString(); } - txt = alarmStrings.join(i18nc("Spacer for the joined list of categories", ", ")); + txt = alarmStrings.join(i18nc("Spacer for the joined list of categories/tags", ", ")); } h = qMax(printCaptionAndText(p, alarmBox, cap, txt, captionFont, textFont), h); } @@ -627,8 +627,8 @@ void CalPrintIncidence::print(QPainter &p, int width, int height) drawBoxWithCaption(p, categoriesBox, - i18n("Categories: "), - (*it)->categories().join(i18nc("Spacer for the joined list of categories", ", ")), + i18n("Tags: "), + (*it)->categories().join(i18nc("Spacer for the joined list of categories/tags", ", ")), /*sameLine=*/true, /*expand=*/false, captionFont, diff --git a/src/printing/calprintincidenceconfig_base.ui b/src/printing/calprintincidenceconfig_base.ui index cc39b02..7233a07 100644 --- a/src/printing/calprintincidenceconfig_base.ui +++ b/src/printing/calprintincidenceconfig_base.ui @@ -124,7 +124,7 @@ p, li { white-space: pre-wrap; } <string>Print in color</string> </property> <property name="whatsThis"> - <string>If you want to use colors to distinguish certain categories on the print, check this option.</string> + <string>If you want to use colors to distinguish certain tags in the printed output, check this option.</string> </property> <property name="text"> <string>&Use colors</string> diff --git a/src/printing/calprintmonthconfig_base.ui b/src/printing/calprintmonthconfig_base.ui index 99b5022..0173735 100644 --- a/src/printing/calprintmonthconfig_base.ui +++ b/src/printing/calprintmonthconfig_base.ui @@ -303,7 +303,7 @@ p, li { white-space: pre-wrap; } <string>Print in color</string> </property> <property name="whatsThis"> - <string>If you want to make use of colors you should check this option. The category colors will be used.</string> + <string>If you want to use colors to distinguish certain tags in the printed output, check this option.</string> </property> <property name="text"> <string>&Use colors</string> diff --git a/src/printing/calprintweekconfig_base.ui b/src/printing/calprintweekconfig_base.ui index 47ead5e..499dd97 100644 --- a/src/printing/calprintweekconfig_base.ui +++ b/src/printing/calprintweekconfig_base.ui @@ -385,7 +385,7 @@ p, li { white-space: pre-wrap; } <string>Print in color</string> </property> <property name="whatsThis"> - <string>The timetable view supports colors. If you want to make use of colors you should check this option. The category colors will be used.</string> + <string>If you want to use colors to distinguish certain tags in the printed output, check this option.</string> </property> <property name="text"> <string>&Use colors</string>
