From 6c0b3cb58c409dc723008c95c644b4a44f2ab54e Mon Sep 17 00:00:00 2001 From: crschnick Date: Sun, 14 Apr 2024 00:58:11 +0000 Subject: [PATCH] Various fixes --- app/src/main/java/io/xpipe/app/comp/store/StoreSortMode.java | 4 ++-- lang/base/strings/translations_de.properties | 3 ++- lang/proc/strings/translations_de.properties | 1 + lang/proc/strings/translations_en.properties | 1 + lang/proc/strings/translations_es.properties | 1 + lang/proc/strings/translations_fr.properties | 1 + lang/proc/strings/translations_it.properties | 1 + lang/proc/strings/translations_ja.properties | 1 + lang/proc/strings/translations_nl.properties | 1 + lang/proc/strings/translations_pt.properties | 1 + lang/proc/strings/translations_ru.properties | 1 + lang/proc/strings/translations_tr.properties | 1 + lang/proc/strings/translations_zh.properties | 1 + 13 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreSortMode.java b/app/src/main/java/io/xpipe/app/comp/store/StoreSortMode.java index 63138121b..c779367ac 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreSortMode.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreSortMode.java @@ -49,7 +49,7 @@ public interface StoreSortMode { StoreSortMode DATE_DESC = new StoreSortMode() { @Override public StoreSection representative(StoreSection s) { - return Stream.concat(s.getShownChildren().stream().map(this::representative), Stream.of(s)) + return Stream.concat(s.getShownChildren().stream().filter(section -> section.getWrapper().getEntry().getValidity().isUsable()).map(this::representative), Stream.of(s)) .max(Comparator.comparing( section -> section.getWrapper().getEntry().getLastAccess())) .orElseThrow(); @@ -70,7 +70,7 @@ public interface StoreSortMode { StoreSortMode DATE_ASC = new StoreSortMode() { @Override public StoreSection representative(StoreSection s) { - return Stream.concat(s.getShownChildren().stream().map(this::representative), Stream.of(s)) + return Stream.concat(s.getShownChildren().stream().filter(section -> section.getWrapper().getEntry().getValidity().isUsable()).map(this::representative), Stream.of(s)) .max(Comparator.comparing( section -> section.getWrapper().getEntry().getLastAccess())) .orElseThrow(); diff --git a/lang/base/strings/translations_de.properties b/lang/base/strings/translations_de.properties index dd73d93ad..bd7f3f3b5 100644 --- a/lang/base/strings/translations_de.properties +++ b/lang/base/strings/translations_de.properties @@ -21,7 +21,8 @@ newDirectory=Neues Verzeichnis copyShareLink=Link kopieren selectStore=Laden auswählen saveSource=Für später speichern -execute=Führen Sie aus +#custom +execute=Ausführen deleteChildren=Alle Kinder entfernen descriptionDescription=Gib dieser Gruppe eine optionale Beschreibung selectSource=Quelle auswählen diff --git a/lang/proc/strings/translations_de.properties b/lang/proc/strings/translations_de.properties index d62c91068..dbf6a0e4f 100644 --- a/lang/proc/strings/translations_de.properties +++ b/lang/proc/strings/translations_de.properties @@ -299,3 +299,4 @@ openInWSL=In WSL öffnen launch=Starten sshTrustKeyHeader=Der Hostschlüssel ist nicht bekannt und du hast die manuelle Überprüfung des Hostschlüssels aktiviert. sshTrustKeyTitle=Unbekannter Host-Schlüssel +vnc=VNC-Verbindungen diff --git a/lang/proc/strings/translations_en.properties b/lang/proc/strings/translations_en.properties index e5e342b23..f28f3afd2 100644 --- a/lang/proc/strings/translations_en.properties +++ b/lang/proc/strings/translations_en.properties @@ -298,3 +298,4 @@ openInWSL=Open in WSL launch=Launch sshTrustKeyHeader=The host key is not known, and you have enabled manual host key verification. sshTrustKeyTitle=Unknown host key +vnc=VNC connections diff --git a/lang/proc/strings/translations_es.properties b/lang/proc/strings/translations_es.properties index 37b236b67..db64cf3d4 100644 --- a/lang/proc/strings/translations_es.properties +++ b/lang/proc/strings/translations_es.properties @@ -297,3 +297,4 @@ openInWSL=Abrir en WSL launch=Inicia sshTrustKeyHeader=No se conoce la clave del host y has activado la verificación manual de la clave del host. sshTrustKeyTitle=Clave de host desconocida +vnc=Conexiones VNC diff --git a/lang/proc/strings/translations_fr.properties b/lang/proc/strings/translations_fr.properties index 10319a1a1..ed7aa11db 100644 --- a/lang/proc/strings/translations_fr.properties +++ b/lang/proc/strings/translations_fr.properties @@ -297,3 +297,4 @@ openInWSL=Ouvrir en WSL launch=Lancer sshTrustKeyHeader=La clé de l'hôte n'est pas connue et tu as activé la vérification manuelle de la clé de l'hôte. sshTrustKeyTitle=Clé d'hôte inconnue +vnc=Connexions VNC diff --git a/lang/proc/strings/translations_it.properties b/lang/proc/strings/translations_it.properties index 33b8b60b2..aa45aa490 100644 --- a/lang/proc/strings/translations_it.properties +++ b/lang/proc/strings/translations_it.properties @@ -297,3 +297,4 @@ openInWSL=Aprire in WSL launch=Lancio sshTrustKeyHeader=La chiave host non è nota e hai attivato la verifica manuale della chiave host. sshTrustKeyTitle=Chiave host sconosciuta +vnc=Connessioni VNC diff --git a/lang/proc/strings/translations_ja.properties b/lang/proc/strings/translations_ja.properties index cb25ce436..1959e2006 100644 --- a/lang/proc/strings/translations_ja.properties +++ b/lang/proc/strings/translations_ja.properties @@ -297,3 +297,4 @@ openInWSL=WSLで開く launch=起動 sshTrustKeyHeader=ホスト鍵が不明で、手動ホスト鍵検証を有効にしている。 sshTrustKeyTitle=不明なホストキー +vnc=VNC接続 diff --git a/lang/proc/strings/translations_nl.properties b/lang/proc/strings/translations_nl.properties index 1eb2c59a6..deab1bacb 100644 --- a/lang/proc/strings/translations_nl.properties +++ b/lang/proc/strings/translations_nl.properties @@ -297,3 +297,4 @@ openInWSL=Openen in WSL launch=Start sshTrustKeyHeader=De hostsleutel is niet bekend en je hebt handmatige hostsleutelverificatie ingeschakeld. sshTrustKeyTitle=Onbekende hostsleutel +vnc=VNC-verbindingen diff --git a/lang/proc/strings/translations_pt.properties b/lang/proc/strings/translations_pt.properties index 810939630..898089038 100644 --- a/lang/proc/strings/translations_pt.properties +++ b/lang/proc/strings/translations_pt.properties @@ -297,3 +297,4 @@ openInWSL=Abre em WSL launch=Lança sshTrustKeyHeader=A chave do anfitrião não é conhecida e activaste a verificação manual da chave do anfitrião. sshTrustKeyTitle=Chave de anfitrião desconhecida +vnc=Ligações VNC diff --git a/lang/proc/strings/translations_ru.properties b/lang/proc/strings/translations_ru.properties index 62b0995cd..e19f8986a 100644 --- a/lang/proc/strings/translations_ru.properties +++ b/lang/proc/strings/translations_ru.properties @@ -297,3 +297,4 @@ openInWSL=Открыть в WSL launch=Запустите sshTrustKeyHeader=Ключ хоста неизвестен, и ты включил ручную проверку ключа хоста. sshTrustKeyTitle=Неизвестный ключ хоста +vnc=VNC-соединения diff --git a/lang/proc/strings/translations_tr.properties b/lang/proc/strings/translations_tr.properties index c796da1ed..d99b551e8 100644 --- a/lang/proc/strings/translations_tr.properties +++ b/lang/proc/strings/translations_tr.properties @@ -297,3 +297,4 @@ openInWSL=WSL'de Açık launch=Fırlatma sshTrustKeyHeader=Ana bilgisayar anahtarı bilinmiyor ve manuel ana bilgisayar anahtarı doğrulamasını etkinleştirdiniz. sshTrustKeyTitle=Bilinmeyen ana bilgisayar anahtarı +vnc=VNC bağlantıları diff --git a/lang/proc/strings/translations_zh.properties b/lang/proc/strings/translations_zh.properties index d8762e0c1..39082db95 100644 --- a/lang/proc/strings/translations_zh.properties +++ b/lang/proc/strings/translations_zh.properties @@ -297,3 +297,4 @@ openInWSL=在 WSL 中打开 launch=启动 sshTrustKeyHeader=主机密钥未知，您已启用手动主机密钥验证。 sshTrustKeyTitle=未知主机密钥 +vnc=VNC 连接