diff --git a/nymea-app/translations/nymea-app.de.ts b/nymea-app/translations/nymea-app.de.ts index a65037ce..ab7fdc64 100644 --- a/nymea-app/translations/nymea-app.de.ts +++ b/nymea-app/translations/nymea-app.de.ts @@ -1,6 +1,33 @@ + + ACChartsPage + + Hours + Stunden + + + Days + Tage + + + Weeks + Wochen + + + Months + Monate + + + Window open + Fenster geöffnet + + + Heating on + Heizung an + + ACSettingsPage @@ -106,6 +133,49 @@ Oswald Schrift von "The Oswald Project" + + ActionLogPage + + History for %1 + Protokoll für %1 + + + Remove logs? + Protokoll entfernen? + + + Do you want to remove the log for this action and disable logging? + Möchtest Du das Protokoll für diese Aktion entfernen und das Protokollieren deaktivieren? + + + User action + Benutzeraktion + + + Automation + Automatisierung + + + success + Erfolgreich + + + Failure: %1 + Fehlgeschlagen: %1 + + + Logging not enabled + Protokollieren nicht aktiv + + + Enable logging + Protokollieren aktivieren? + + + This action is not being logged. + Diese Aktion wird nicht protokolliert. + + AdvancedConnectionInterfacesPage @@ -1997,6 +2067,33 @@ immer + + EventLogPage + + History for %1 + Protokoll für %1 + + + Remove logs? + Protokoll entfernen? + + + Do you want to remove the log for this event and disable logging? + Möchtest Du das Protokoll für dieses Ereignis entfernen und das Protokollieren deaktivieren? + + + Logging not enabled + Protokoll nicht aktiv + + + Enable logging + Protokollieren aktivieren? + + + This event is not being logged. + Dieses Ereignis wird nicht protokolliert. + + FavoritesView @@ -2247,7 +2344,7 @@ Bitte versuche es erneut. - GenericDevicePage + GenericThingPage States Zustände @@ -3525,6 +3622,37 @@ Bitte versuche es erneut. Log viewer Log anzeigen + + Terminated by system + Von System beendet + + + Application quit + Anwenung beendet + + + Application error + Absturz + + + Unknown reason + Unbekannter Grund + + + Started + Gestartet + + + Stopped + Gestoppt + + + + LogViewerPagePre18 + + Log viewer + Protokollansicht + %1 Server %1 Server @@ -4777,7 +4905,7 @@ Die Versuchsdauer muss mindestens 10 ms betragen. - NotificationsDevicePage + NotificationsThingPage Title Titel @@ -4786,14 +4914,6 @@ Die Versuchsdauer muss mindestens 10 ms betragen. Text Text - - Notification details - Benachrichtigungs-Details - - - Date sent - Sende-Datum - No messages sent yet. Es wurden noch keine Nachrichten versendet. @@ -4802,6 +4922,14 @@ Die Versuchsdauer muss mindestens 10 ms betragen. Sent messages will appear here. Gesendete Nachrichten werden hier aufscheinen. + + Notification details + Benachrichtigungs-Details + + + Date sent + Sende-Datum + Sending failed Versand fehlgeschlagen @@ -5722,6 +5850,14 @@ Möchtest Du fortfahren? Reload Erneut laden + + Copy + Kopieren + + + Copy all + Alle kopieren + ScriptsPage @@ -6412,6 +6548,37 @@ A consumer, not consuming anything Gesamte Netzeinspeisung: %1 kWh + + StateChart + + Hours + Stunden + + + Days + Tage + + + Weeks + Wochen + + + Months + Monate + + + No data + Keine Daten + + + Yes + Ja + + + No + Nein + + StateEvaluatorDelegate @@ -6441,18 +6608,30 @@ A consumer, not consuming anything StateLogPage - - Log - Protokoll - - - Graph - Diagramm - History for %1 Protokoll für %1 + + Remove logs? + Protokoll entfernen? + + + Do you want to remove the log for this state and disable logging? + Möchtest Du das Protokoll für diesen Zustand entfernen und das Protokollieren deaktivieren? + + + Logging not enabled + Protokoll nicht aktiv + + + This state is not being logged. + Dieser Zustand wird nicht protokolliert + + + Enable logging + Protokoll aktivieren? + SystemUpdatePage @@ -6638,6 +6817,25 @@ Bitte benutze diese Funktion nur wenn Du sicher bist, dass es das ist was Du mö Die Batterie neigt sich dem Ende zu! + + ThingLogPage + + History for %1 + Protokoll für %1 + + + Filter by + Filtern nach + + + Yes + Ja + + + No + Nein + + ThingRulesPage diff --git a/nymea-app/translations/nymea-app.en.ts b/nymea-app/translations/nymea-app.en.ts index e35f491f..f987aa08 100644 --- a/nymea-app/translations/nymea-app.en.ts +++ b/nymea-app/translations/nymea-app.en.ts @@ -1,6 +1,33 @@ + + ACChartsPage + + Hours + + + + Days + + + + Weeks + + + + Months + + + + Window open + + + + Heating on + + + ACSettingsPage @@ -106,6 +133,49 @@ + + ActionLogPage + + History for %1 + + + + Remove logs? + + + + Do you want to remove the log for this action and disable logging? + + + + User action + + + + Automation + + + + success + + + + Failure: %1 + + + + Logging not enabled + + + + Enable logging + + + + This action is not being logged. + + + AdvancedConnectionInterfacesPage @@ -1991,6 +2061,33 @@ + + EventLogPage + + History for %1 + + + + Remove logs? + + + + Do you want to remove the log for this event and disable logging? + + + + Logging not enabled + + + + Enable logging + + + + This event is not being logged. + + + FavoritesView @@ -2240,7 +2337,7 @@ Please try again. - GenericDevicePage + GenericThingPage States @@ -3518,6 +3615,37 @@ Please try again. Log viewer + + Terminated by system + + + + Application quit + + + + Application error + + + + Unknown reason + + + + Started + + + + Stopped + + + + + LogViewerPagePre18 + + Log viewer + + %1 Server @@ -4766,7 +4894,7 @@ Use a timeout value greater or equal to 10 ms. - NotificationsDevicePage + NotificationsThingPage Title @@ -4775,14 +4903,6 @@ Use a timeout value greater or equal to 10 ms. Text - - Notification details - - - - Date sent - - No messages sent yet. @@ -4791,6 +4911,14 @@ Use a timeout value greater or equal to 10 ms. Sent messages will appear here. + + Notification details + + + + Date sent + + Sending failed @@ -5709,6 +5837,14 @@ Do you want to proceed? Reload + + Copy + + + + Copy all + + ScriptsPage @@ -6399,6 +6535,37 @@ A consumer, not consuming anything + + StateChart + + Hours + + + + Days + + + + Weeks + + + + Months + + + + No data + + + + Yes + + + + No + + + StateEvaluatorDelegate @@ -6433,11 +6600,23 @@ A consumer, not consuming anything - Log + Remove logs? - Graph + Do you want to remove the log for this state and disable logging? + + + + Logging not enabled + + + + This state is not being logged. + + + + Enable logging @@ -6622,6 +6801,25 @@ Please only use this if you are sure you want this and consider reporting the is + + ThingLogPage + + History for %1 + + + + Filter by + + + + Yes + + + + No + + + ThingRulesPage diff --git a/nymea-app/translations/nymea-app.en_US.ts b/nymea-app/translations/nymea-app.en_US.ts index dc94c33d..9f503cc6 100644 --- a/nymea-app/translations/nymea-app.en_US.ts +++ b/nymea-app/translations/nymea-app.en_US.ts @@ -1,6 +1,33 @@ + + ACChartsPage + + Hours + + + + Days + + + + Weeks + + + + Months + + + + Window open + + + + Heating on + + + ACSettingsPage @@ -106,6 +133,49 @@ + + ActionLogPage + + History for %1 + + + + Remove logs? + + + + Do you want to remove the log for this action and disable logging? + + + + User action + + + + Automation + + + + success + + + + Failure: %1 + + + + Logging not enabled + + + + Enable logging + + + + This action is not being logged. + + + AdvancedConnectionInterfacesPage @@ -1991,6 +2061,33 @@ + + EventLogPage + + History for %1 + + + + Remove logs? + + + + Do you want to remove the log for this event and disable logging? + + + + Logging not enabled + + + + Enable logging + + + + This event is not being logged. + + + FavoritesView @@ -2240,7 +2337,7 @@ Please try again. - GenericDevicePage + GenericThingPage States @@ -3518,6 +3615,37 @@ Please try again. Log viewer + + Terminated by system + + + + Application quit + + + + Application error + + + + Unknown reason + + + + Started + + + + Stopped + + + + + LogViewerPagePre18 + + Log viewer + + %1 Server @@ -4766,7 +4894,7 @@ Use a timeout value greater or equal to 10 ms. - NotificationsDevicePage + NotificationsThingPage Title @@ -4775,14 +4903,6 @@ Use a timeout value greater or equal to 10 ms. Text - - Notification details - - - - Date sent - - No messages sent yet. @@ -4791,6 +4911,14 @@ Use a timeout value greater or equal to 10 ms. Sent messages will appear here. + + Notification details + + + + Date sent + + Sending failed @@ -5709,6 +5837,14 @@ Do you want to proceed? Reload + + Copy + + + + Copy all + + ScriptsPage @@ -6399,6 +6535,37 @@ A consumer, not consuming anything + + StateChart + + Hours + + + + Days + + + + Weeks + + + + Months + + + + No data + + + + Yes + + + + No + + + StateEvaluatorDelegate @@ -6433,11 +6600,23 @@ A consumer, not consuming anything - Log + Remove logs? - Graph + Do you want to remove the log for this state and disable logging? + + + + Logging not enabled + + + + This state is not being logged. + + + + Enable logging @@ -6622,6 +6801,25 @@ Please only use this if you are sure you want this and consider reporting the is + + ThingLogPage + + History for %1 + + + + Filter by + + + + Yes + + + + No + + + ThingRulesPage diff --git a/nymea-app/translations/nymea-app.it.ts b/nymea-app/translations/nymea-app.it.ts index 042afca2..18357c01 100644 --- a/nymea-app/translations/nymea-app.it.ts +++ b/nymea-app/translations/nymea-app.it.ts @@ -1,6 +1,33 @@ + + ACChartsPage + + Hours + + + + Days + + + + Weeks + + + + Months + + + + Window open + + + + Heating on + + + ACSettingsPage @@ -106,6 +133,49 @@ Font Oswald di The Oswald Project + + ActionLogPage + + History for %1 + Cronologia per %1 + + + Remove logs? + + + + Do you want to remove the log for this action and disable logging? + + + + User action + + + + Automation + + + + success + + + + Failure: %1 + + + + Logging not enabled + + + + Enable logging + + + + This action is not being logged. + + + AdvancedConnectionInterfacesPage @@ -1991,6 +2061,33 @@ + + EventLogPage + + History for %1 + Cronologia per %1 + + + Remove logs? + + + + Do you want to remove the log for this event and disable logging? + + + + Logging not enabled + + + + Enable logging + + + + This event is not being logged. + + + FavoritesView @@ -2240,26 +2337,26 @@ Please try again. - GenericDevicePage + GenericThingPage States - + Actions - + Events - + Cancel - + Cancella OK - + Ok @@ -3518,37 +3615,68 @@ Please try again. Log viewer + + Terminated by system + + + + Application quit + + + + Application error + + + + Unknown reason + + + + Started + + + + Stopped + + + + + LogViewerPagePre18 + + Log viewer + + %1 Server - + System started - + Rule triggered - + Actions executed - + Rule active - + Rule inactive - + Exit actions executed - + Enabled changed - + @@ -4766,22 +4894,14 @@ Use a timeout value greater or equal to 10 ms. - NotificationsDevicePage + NotificationsThingPage Title - + Titolo Text - - - - Notification details - - - - Date sent - + No messages sent yet. @@ -4791,6 +4911,14 @@ Use a timeout value greater or equal to 10 ms. Sent messages will appear here. + + Notification details + + + + Date sent + + Sending failed @@ -5709,6 +5837,14 @@ Do you want to proceed? Reload + + Copy + + + + Copy all + + ScriptsPage @@ -6399,6 +6535,37 @@ A consumer, not consuming anything + + StateChart + + Hours + + + + Days + + + + Weeks + + + + Months + + + + No data + + + + Yes + + + + No + + + StateEvaluatorDelegate @@ -6433,12 +6600,24 @@ A consumer, not consuming anything Cronologia per %1 - Log - + Remove logs? + - Graph - Grafico + Do you want to remove the log for this state and disable logging? + + + + Logging not enabled + + + + This state is not being logged. + + + + Enable logging + @@ -6622,6 +6801,25 @@ Please only use this if you are sure you want this and consider reporting the is + + ThingLogPage + + History for %1 + Cronologia per %1 + + + Filter by + + + + Yes + + + + No + + + ThingRulesPage diff --git a/nymea-app/translations/nymea-app.ko.ts b/nymea-app/translations/nymea-app.ko.ts index 622c1715..530464cb 100644 --- a/nymea-app/translations/nymea-app.ko.ts +++ b/nymea-app/translations/nymea-app.ko.ts @@ -1,6 +1,33 @@ + + ACChartsPage + + Hours + + + + Days + + + + Weeks + + + + Months + + + + Window open + + + + Heating on + + + ACSettingsPage @@ -106,6 +133,49 @@ + + ActionLogPage + + History for %1 + %1에 대한 기록 + + + Remove logs? + + + + Do you want to remove the log for this action and disable logging? + + + + User action + + + + Automation + + + + success + + + + Failure: %1 + + + + Logging not enabled + + + + Enable logging + + + + This action is not being logged. + + + AdvancedConnectionInterfacesPage @@ -1993,6 +2063,33 @@ 아무때나 + + EventLogPage + + History for %1 + %1에 대한 기록 + + + Remove logs? + + + + Do you want to remove the log for this event and disable logging? + + + + Logging not enabled + + + + Enable logging + + + + This event is not being logged. + + + FavoritesView @@ -2243,26 +2340,26 @@ Please try again. - GenericDevicePage + GenericThingPage States - 상태 + 상태 Actions - 작동(조치) + 작동(조치) Events - 이벤트 + 이벤트 Cancel - 취소 + 취소 OK - + 확인 @@ -3504,37 +3601,68 @@ Please try again. Log viewer 기록 보기 + + Terminated by system + + + + Application quit + + + + Application error + + + + Unknown reason + + + + Started + + + + Stopped + + + + + LogViewerPagePre18 + + Log viewer + + %1 Server - %1 서버 + %1 서버 System started - 시스템 시작 + 시스템 시작 Rule triggered - 규칙 작동됨 + 규칙 작동됨 Actions executed - 실행된 동작 + 실행된 동작 Rule active - 규칙 활성 + 규칙 활성 Rule inactive - 규칙 사용 안 함 + 규칙 사용 안 함 Exit actions executed - 실행된 작업 종료 + 실행된 작업 종료 Enabled changed - 사용 가능 변경됨 + 사용 가능 변경됨 @@ -4752,22 +4880,14 @@ Use a timeout value greater or equal to 10 ms. - NotificationsDevicePage + NotificationsThingPage Title - 제목 + 제목 Text - 내용 - - - Notification details - 알림 내역 - - - Date sent - 보낸 날짜 + 내용 No messages sent yet. @@ -4777,6 +4897,14 @@ Use a timeout value greater or equal to 10 ms. Sent messages will appear here. + + Notification details + 알림 내역 + + + Date sent + 보낸 날짜 + Sending failed @@ -5696,6 +5824,14 @@ Do you want to proceed? Reload + + Copy + + + + Copy all + + ScriptsPage @@ -6386,6 +6522,37 @@ A consumer, not consuming anything + + StateChart + + Hours + + + + Days + + + + Weeks + + + + Months + + + + No data + + + + Yes + + + + No + + + StateEvaluatorDelegate @@ -6420,12 +6587,24 @@ A consumer, not consuming anything %1에 대한 기록 - Log - 기록 + Remove logs? + - Graph - 그래프 + Do you want to remove the log for this state and disable logging? + + + + Logging not enabled + + + + This state is not being logged. + + + + Enable logging + @@ -6608,6 +6787,25 @@ Please only use this if you are sure you want this and consider reporting the is 배터리가 다 됐네요! + + ThingLogPage + + History for %1 + %1에 대한 기록 + + + Filter by + 필터 기준 + + + Yes + + + + No + + + ThingRulesPage diff --git a/nymea-app/translations/nymea-app.nl.ts b/nymea-app/translations/nymea-app.nl.ts index 4c677e29..81fbe03f 100644 --- a/nymea-app/translations/nymea-app.nl.ts +++ b/nymea-app/translations/nymea-app.nl.ts @@ -1,6 +1,33 @@ + + ACChartsPage + + Hours + + + + Days + + + + Weeks + + + + Months + + + + Window open + + + + Heating on + + + ACSettingsPage @@ -106,6 +133,49 @@ Oswald font door The Oswald Project + + ActionLogPage + + History for %1 + + + + Remove logs? + + + + Do you want to remove the log for this action and disable logging? + + + + User action + + + + Automation + + + + success + + + + Failure: %1 + + + + Logging not enabled + + + + Enable logging + + + + This action is not being logged. + + + AdvancedConnectionInterfacesPage @@ -1991,6 +2061,33 @@ + + EventLogPage + + History for %1 + + + + Remove logs? + + + + Do you want to remove the log for this event and disable logging? + + + + Logging not enabled + + + + Enable logging + + + + This event is not being logged. + + + FavoritesView @@ -2240,26 +2337,26 @@ Please try again. - GenericDevicePage + GenericThingPage States - + Actions - + Events - + Cancel - + Annuleren OK - + OK @@ -3518,37 +3615,68 @@ Please try again. Log viewer + + Terminated by system + + + + Application quit + + + + Application error + + + + Unknown reason + + + + Started + + + + Stopped + + + + + LogViewerPagePre18 + + Log viewer + + %1 Server - + System started - + Rule triggered - + Actions executed - + Rule active - + Rule inactive - + Exit actions executed - + Enabled changed - + @@ -4766,22 +4894,14 @@ Use a timeout value greater or equal to 10 ms. - NotificationsDevicePage + NotificationsThingPage Title - + Text - - - - Notification details - - - - Date sent - + No messages sent yet. @@ -4791,6 +4911,14 @@ Use a timeout value greater or equal to 10 ms. Sent messages will appear here. + + Notification details + + + + Date sent + + Sending failed @@ -5709,6 +5837,14 @@ Do you want to proceed? Reload + + Copy + + + + Copy all + + ScriptsPage @@ -6399,6 +6535,37 @@ A consumer, not consuming anything + + StateChart + + Hours + + + + Days + + + + Weeks + + + + Months + + + + No data + + + + Yes + + + + No + + + StateEvaluatorDelegate @@ -6433,12 +6600,24 @@ A consumer, not consuming anything - Log - + Remove logs? + - Graph - + Do you want to remove the log for this state and disable logging? + + + + Logging not enabled + + + + This state is not being logged. + + + + Enable logging + @@ -6622,6 +6801,25 @@ Please only use this if you are sure you want this and consider reporting the is + + ThingLogPage + + History for %1 + + + + Filter by + + + + Yes + + + + No + + + ThingRulesPage diff --git a/nymea-app/translations/nymea-app.tr.ts b/nymea-app/translations/nymea-app.tr.ts index 87310b7e..24a2d30c 100644 --- a/nymea-app/translations/nymea-app.tr.ts +++ b/nymea-app/translations/nymea-app.tr.ts @@ -1,6 +1,33 @@ + + ACChartsPage + + Hours + + + + Days + + + + Weeks + + + + Months + + + + Window open + + + + Heating on + + + ACSettingsPage @@ -106,6 +133,49 @@ Oswald yazı tipi by The Oswald Project + + ActionLogPage + + History for %1 + %1 için geçmiş + + + Remove logs? + + + + Do you want to remove the log for this action and disable logging? + + + + User action + + + + Automation + + + + success + + + + Failure: %1 + + + + Logging not enabled + + + + Enable logging + + + + This action is not being logged. + + + AdvancedConnectionInterfacesPage @@ -672,7 +742,7 @@ Close - + kapalı @@ -1993,6 +2063,33 @@ her zaman + + EventLogPage + + History for %1 + %1 için geçmiş + + + Remove logs? + + + + Do you want to remove the log for this event and disable logging? + + + + Logging not enabled + + + + Enable logging + + + + This event is not being logged. + + + FavoritesView @@ -2242,26 +2339,26 @@ Please try again. - GenericDevicePage + GenericThingPage States - Devletler + Ülkeler Actions - Hareketler + Hareketler Events - Olaylar + Cancel - İptal + İptal OK - tamam + @@ -3503,37 +3600,68 @@ Please try again. Log viewer Günlük görüntüleyici + + Terminated by system + + + + Application quit + + + + Application error + + + + Unknown reason + + + + Started + + + + Stopped + + + + + LogViewerPagePre18 + + Log viewer + Günlük görüntüleyici + %1 Server - %1 Sunucu + %1 Sunucu System started - Sistem başlatıldı + Sistem başlatıldı Rule triggered - Kural tetiklendi + Kural tetiklendi Actions executed - Yürütülen eylemler + Yürütülen eylemler Rule active - Kural etkin + Kural etkin Rule inactive - Kural etkin değil + Kural etkin değil Exit actions executed - Yürütülen çıkış işlemleri + Yürütülen çıkış işlemleri Enabled changed - Etkin değiştirildi + Etkin değiştirildi @@ -4751,42 +4879,42 @@ Use a timeout value greater or equal to 10 ms. - NotificationsDevicePage + NotificationsThingPage Title - Başlık + Başlık Text - Metin - - - Notification details - Bildirim ayrıntıları - - - Date sent - Tarih gönderildi + Metin No messages sent yet. - Henüz mesaj gönderilmedi. + Henüz mesaj gönderilmedi. Sent messages will appear here. - Gönderilen mesajlar burada görünecektir. + Gönderilen mesajlar burada görünecektir. + + + Notification details + Bildirim ayrıntıları + + + Date sent + Tarih gönderildi Sending failed - Gönderim başarısız + Gönderim başarısız Resend - Yeniden gönder + Yeniden gönder Close - Kapat + kapalı @@ -5695,6 +5823,14 @@ Do you want to proceed? Reload Tekrar yükle + + Copy + + + + Copy all + + ScriptsPage @@ -6385,6 +6521,37 @@ A consumer, not consuming anything + + StateChart + + Hours + + + + Days + + + + Weeks + + + + Months + + + + No data + + + + Yes + + + + No + + + StateEvaluatorDelegate @@ -6419,12 +6586,24 @@ A consumer, not consuming anything %1 için geçmiş - Log - Kayıt + Remove logs? + - Graph - grafik + Do you want to remove the log for this state and disable logging? + + + + Logging not enabled + + + + This state is not being logged. + + + + Enable logging + @@ -6609,6 +6788,25 @@ Lütfen bunu istediğinizden eminseniz kullanın ve yayınlanmamış kanalları Pil bitiyor! + + ThingLogPage + + History for %1 + %1 için geçmiş + + + Filter by + Tarafından filtre + + + Yes + + + + No + + + ThingRulesPage @@ -7737,7 +7935,7 @@ Lütfen bunu istediğinizden eminseniz kullanın ve yayınlanmamış kanalları Close - + kapalı %n device(s) diff --git a/nymea-app/translations/nymea-app.vi.ts b/nymea-app/translations/nymea-app.vi.ts index d471aae5..a76997a7 100644 --- a/nymea-app/translations/nymea-app.vi.ts +++ b/nymea-app/translations/nymea-app.vi.ts @@ -1,6 +1,33 @@ + + ACChartsPage + + Hours + + + + Days + + + + Weeks + + + + Months + + + + Window open + + + + Heating on + + + ACSettingsPage @@ -106,6 +133,49 @@ + + ActionLogPage + + History for %1 + + + + Remove logs? + + + + Do you want to remove the log for this action and disable logging? + + + + User action + + + + Automation + + + + success + + + + Failure: %1 + + + + Logging not enabled + + + + Enable logging + + + + This action is not being logged. + + + AdvancedConnectionInterfacesPage @@ -1990,6 +2060,33 @@ + + EventLogPage + + History for %1 + + + + Remove logs? + + + + Do you want to remove the log for this event and disable logging? + + + + Logging not enabled + + + + Enable logging + + + + This event is not being logged. + + + FavoritesView @@ -2239,26 +2336,26 @@ Please try again. - GenericDevicePage + GenericThingPage States - + Actions - + Events - + Cancel - + OK - + @@ -3500,37 +3597,68 @@ Please try again. Log viewer + + Terminated by system + + + + Application quit + + + + Application error + + + + Unknown reason + + + + Started + + + + Stopped + + + + + LogViewerPagePre18 + + Log viewer + + %1 Server - + System started - + Rule triggered - + Actions executed - + Rule active - + Rule inactive - + Exit actions executed - + Enabled changed - + @@ -4748,22 +4876,14 @@ Use a timeout value greater or equal to 10 ms. - NotificationsDevicePage + NotificationsThingPage Title - + Text - - - - Notification details - - - - Date sent - + No messages sent yet. @@ -4773,6 +4893,14 @@ Use a timeout value greater or equal to 10 ms. Sent messages will appear here. + + Notification details + + + + Date sent + + Sending failed @@ -5691,6 +5819,14 @@ Do you want to proceed? Reload + + Copy + + + + Copy all + + ScriptsPage @@ -6381,6 +6517,37 @@ A consumer, not consuming anything + + StateChart + + Hours + + + + Days + + + + Weeks + + + + Months + + + + No data + + + + Yes + + + + No + + + StateEvaluatorDelegate @@ -6415,12 +6582,24 @@ A consumer, not consuming anything - Log - + Remove logs? + - Graph - + Do you want to remove the log for this state and disable logging? + + + + Logging not enabled + + + + This state is not being logged. + + + + Enable logging + @@ -6603,6 +6782,25 @@ Please only use this if you are sure you want this and consider reporting the is + + ThingLogPage + + History for %1 + + + + Filter by + + + + Yes + + + + No + + + ThingRulesPage diff --git a/nymea-app/ui/customviews/StateChart.qml b/nymea-app/ui/customviews/StateChart.qml index c85a0ed0..bf182940 100644 --- a/nymea-app/ui/customviews/StateChart.qml +++ b/nymea-app/ui/customviews/StateChart.qml @@ -359,45 +359,6 @@ Item { } } - - RowLayout { - id: legend - anchors { left: parent.left; bottom: parent.bottom; right: parent.right } - anchors.leftMargin: chartView.plotArea.x - height: Style.smallIconSize - anchors.margins: Style.margins - visible: false - - Item { - Layout.fillWidth: true - Layout.fillHeight: true - // opacity: selfProductionConsumptionSeries.opacity - MouseArea { - anchors.fill: parent - anchors.topMargin: -Style.smallMargins - anchors.bottomMargin: -Style.smallMargins - // onClicked: d.selectSeries(selfProductionConsumptionSeries) - } - Row { - anchors.centerIn: parent - spacing: Style.smallMargins - ColorIcon { - name: "weathericons/weather-clear-day" - size: Style.smallIconSize - color: Style.green - } - Label { - width: parent.parent.width - x - elide: Text.ElideRight - visible: legend.width > 500 - text: qsTr("Produced") - anchors.verticalCenter: parent.verticalCenter - font: Style.smallFont - } - } - } - } - MouseArea { id: mouseArea anchors.fill: parent @@ -526,15 +487,33 @@ Item { font: Style.smallFont } - Label { - Layout.fillWidth: true - elide: Text.ElideRight - text: toolTip.value === null - ? qsTr("No data") - : root.stateType.type.toLowerCase() == "bool" - ? root.stateType.displayName + ": " + (toolTip.value ? qsTr("Yes") : qsTr("No")) - : Types.toUiValue(toolTip.value, root.stateType.unit).toFixed(root.roundTo) + Types.toUiUnit(root.stateType.unit) - font: Style.smallFont + RowLayout { + + ColorIcon { + id: icon + size: Style.smallIconSize + name: root.iconSource + color: root.color + visible: name != "" + } + + Rectangle { + width: Style.extraSmallFont.pixelSize + height: width + color: root.color + visible: !icon.visible + } + + Label { + Layout.fillWidth: true + elide: Text.ElideRight + text: toolTip.value === null + ? qsTr("No data") + : root.stateType.type.toLowerCase() == "bool" + ? root.stateType.displayName + ": " + (toolTip.value ? qsTr("Yes") : qsTr("No")) + : Types.toUiValue(toolTip.value, root.stateType.unit).toFixed(root.roundTo) + Types.toUiUnit(root.stateType.unit) + font: Style.extraSmallFont + } } } diff --git a/nymea-app/ui/devicepages/ActionLogPage.qml b/nymea-app/ui/devicepages/ActionLogPage.qml index 6923198b..5367b744 100644 --- a/nymea-app/ui/devicepages/ActionLogPage.qml +++ b/nymea-app/ui/devicepages/ActionLogPage.qml @@ -141,8 +141,7 @@ Page { visible: text.length > 0 } } - } - + } } } @@ -150,13 +149,12 @@ Page { anchors.centerIn: parent width: parent.width - app.margins * 2 title: qsTr("Logging not enabled") - text: qsTr("This state is not being logged.") - imageSource: "qrc:/styles/%1/logo.svg".arg(styleController.currentStyle) + text: qsTr("This action is not being logged.") + imageSource: "../images/logs.svg" buttonText: qsTr("Enable logging") visible: !root.isLogged onButtonClicked: { - print("enabming logging") - engine.thingManager.setStateLogging(root.thing.id, root.stateType.id, true) + engine.thingManager.setActionLogging(root.thing.id, root.actionType.id, true) } } } diff --git a/nymea-app/ui/devicepages/EventLogPage.qml b/nymea-app/ui/devicepages/EventLogPage.qml index f08d3067..11d55328 100644 --- a/nymea-app/ui/devicepages/EventLogPage.qml +++ b/nymea-app/ui/devicepages/EventLogPage.qml @@ -127,8 +127,7 @@ Page { visible: text.length > 0 } } - } - + } } } @@ -136,13 +135,12 @@ Page { anchors.centerIn: parent width: parent.width - app.margins * 2 title: qsTr("Logging not enabled") - text: qsTr("This state is not being logged.") - imageSource: "qrc:/styles/%1/logo.svg".arg(styleController.currentStyle) + text: qsTr("This event is not being logged.") + imageSource: "../images/logs.svg" buttonText: qsTr("Enable logging") visible: !root.isLogged onButtonClicked: { - print("enabming logging") - engine.thingManager.setStateLogging(root.thing.id, root.stateType.id, true) + engine.thingManager.setEventLogging(root.thing.id, root.eventType.id, true) } } } diff --git a/nymea-app/ui/devicepages/SensorDevicePage.qml b/nymea-app/ui/devicepages/SensorDevicePage.qml index 7a858dbb..7f0137c3 100644 --- a/nymea-app/ui/devicepages/SensorDevicePage.qml +++ b/nymea-app/ui/devicepages/SensorDevicePage.qml @@ -155,6 +155,7 @@ ThingPageBase { thing: root.thing stateType: parent.stateType color: app.interfaceToColor(interfaceName) + iconSource: app.interfaceToIcon(interfaceName) } } diff --git a/nymea-app/ui/devicepages/StateLogPage.qml b/nymea-app/ui/devicepages/StateLogPage.qml index 03a99246..7e020d1c 100644 --- a/nymea-app/ui/devicepages/StateLogPage.qml +++ b/nymea-app/ui/devicepages/StateLogPage.qml @@ -133,11 +133,10 @@ Page { width: parent.width - app.margins * 2 title: qsTr("Logging not enabled") text: qsTr("This state is not being logged.") - imageSource: "qrc:/styles/%1/logo.svg".arg(styleController.currentStyle) + imageSource: "../images/logs.svg" buttonText: qsTr("Enable logging") visible: !root.isLogged onButtonClicked: { - print("enabming logging") engine.thingManager.setStateLogging(root.thing.id, root.stateType.id, true) } } diff --git a/nymea-app/ui/mainviews/airconditioning/ACChartsPage.qml b/nymea-app/ui/mainviews/airconditioning/ACChartsPage.qml index 35bae847..939c9347 100644 --- a/nymea-app/ui/mainviews/airconditioning/ACChartsPage.qml +++ b/nymea-app/ui/mainviews/airconditioning/ACChartsPage.qml @@ -61,6 +61,7 @@ Page { for (var i = 0; i < vocRepeater.count; i++) { vocRepeater.itemAt(i).logsModel.fetchLogs() } + for (var i = 0; i < windowOpenRepeater.count; i++) { windowOpenRepeater.itemAt(i).logsModel.fetchLogs() } @@ -897,6 +898,7 @@ Page { thing: thermostatsRepeater.itemAt(index).thing entry: thermostatsRepeater.itemAt(index).logsModel.find(tooltips.timestamp) color: app.interfaceToColor("temperaturesensor") + iconSource: app.interfaceToIcon("temperaturesensor") valueName: "temperature" axis: temperatureAxis x: tooltips.tooltipX @@ -917,6 +919,7 @@ Page { entry: tempRepeater.itemAt(index).logsModel.find(tooltips.timestamp) valueName: "temperature" color: app.interfaceToColor("temperaturesensor") + iconSource: app.interfaceToIcon("temperaturesensor") axis: temperatureAxis x: tooltips.tooltipX width: tooltips.tooltipWidth @@ -935,6 +938,7 @@ Page { thing: humidityRepeater.itemAt(index).thing entry: humidityRepeater.itemAt(index).logsModel.find(tooltips.timestamp) color: app.interfaceToColor("humiditysensor") + iconSource: app.interfaceToIcon("humiditysensor") valueName: "humidity" axis: humidityAxis x: tooltips.tooltipX @@ -955,6 +959,7 @@ Page { entry: vocRepeater.itemAt(index).logsModel.find(tooltips.timestamp) valueName: "voc" color: app.interfaceToColor("vocsensor") + iconSource: app.interfaceToIcon("vocsensor") axis: vocAxis x: tooltips.tooltipX width: tooltips.tooltipWidth diff --git a/nymea-app/ui/mainviews/airconditioning/TooltipDelegate.qml b/nymea-app/ui/mainviews/airconditioning/TooltipDelegate.qml index 28a9b789..137c50d3 100644 --- a/nymea-app/ui/mainviews/airconditioning/TooltipDelegate.qml +++ b/nymea-app/ui/mainviews/airconditioning/TooltipDelegate.qml @@ -15,6 +15,7 @@ NymeaToolTip { property Thing thing: null property NewLogEntry entry: null property string valueName: "" + property alias iconSource: icon.name property alias color: rect.color property ValueAxis axis: null property int unit: Types.UnitNone @@ -29,10 +30,18 @@ NymeaToolTip { anchors.fill: parent anchors.margins: Style.smallMargins + ColorIcon { + id: icon + size: Style.smallIconSize + color: root.color + visible: name != "" + } + Rectangle { id: rect width: Style.extraSmallFont.pixelSize height: width + visible: !icon.visible } Label { text: "%1: %2%3".arg(thing.name).arg(entry ? round(Types.toUiValue(root.value, unit)) : "-").arg(Types.toUiUnit(unit))