diff --git a/panels/notification/center/notifyitem.cpp b/panels/notification/center/notifyitem.cpp index 7b0c1fc23..f76374e76 100644 --- a/panels/notification/center/notifyitem.cpp +++ b/panels/notification/center/notifyitem.cpp @@ -79,7 +79,12 @@ void AppNotifyItem::updateTime() } else if (minute > 0 && minute < 60) { ret = tr("%1 minutes ago").arg(minute); } else { - ret = tr("%1 hours ago").arg(minute / 60); + const auto hour = minute / 60; + if (hour == 1) { + ret = tr("1 hour ago"); + } else { + ret = tr("%1 hours ago").arg(hour); + } } } else if (elapsedDay >= 1 && elapsedDay < 2) { ret = tr("Yesterday ") + " " + time.toString("hh:mm"); diff --git a/panels/notification/center/translations/org.deepin.ds.notificationcenter.ts b/panels/notification/center/translations/org.deepin.ds.notificationcenter.ts index cdc68cbce..18d24fc86 100644 --- a/panels/notification/center/translations/org.deepin.ds.notificationcenter.ts +++ b/panels/notification/center/translations/org.deepin.ds.notificationcenter.ts @@ -4,7 +4,7 @@ GroupNotify - + Clear All @@ -12,17 +12,12 @@ NotifyHeader - - Notification Setting - - - - + Notification Center - + Clear All @@ -48,22 +43,27 @@ notifycenter::AppNotifyItem - + Just now - + %1 minutes ago - + + 1 hour ago + + + + %1 hours ago - + Yesterday diff --git a/panels/notification/center/translations/org.deepin.ds.notificationcenter_az.ts b/panels/notification/center/translations/org.deepin.ds.notificationcenter_az.ts index 6e8604dae..3f49f437a 100644 --- a/panels/notification/center/translations/org.deepin.ds.notificationcenter_az.ts +++ b/panels/notification/center/translations/org.deepin.ds.notificationcenter_az.ts @@ -1,8 +1,10 @@ - + + + GroupNotify - + Clear All مسح الكل @@ -10,17 +12,16 @@ NotifyHeader - Notification Setting - إعداد الإشعارات + إعداد الإشعارات - + Notification Center مركز الإشعارات - + Clear All مسح الكل @@ -46,24 +47,29 @@ notifycenter::AppNotifyItem - + Just now الآن - + %1 minutes ago %1 دقيقة مضت - + + 1 hour ago + + + + %1 hours ago %1 ساعة مضت - + Yesterday أمس - \ No newline at end of file + diff --git a/panels/notification/center/translations/org.deepin.ds.notificationcenter_bo.ts b/panels/notification/center/translations/org.deepin.ds.notificationcenter_bo.ts index cdc68cbce..18d24fc86 100644 --- a/panels/notification/center/translations/org.deepin.ds.notificationcenter_bo.ts +++ b/panels/notification/center/translations/org.deepin.ds.notificationcenter_bo.ts @@ -4,7 +4,7 @@ GroupNotify - + Clear All @@ -12,17 +12,12 @@ NotifyHeader - - Notification Setting - - - - + Notification Center - + Clear All @@ -48,22 +43,27 @@ notifycenter::AppNotifyItem - + Just now - + %1 minutes ago - + + 1 hour ago + + + + %1 hours ago - + Yesterday diff --git a/panels/notification/center/translations/org.deepin.ds.notificationcenter_ca.ts b/panels/notification/center/translations/org.deepin.ds.notificationcenter_ca.ts index c0d34aa5e..9ea36c914 100644 --- a/panels/notification/center/translations/org.deepin.ds.notificationcenter_ca.ts +++ b/panels/notification/center/translations/org.deepin.ds.notificationcenter_ca.ts @@ -1,8 +1,10 @@ - + + + GroupNotify - + Clear All Neteja-ho tot @@ -10,17 +12,16 @@ NotifyHeader - Notification Setting - Configuració de les notificacions + Configuració de les notificacions - + Notification Center Centre de notificacions - + Clear All Neteja-ho tot @@ -46,24 +47,29 @@ notifycenter::AppNotifyItem - + Just now Ara mateix - + %1 minutes ago Fa %1 minuts - + + 1 hour ago + + + + %1 hours ago Fa %1 hores - + Yesterday Ahir - \ No newline at end of file + diff --git a/panels/notification/center/translations/org.deepin.ds.notificationcenter_es.ts b/panels/notification/center/translations/org.deepin.ds.notificationcenter_es.ts index 4909a610a..6766c37ff 100644 --- a/panels/notification/center/translations/org.deepin.ds.notificationcenter_es.ts +++ b/panels/notification/center/translations/org.deepin.ds.notificationcenter_es.ts @@ -1,8 +1,10 @@ - + + + GroupNotify - + Clear All Limpiar todo @@ -10,17 +12,16 @@ NotifyHeader - Notification Setting - Ajustes de notificaciones + Ajustes de notificaciones - + Notification Center Centro de notificaciones - + Clear All Limpiar todo @@ -46,24 +47,29 @@ notifycenter::AppNotifyItem - + Just now Ahora mismo - + %1 minutes ago Hace %1 minutos - + + 1 hour ago + + + + %1 hours ago Hace %1 horas - + Yesterday Ayer - \ No newline at end of file + diff --git a/panels/notification/center/translations/org.deepin.ds.notificationcenter_fi.ts b/panels/notification/center/translations/org.deepin.ds.notificationcenter_fi.ts index b08f4f2b3..44a8f1ca2 100644 --- a/panels/notification/center/translations/org.deepin.ds.notificationcenter_fi.ts +++ b/panels/notification/center/translations/org.deepin.ds.notificationcenter_fi.ts @@ -1,8 +1,10 @@ - + + + GroupNotify - + Clear All Tyhjennä kaikki @@ -10,17 +12,16 @@ NotifyHeader - Notification Setting - Ilmoitusten asetukset + Ilmoitusten asetukset - + Notification Center Ilmoituskeskus - + Clear All Tyhjennä kaikki @@ -46,24 +47,29 @@ notifycenter::AppNotifyItem - + Just now Juuri nyt - + %1 minutes ago %1 minuuttia sitten - + + 1 hour ago + + + + %1 hours ago %1 tuntia sitten - + Yesterday Eilen - \ No newline at end of file + diff --git a/panels/notification/center/translations/org.deepin.ds.notificationcenter_fr.ts b/panels/notification/center/translations/org.deepin.ds.notificationcenter_fr.ts index 3e81ed1a6..3e7312874 100644 --- a/panels/notification/center/translations/org.deepin.ds.notificationcenter_fr.ts +++ b/panels/notification/center/translations/org.deepin.ds.notificationcenter_fr.ts @@ -1,8 +1,10 @@ - + + + GroupNotify - + Clear All Tout effacer @@ -10,17 +12,16 @@ NotifyHeader - Notification Setting - Réglages des notifications + Réglages des notifications - + Notification Center Centre de notification - + Clear All Tout effacer @@ -46,24 +47,29 @@ notifycenter::AppNotifyItem - + Just now À l'instant - + %1 minutes ago Il y a %1 minutes - + + 1 hour ago + + + + %1 hours ago Il y a %1 heures - + Yesterday Hier - \ No newline at end of file + diff --git a/panels/notification/center/translations/org.deepin.ds.notificationcenter_hu.ts b/panels/notification/center/translations/org.deepin.ds.notificationcenter_hu.ts index 562a3987d..ea3418146 100644 --- a/panels/notification/center/translations/org.deepin.ds.notificationcenter_hu.ts +++ b/panels/notification/center/translations/org.deepin.ds.notificationcenter_hu.ts @@ -1,8 +1,10 @@ - + + + GroupNotify - + Clear All Összes törlése @@ -10,17 +12,16 @@ NotifyHeader - Notification Setting - Értesítési Beállítások + Értesítési Beállítások - + Notification Center Értesítési Központ - + Clear All Összes törlése @@ -46,24 +47,29 @@ notifycenter::AppNotifyItem - + Just now Csak most - + %1 minutes ago %1 perccel ezelőtt - + + 1 hour ago + + + + %1 hours ago %1 órával ezelőtt - + Yesterday Tegnap - \ No newline at end of file + diff --git a/panels/notification/center/translations/org.deepin.ds.notificationcenter_it.ts b/panels/notification/center/translations/org.deepin.ds.notificationcenter_it.ts index cdc68cbce..18d24fc86 100644 --- a/panels/notification/center/translations/org.deepin.ds.notificationcenter_it.ts +++ b/panels/notification/center/translations/org.deepin.ds.notificationcenter_it.ts @@ -4,7 +4,7 @@ GroupNotify - + Clear All @@ -12,17 +12,12 @@ NotifyHeader - - Notification Setting - - - - + Notification Center - + Clear All @@ -48,22 +43,27 @@ notifycenter::AppNotifyItem - + Just now - + %1 minutes ago - + + 1 hour ago + + + + %1 hours ago - + Yesterday diff --git a/panels/notification/center/translations/org.deepin.ds.notificationcenter_ja.ts b/panels/notification/center/translations/org.deepin.ds.notificationcenter_ja.ts index d71dea23c..9af2c2225 100644 --- a/panels/notification/center/translations/org.deepin.ds.notificationcenter_ja.ts +++ b/panels/notification/center/translations/org.deepin.ds.notificationcenter_ja.ts @@ -1,8 +1,10 @@ - + + + GroupNotify - + Clear All すべて消去 @@ -10,17 +12,16 @@ NotifyHeader - Notification Setting - 通知の設定 + 通知の設定 - + Notification Center 通知センター - + Clear All すべて消去 @@ -46,24 +47,29 @@ notifycenter::AppNotifyItem - + Just now たった今 - + %1 minutes ago %1分前 - + + 1 hour ago + + + + %1 hours ago %1時間前 - + Yesterday 昨日 - \ No newline at end of file + diff --git a/panels/notification/center/translations/org.deepin.ds.notificationcenter_ko.ts b/panels/notification/center/translations/org.deepin.ds.notificationcenter_ko.ts index cdc68cbce..18d24fc86 100644 --- a/panels/notification/center/translations/org.deepin.ds.notificationcenter_ko.ts +++ b/panels/notification/center/translations/org.deepin.ds.notificationcenter_ko.ts @@ -4,7 +4,7 @@ GroupNotify - + Clear All @@ -12,17 +12,12 @@ NotifyHeader - - Notification Setting - - - - + Notification Center - + Clear All @@ -48,22 +43,27 @@ notifycenter::AppNotifyItem - + Just now - + %1 minutes ago - + + 1 hour ago + + + + %1 hours ago - + Yesterday diff --git a/panels/notification/center/translations/org.deepin.ds.notificationcenter_nb_NO.ts b/panels/notification/center/translations/org.deepin.ds.notificationcenter_nb_NO.ts index cdc68cbce..18d24fc86 100644 --- a/panels/notification/center/translations/org.deepin.ds.notificationcenter_nb_NO.ts +++ b/panels/notification/center/translations/org.deepin.ds.notificationcenter_nb_NO.ts @@ -4,7 +4,7 @@ GroupNotify - + Clear All @@ -12,17 +12,12 @@ NotifyHeader - - Notification Setting - - - - + Notification Center - + Clear All @@ -48,22 +43,27 @@ notifycenter::AppNotifyItem - + Just now - + %1 minutes ago - + + 1 hour ago + + + + %1 hours ago - + Yesterday diff --git a/panels/notification/center/translations/org.deepin.ds.notificationcenter_pl.ts b/panels/notification/center/translations/org.deepin.ds.notificationcenter_pl.ts index 2efa62918..5bac7a9f1 100644 --- a/panels/notification/center/translations/org.deepin.ds.notificationcenter_pl.ts +++ b/panels/notification/center/translations/org.deepin.ds.notificationcenter_pl.ts @@ -1,8 +1,10 @@ - + + + GroupNotify - + Clear All Wyczyść wszystko @@ -10,17 +12,16 @@ NotifyHeader - Notification Setting - Ustawienia powiadomień + Ustawienia powiadomień - + Notification Center Centrum powiadomień - + Clear All Wyczyść wszystko @@ -46,24 +47,29 @@ notifycenter::AppNotifyItem - + Just now Właśnie teraz - + %1 minutes ago %1 minut temu - + + 1 hour ago + + + + %1 hours ago %1 godzin temu - + Yesterday Wczoraj - \ No newline at end of file + diff --git a/panels/notification/center/translations/org.deepin.ds.notificationcenter_pt_BR.ts b/panels/notification/center/translations/org.deepin.ds.notificationcenter_pt_BR.ts index b98f095a2..c4efcef90 100644 --- a/panels/notification/center/translations/org.deepin.ds.notificationcenter_pt_BR.ts +++ b/panels/notification/center/translations/org.deepin.ds.notificationcenter_pt_BR.ts @@ -1,8 +1,10 @@ - + + + GroupNotify - + Clear All Limpar tudo @@ -10,17 +12,16 @@ NotifyHeader - Notification Setting - Configurações de Notificações + Configurações de Notificações - + Notification Center Central de Notificações - + Clear All Limpar tudo @@ -46,24 +47,29 @@ notifycenter::AppNotifyItem - + Just now Há pouco - + %1 minutes ago %1 minutos atrás - + + 1 hour ago + + + + %1 hours ago %1 horas atrás - + Yesterday Ontem - \ No newline at end of file + diff --git a/panels/notification/center/translations/org.deepin.ds.notificationcenter_ru.ts b/panels/notification/center/translations/org.deepin.ds.notificationcenter_ru.ts index c0a3cb110..6d288798d 100644 --- a/panels/notification/center/translations/org.deepin.ds.notificationcenter_ru.ts +++ b/panels/notification/center/translations/org.deepin.ds.notificationcenter_ru.ts @@ -1,8 +1,10 @@ - + + + GroupNotify - + Clear All Очистить всё @@ -10,17 +12,16 @@ NotifyHeader - Notification Setting - Настройки уведомлений + Настройки уведомлений - + Notification Center - + - + Clear All Очистить всё @@ -30,7 +31,7 @@ Unpin - + @@ -40,30 +41,35 @@ Notification Setting - + Настройки уведомлений notifycenter::AppNotifyItem - + Just now Сейчас - + %1 minutes ago %1 минут назад - + + 1 hour ago + + + + %1 hours ago 1% часов назад - + Yesterday Вчера - \ No newline at end of file + diff --git a/panels/notification/center/translations/org.deepin.ds.notificationcenter_uk.ts b/panels/notification/center/translations/org.deepin.ds.notificationcenter_uk.ts index 2e08798c6..453010e02 100644 --- a/panels/notification/center/translations/org.deepin.ds.notificationcenter_uk.ts +++ b/panels/notification/center/translations/org.deepin.ds.notificationcenter_uk.ts @@ -1,8 +1,10 @@ - + + + GroupNotify - + Clear All Вилучити все @@ -10,17 +12,16 @@ NotifyHeader - Notification Setting - Параметри сповіщень + Параметри сповіщень - + Notification Center Центр сповіщень - + Clear All Вилучити все @@ -46,24 +47,29 @@ notifycenter::AppNotifyItem - + Just now Щойно - + %1 minutes ago %1 хвилин тому - + + 1 hour ago + + + + %1 hours ago %1 годин тому - + Yesterday Вчора - \ No newline at end of file + diff --git a/panels/notification/center/translations/org.deepin.ds.notificationcenter_zh_CN.ts b/panels/notification/center/translations/org.deepin.ds.notificationcenter_zh_CN.ts index a01d6bea7..0d2f11b7f 100644 --- a/panels/notification/center/translations/org.deepin.ds.notificationcenter_zh_CN.ts +++ b/panels/notification/center/translations/org.deepin.ds.notificationcenter_zh_CN.ts @@ -1,10 +1,10 @@ - + GroupNotify - + Clear All 全部清除 @@ -12,17 +12,16 @@ NotifyHeader - Notification Setting - 通知设置 + 通知设置 - + Notification Center 通知中心 - + Clear All 全部清除 @@ -48,22 +47,27 @@ notifycenter::AppNotifyItem - + Just now 刚刚 - + %1 minutes ago %1分钟前 - + + 1 hour ago + 1小时前 + + + %1 hours ago %1小时前 - + Yesterday 昨天 diff --git a/panels/notification/center/translations/org.deepin.ds.notificationcenter_zh_HK.ts b/panels/notification/center/translations/org.deepin.ds.notificationcenter_zh_HK.ts index cdc68cbce..18d24fc86 100644 --- a/panels/notification/center/translations/org.deepin.ds.notificationcenter_zh_HK.ts +++ b/panels/notification/center/translations/org.deepin.ds.notificationcenter_zh_HK.ts @@ -4,7 +4,7 @@ GroupNotify - + Clear All @@ -12,17 +12,12 @@ NotifyHeader - - Notification Setting - - - - + Notification Center - + Clear All @@ -48,22 +43,27 @@ notifycenter::AppNotifyItem - + Just now - + %1 minutes ago - + + 1 hour ago + + + + %1 hours ago - + Yesterday diff --git a/panels/notification/center/translations/org.deepin.ds.notificationcenter_zh_TW.ts b/panels/notification/center/translations/org.deepin.ds.notificationcenter_zh_TW.ts index cdc68cbce..18d24fc86 100644 --- a/panels/notification/center/translations/org.deepin.ds.notificationcenter_zh_TW.ts +++ b/panels/notification/center/translations/org.deepin.ds.notificationcenter_zh_TW.ts @@ -4,7 +4,7 @@ GroupNotify - + Clear All @@ -12,17 +12,12 @@ NotifyHeader - - Notification Setting - - - - + Notification Center - + Clear All @@ -48,22 +43,27 @@ notifycenter::AppNotifyItem - + Just now - + %1 minutes ago - + + 1 hour ago + + + + %1 hours ago - + Yesterday