diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index b7c469fdc..bd849d2be 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -2371,8 +2371,8 @@ timerlist.repeat.wednesday Mi timerlist.repeat.weekdays An Wochentagen timerlist.repeat.weekly wöchentlich timerlist.repeatcount Wiederholungen -timerlist.repeatcount.help1 Anzahl der Timerausführungen -timerlist.repeatcount.help2 0 für unbegrenzte Anzahl +timerlist.repeatcount.hint_1 Anzahl der Timerausführungen +timerlist.repeatcount.hint_2 0 für unbegrenzte Anzahl timerlist.save Timer speichern timerlist.standby Aktion timerlist.standby.off Aufwachen aus Standby diff --git a/data/locale/english.locale b/data/locale/english.locale index ac562fa40..bcb7e1e8e 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -2371,8 +2371,8 @@ timerlist.repeat.wednesday We timerlist.repeat.weekdays on weekdays timerlist.repeat.weekly weekly timerlist.repeatcount repeats -timerlist.repeatcount.help1 amount of timer repeats -timerlist.repeatcount.help2 0 for unlimited repeats +timerlist.repeatcount.hint_1 Amount of timer repeats +timerlist.repeatcount.hint_2 0 for unlimited repeats timerlist.save Save timer timerlist.standby Action timerlist.standby.off Leave standby diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index 55902b379..0de73459c 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -1591,7 +1591,7 @@ int CTimerList::modifyTimer() timer->eventRepeat = (CTimerd::CTimerEventRepeat)(((int)timer->eventRepeat) & 0x1FF); CStringInput timerSettings_weekdays(LOCALE_TIMERLIST_WEEKDAYS, &m_weekdaysStr, 7, LOCALE_TIMERLIST_WEEKDAYS_HINT_1, LOCALE_TIMERLIST_WEEKDAYS_HINT_2, "-X"); CMenuForwarder *m4 = new CMenuForwarder(LOCALE_TIMERLIST_WEEKDAYS, ((int)timer->eventRepeat) >= (int)CTimerd::TIMERREPEAT_WEEKDAYS, m_weekdaysStr, &timerSettings_weekdays ); - CIntInput timerSettings_repeatCount(LOCALE_TIMERLIST_REPEATCOUNT, (int*)&timer->repeatCount,3, LOCALE_TIMERLIST_REPEATCOUNT_HELP1, LOCALE_TIMERLIST_REPEATCOUNT_HELP2); + CIntInput timerSettings_repeatCount(LOCALE_TIMERLIST_REPEATCOUNT, (int*)&timer->repeatCount,3, LOCALE_TIMERLIST_REPEATCOUNT_HINT_1, LOCALE_TIMERLIST_REPEATCOUNT_HINT_2); CMenuForwarder *m5 = new CMenuForwarder(LOCALE_TIMERLIST_REPEATCOUNT, timer->eventRepeat != (int)CTimerd::TIMERREPEAT_ONCE ,timerSettings_repeatCount.getValue() , &timerSettings_repeatCount); @@ -1701,7 +1701,7 @@ int CTimerList::newTimer() CStringInput timerSettings_weekdays(LOCALE_TIMERLIST_WEEKDAYS, &m_weekdaysStr, 7, LOCALE_TIMERLIST_WEEKDAYS_HINT_1, LOCALE_TIMERLIST_WEEKDAYS_HINT_2, "-X"); CMenuForwarder *m4 = new CMenuForwarder(LOCALE_TIMERLIST_WEEKDAYS, false, m_weekdaysStr, &timerSettings_weekdays); - CIntInput timerSettings_repeatCount(LOCALE_TIMERLIST_REPEATCOUNT, (int*)&timerNew.repeatCount,3, LOCALE_TIMERLIST_REPEATCOUNT_HELP1, LOCALE_TIMERLIST_REPEATCOUNT_HELP2); + CIntInput timerSettings_repeatCount(LOCALE_TIMERLIST_REPEATCOUNT, (int*)&timerNew.repeatCount,3, LOCALE_TIMERLIST_REPEATCOUNT_HINT_1, LOCALE_TIMERLIST_REPEATCOUNT_HINT_2); CMenuForwarder *m5 = new CMenuForwarder(LOCALE_TIMERLIST_REPEATCOUNT, false,timerSettings_repeatCount.getValue() , &timerSettings_repeatCount); CTimerListRepeatNotifier notifier((int *)&timerNew.eventRepeat,m4,m5, &m_weekdaysStr); diff --git a/src/system/locals.h b/src/system/locals.h index d668034cd..a1dfd99a8 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -2398,8 +2398,8 @@ typedef enum LOCALE_TIMERLIST_REPEAT_WEEKDAYS, LOCALE_TIMERLIST_REPEAT_WEEKLY, LOCALE_TIMERLIST_REPEATCOUNT, - LOCALE_TIMERLIST_REPEATCOUNT_HELP1, - LOCALE_TIMERLIST_REPEATCOUNT_HELP2, + LOCALE_TIMERLIST_REPEATCOUNT_HINT_1, + LOCALE_TIMERLIST_REPEATCOUNT_HINT_2, LOCALE_TIMERLIST_SAVE, LOCALE_TIMERLIST_STANDBY, LOCALE_TIMERLIST_STANDBY_OFF, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index e4bc718f4..1d61f6deb 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -2398,8 +2398,8 @@ const char * locale_real_names[] = "timerlist.repeat.weekdays", "timerlist.repeat.weekly", "timerlist.repeatcount", - "timerlist.repeatcount.help1", - "timerlist.repeatcount.help2", + "timerlist.repeatcount.hint_1", + "timerlist.repeatcount.hint_2", "timerlist.save", "timerlist.standby", "timerlist.standby.off",