From 7aa3123b173fc48649d2780ed90852bcb7e793ab Mon Sep 17 00:00:00 2001 From: crschnick Date: Mon, 24 Aug 2026 15:36:41 +0000 Subject: [PATCH] Rework --- .../main/java/io/xpipe/app/core/check/AppPtbDialog.java | 8 ++------ app/src/main/java/io/xpipe/app/process/ShellDialect.java | 2 ++ dist/changelog/24.0.md | 1 + lang/strings/translations_da.properties | 3 ++- lang/strings/translations_de.properties | 3 ++- lang/strings/translations_en.properties | 3 ++- lang/strings/translations_es.properties | 3 ++- lang/strings/translations_fr.properties | 3 ++- lang/strings/translations_id.properties | 3 ++- lang/strings/translations_it.properties | 3 ++- lang/strings/translations_ja.properties | 3 ++- lang/strings/translations_ko.properties | 3 ++- lang/strings/translations_nl.properties | 3 ++- lang/strings/translations_pl.properties | 3 ++- lang/strings/translations_pt.properties | 3 ++- lang/strings/translations_ru.properties | 3 ++- lang/strings/translations_sv.properties | 3 ++- lang/strings/translations_tr.properties | 3 ++- lang/strings/translations_vi.properties | 3 ++- lang/strings/translations_zh-Hans.properties | 4 ++-- lang/strings/translations_zh-Hant.properties | 3 ++- 21 files changed, 41 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/core/check/AppPtbDialog.java b/app/src/main/java/io/xpipe/app/core/check/AppPtbDialog.java index 26a91831f..0af38de88 100644 --- a/app/src/main/java/io/xpipe/app/core/check/AppPtbDialog.java +++ b/app/src/main/java/io/xpipe/app/core/check/AppPtbDialog.java @@ -20,12 +20,8 @@ public class AppPtbDialog { return; } - var content = AppDialog.dialogText( - "You are running a PTB build of XPipe." + " This version is unstable and might contain bugs." - + " You should not use it as a daily driver." - + " It will also not receive regular updates after its testing period." - + " You will have to install and launch the normal XPipe release for that."); - var modal = ModalOverlay.of("ptbNotice", content); + var content = AppDialog.dialogTextKey("ptbNoticeContent"); + var modal = ModalOverlay.of("ptbNoticeTitle", content); modal.persist(); modal.addButton(ModalButton.quit()); modal.addButton(ModalButton.ok()); diff --git a/app/src/main/java/io/xpipe/app/process/ShellDialect.java b/app/src/main/java/io/xpipe/app/process/ShellDialect.java index 67f36d829..91c7f89db 100644 --- a/app/src/main/java/io/xpipe/app/process/ShellDialect.java +++ b/app/src/main/java/io/xpipe/app/process/ShellDialect.java @@ -74,6 +74,8 @@ public interface ShellDialect { String addToPathVariableCommand(List entries, boolean append); + String formatError(String err); + default String applyInitFileCommand(ShellControl sc) throws Exception { return null; } diff --git a/dist/changelog/24.0.md b/dist/changelog/24.0.md index b86c0f7eb..d8b75f505 100644 --- a/dist/changelog/24.0.md +++ b/dist/changelog/24.0.md @@ -139,6 +139,7 @@ The latest release of the [apple container runtime](https://github.com/apple/con - Serial connections now also support being assigned to abstract hosts - Add option to reinstall XPipe on Windows if an incremental update fails - There is now a setting for controlling NO_PROXY for a configured http proxy +- The updater on Linux and macOS will now relaunch XPipe in the correct workspace - Fix various rendering performance issues diff --git a/lang/strings/translations_da.properties b/lang/strings/translations_da.properties index e4df250b0..638749977 100644 --- a/lang/strings/translations_da.properties +++ b/lang/strings/translations_da.properties @@ -538,7 +538,8 @@ loadingSettings=Indlæser indstillinger loadingConnections=Indlæsning af forbindelser unlockingVault=Låse pengeskabet op loadingUserInterface=Indlæsning af brugergrænseflade -ptbNotice=Meddelelse om den offentlige testversion +ptbNoticeTitle=Meddelelse om den offentlige testversion +ptbNoticeContent=Du kører en PTB-version af XPipe. Denne version er ustabil og kan indeholde fejl. Du bør ikke bruge den som din daglige drivrutine. Den vil heller ikke modtage regelmæssige opdateringer efter testperioden. Til det formål skal du installere og starte den normale XPipe-udgave. userDeletionTitle=Sletning af bruger userDeletionContent=Vil du slette denne Vault-bruger? Dette vil genkryptere alle data ved hjælp af standard-Vault-nøglen. Det vil tage et stykke tid. roleDeletionTitle=Sletning af rolle diff --git a/lang/strings/translations_de.properties b/lang/strings/translations_de.properties index 40f7b1bab..d07f0476e 100644 --- a/lang/strings/translations_de.properties +++ b/lang/strings/translations_de.properties @@ -549,7 +549,8 @@ loadingSettings=Einstellungen werden geladen loadingConnections=Verbindungen werden geladen unlockingVault=Tresor entsperren loadingUserInterface=Benutzeroberfläche wird geladen -ptbNotice=Hinweis zur öffentlichen Testversion +ptbNoticeTitle=Hinweis zur öffentlichen Testversion +ptbNoticeContent=Du nutzt eine PTB-Version von XPipe. Diese Version ist instabil und kann Fehler enthalten. Du solltest sie nicht als alltägliche Arbeitsumgebung verwenden. Nach der Testphase wird es auch keine regelmäßigen Updates mehr dafür geben. Dafür musst du die normale XPipe-Version installieren und starten. userDeletionTitle=Benutzer löschen userDeletionContent=Möchtest du diesen Tresorbenutzer löschen? Dadurch werden alle Daten mit dem Standard-Tresorschlüssel neu verschlüsselt. Das wird eine Weile dauern. roleDeletionTitle=Rolle löschen diff --git a/lang/strings/translations_en.properties b/lang/strings/translations_en.properties index e4afb3628..5340541e7 100644 --- a/lang/strings/translations_en.properties +++ b/lang/strings/translations_en.properties @@ -556,7 +556,8 @@ loadingSettings=Loading settings loadingConnections=Loading connections unlockingVault=Unlocking vault loadingUserInterface=Loading user interface -ptbNotice=Notice for the public test build +ptbNoticeTitle=Notice for the public test build +ptbNoticeContent=You are running a PTB build of XPipe. This version is unstable and might contain bugs. You should not use it as a daily driver. It will also not receive regular updates after its testing period. You will have to install and launch the normal XPipe release for that. userDeletionTitle=User deletion userDeletionContent=Do you want to delete this vault user? This will reencrypt all data using the default vault key. This will take a while. roleDeletionTitle=Role deletion diff --git a/lang/strings/translations_es.properties b/lang/strings/translations_es.properties index 196c7f67d..161b80e38 100644 --- a/lang/strings/translations_es.properties +++ b/lang/strings/translations_es.properties @@ -529,7 +529,8 @@ loadingSettings=Cargando la configuración loadingConnections=Cargando conexiones unlockingVault=Abrir la caja fuerte loadingUserInterface=Cargando la interfaz de usuario -ptbNotice=Aviso sobre la versión de prueba pública +ptbNoticeTitle=Aviso sobre la versión de prueba pública +ptbNoticeContent=Estás ejecutando una versión PTB de XPipe. Esta versión es inestable y puede contener errores. No deberías usarla a diario. Además, no recibirá actualizaciones periódicas una vez finalizado el periodo de pruebas. Para eso, tendrás que instalar y ejecutar la versión normal de XPipe. userDeletionTitle=Eliminación de un usuario userDeletionContent=¿Quieres eliminar este usuario de la caja fuerte? Esto volvería a cifrar todos los datos utilizando la clave predeterminada de la caja fuerte. Tardará un rato. roleDeletionTitle=Eliminación de un rol diff --git a/lang/strings/translations_fr.properties b/lang/strings/translations_fr.properties index b3f1b5748..d08a7309c 100644 --- a/lang/strings/translations_fr.properties +++ b/lang/strings/translations_fr.properties @@ -541,7 +541,8 @@ loadingSettings=Chargement des paramètres loadingConnections=Chargement des connexions unlockingVault=Déverrouillage du coffre-fort loadingUserInterface=Chargement de l'interface utilisateur -ptbNotice=Avis concernant la version de test publique +ptbNoticeTitle=Avis concernant la version de test publique +ptbNoticeContent=Tu utilises une version PTB d'XPipe. Cette version est instable et peut contenir des bugs. Tu ne devrais pas l'utiliser au quotidien. Elle ne bénéficiera pas non plus de mises à jour régulières après sa période de test. Pour ça, tu devras installer et lancer la version normale d'XPipe. userDeletionTitle=Suppression d'un utilisateur userDeletionContent=Tu veux supprimer cet utilisateur du coffre-fort ? Ça va rechiffrer toutes les données avec la clé par défaut du coffre-fort. Ça va prendre un peu de temps. roleDeletionTitle=Suppression d'un rôle diff --git a/lang/strings/translations_id.properties b/lang/strings/translations_id.properties index e8b1d1339..1659d4961 100644 --- a/lang/strings/translations_id.properties +++ b/lang/strings/translations_id.properties @@ -529,7 +529,8 @@ loadingSettings=Memuat pengaturan loadingConnections=Memuat koneksi unlockingVault=Membuka brankas loadingUserInterface=Memuat antarmuka pengguna -ptbNotice=Pemberitahuan mengenai versi uji coba publik +ptbNoticeTitle=Pengumuman mengenai versi uji coba publik +ptbNoticeContent=Anda sedang menjalankan versi PTB dari XPipe. Versi ini tidak stabil dan mungkin mengandung bug. Anda sebaiknya tidak menggunakannya sebagai aplikasi harian. Versi ini juga tidak akan menerima pembaruan rutin setelah masa pengujiannya berakhir. Untuk itu, Anda harus menginstal dan menjalankan rilis XPipe yang normal. userDeletionTitle=Penghapusan pengguna userDeletionContent=Apakah Anda ingin menghapus pengguna vault ini? Tindakan ini akan mengenkripsi ulang semua data menggunakan kunci vault default. Proses ini akan memakan waktu cukup lama. roleDeletionTitle=Penghapusan peran diff --git a/lang/strings/translations_it.properties b/lang/strings/translations_it.properties index f8e10476d..c48d26971 100644 --- a/lang/strings/translations_it.properties +++ b/lang/strings/translations_it.properties @@ -529,7 +529,8 @@ loadingSettings=Caricamento delle impostazioni loadingConnections=Caricamento delle connessioni unlockingVault=Sblocco del caveau loadingUserInterface=Caricamento dell'interfaccia utente -ptbNotice=Avviso relativo alla versione di prova pubblica +ptbNoticeTitle=Avviso relativo alla versione di prova pubblica +ptbNoticeContent=Stai utilizzando una build PTB di XPipe. Questa versione è instabile e potrebbe contenere bug. Non dovresti usarla come versione principale. Inoltre, non riceverà aggiornamenti regolari dopo il periodo di test. Per questo dovrai installare e avviare la versione normale di XPipe. userDeletionTitle=Cancellazione di un utente userDeletionContent=Vuoi eliminare questo utente del vault? Questa operazione crittograferà nuovamente tutti i dati utilizzando la chiave predefinita del vault. Ci vorrà un po' di tempo. roleDeletionTitle=Eliminazione di un ruolo diff --git a/lang/strings/translations_ja.properties b/lang/strings/translations_ja.properties index c7a472da9..f9f6a76cb 100644 --- a/lang/strings/translations_ja.properties +++ b/lang/strings/translations_ja.properties @@ -529,7 +529,8 @@ loadingSettings=設定を読み込み中 loadingConnections=接続の読み込み中 unlockingVault=金庫のロック解除 loadingUserInterface=ユーザーインターフェースの読み込み中 -ptbNotice=パブリックテストビルドに関するお知らせ +ptbNoticeTitle=パブリックテストビルドに関するお知らせ +ptbNoticeContent=現在、XPipeのPTBビルドを実行している。このバージョンは不安定であり、バグが含まれている可能性がある。日常的な用途には使用すべきではない。また、テスト期間終了後は定期的な更新も行われない。日常的な用途には、通常のXPipeリリースをインストールして起動する必要がある。 userDeletionTitle=ユーザーの削除 userDeletionContent=このVaultユーザーを削除してもよいか？ これにより、すべてのデータがデフォルトのVaultキーを使用して再暗号化される。これにはしばらく時間がかかる。 roleDeletionTitle=ロールの削除 diff --git a/lang/strings/translations_ko.properties b/lang/strings/translations_ko.properties index 3547fc47d..bb26f2764 100644 --- a/lang/strings/translations_ko.properties +++ b/lang/strings/translations_ko.properties @@ -553,7 +553,8 @@ loadingSettings=설정 불러오기 loadingConnections=연결 불러오기 unlockingVault=금고 잠금 해제 loadingUserInterface=사용자 인터페이스 로딩 중 -ptbNotice=공개 테스트 빌드에 대한 공지 +ptbNoticeTitle=공개 테스트 빌드에 대한 공지 +ptbNoticeContent=현재 XPipe의 PTB 빌드를 실행 중입니다. 이 버전은 불안정하며 버그가 포함될 수 있습니다. 일상적인 용도로 사용해서는 안 됩니다. 또한 테스트 기간이 끝나면 정기적인 업데이트를 받을 수 없습니다. 정기적인 업데이트를 받으려면 일반 XPipe 정식 버전을 설치하여 실행해야 합니다. userDeletionTitle=사용자 삭제 userDeletionContent=이 볼트 사용자를 삭제하시겠습니까? 이 작업을 수행하면 모든 데이터가 기본 볼트 키를 사용하여 다시 암호화됩니다. 이 작업에는 다소 시간이 소요됩니다. roleDeletionTitle=역할 삭제 diff --git a/lang/strings/translations_nl.properties b/lang/strings/translations_nl.properties index d53f86d41..8dbd0731f 100644 --- a/lang/strings/translations_nl.properties +++ b/lang/strings/translations_nl.properties @@ -529,7 +529,8 @@ loadingSettings=Instellingen laden loadingConnections=Verbindingen laden unlockingVault=De kluis ontgrendelen loadingUserInterface=De gebruikersinterface wordt geladen -ptbNotice=Mededeling over de openbare testversie +ptbNoticeTitle=Mededeling over de openbare testversie +ptbNoticeContent=Je gebruikt een PTB-build van XPipe. Deze versie is onstabiel en kan fouten bevatten. Je moet hem niet als dagelijkse versie gebruiken. Na de testperiode krijg je ook geen regelmatige updates meer. Daarvoor moet je de normale versie van XPipe installeren en starten. userDeletionTitle=Gebruiker verwijderen userDeletionContent=Wil je deze kluisgebruiker verwijderen? Hierdoor worden alle gegevens opnieuw versleuteld met de standaard kluissleutel. Dit duurt even. roleDeletionTitle=Een rol verwijderen diff --git a/lang/strings/translations_pl.properties b/lang/strings/translations_pl.properties index 8f77f2bde..b91814057 100644 --- a/lang/strings/translations_pl.properties +++ b/lang/strings/translations_pl.properties @@ -529,7 +529,8 @@ loadingSettings=Ładowanie ustawień loadingConnections=Ładowanie połączeń unlockingVault=Odblokowanie sejfu loadingUserInterface=Ładowanie interfejsu użytkownika -ptbNotice=Informacja o publicznej wersji testowej +ptbNoticeTitle=Informacja o publicznej wersji testowej +ptbNoticeContent=Używasz wersji XPipe z PTB. Ta wersja jest niestabilna i może zawierać błędy. Nie powinieneś jej używać na co dzień. Po zakończeniu okresu testowego nie będzie też regularnie aktualizowana. W tym celu będziesz musiał zainstalować i uruchomić standardową wersję XPipe. userDeletionTitle=Usunięcie użytkownika userDeletionContent=Chcesz usunąć tego użytkownika sejfu? Spowoduje to ponowne zaszyfrowanie wszystkich danych przy użyciu domyślnego klucza sejfu. To trochę potrwa. roleDeletionTitle=Usunięcie roli diff --git a/lang/strings/translations_pt.properties b/lang/strings/translations_pt.properties index caa5c08ed..e0cc19c69 100644 --- a/lang/strings/translations_pt.properties +++ b/lang/strings/translations_pt.properties @@ -529,7 +529,8 @@ loadingSettings=A carregar as definições loadingConnections=A carregar ligações unlockingVault=Desbloquear o cofre loadingUserInterface=A carregar a interface do utilizador -ptbNotice=Aviso sobre a versão de teste pública +ptbNoticeTitle=Aviso sobre a versão de teste pública +ptbNoticeContent=Estás a utilizar uma versão PTB do XPipe. Esta versão é instável e pode conter erros. Não a deves utilizar no dia a dia. Além disso, não receberá atualizações regulares após o período de testes. Para isso, terás de instalar e iniciar a versão normal do XPipe. userDeletionTitle=Eliminação de utilizador userDeletionContent=Queres eliminar este utilizador do cofre? Isto vai encriptar novamente todos os dados usando a chave padrão do cofre. Isto vai demorar algum tempo. roleDeletionTitle=Eliminação de funções diff --git a/lang/strings/translations_ru.properties b/lang/strings/translations_ru.properties index 0ebc9b7be..b612c0416 100644 --- a/lang/strings/translations_ru.properties +++ b/lang/strings/translations_ru.properties @@ -576,7 +576,8 @@ loadingSettings=Загрузка настроек loadingConnections=Загрузка подключений unlockingVault=Разблокировка хранилища loadingUserInterface=Загрузка пользовательского интерфейса -ptbNotice=Уведомление о публичной тестовой сборке +ptbNoticeTitle=Уведомление о публичной тестовой сборке +ptbNoticeContent=Ты используешь сборку XPipe из PTB. Эта версия нестабильна и может содержать ошибки. Не стоит использовать её в повседневной работе. Кроме того, после завершения периода тестирования она больше не будет получать регулярные обновления. Для этого тебе придётся установить и запустить обычную версию XPipe. userDeletionTitle=Удаление пользователя userDeletionContent=Хочешь удалить этого пользователя хранилища? При этом все данные будут заново зашифрованы с использованием ключа хранилища по умолчанию. Это займет некоторое время. roleDeletionTitle=Удаление роли diff --git a/lang/strings/translations_sv.properties b/lang/strings/translations_sv.properties index dcb9eb6d5..49bf43e8d 100644 --- a/lang/strings/translations_sv.properties +++ b/lang/strings/translations_sv.properties @@ -529,7 +529,8 @@ loadingSettings=Laddar inställningar loadingConnections=Laddar anslutningar unlockingVault=Låsa upp valvet loadingUserInterface=Laddar användargränssnittet -ptbNotice=Meddelande om den offentliga testversionen +ptbNoticeTitle=Meddelande om den offentliga testversionen +ptbNoticeContent=Du kör en PTB-version av XPipe. Denna version är instabil och kan innehålla buggar. Du bör inte använda den som din huvudsakliga version. Den kommer inte heller att få regelbundna uppdateringar efter testperioden. För det måste du installera och starta den vanliga versionen av XPipe. userDeletionTitle=Borttagning av användare userDeletionContent=Vill du ta bort den här valv-användaren? Detta kommer att kryptera om all data med standardnyckeln för valvet. Det kommer att ta en stund. roleDeletionTitle=Radering av roll diff --git a/lang/strings/translations_tr.properties b/lang/strings/translations_tr.properties index b2c50ee58..a49e20fbf 100644 --- a/lang/strings/translations_tr.properties +++ b/lang/strings/translations_tr.properties @@ -529,7 +529,8 @@ loadingSettings=Ayarlar yükleniyor loadingConnections=Bağlantılar yükleniyor unlockingVault=Kasayı açma loadingUserInterface=Kullanıcı arayüzü yükleniyor -ptbNotice=Halka açık test sürümüyle ilgili duyuru +ptbNoticeTitle=Halka açık test sürümüyle ilgili duyuru +ptbNoticeContent=XPipe'ın PTB sürümünü kullanıyorsunuz. Bu sürüm kararsızdır ve hatalar içerebilir. Günlük kullanım için bu sürümü kullanmamalısınız. Ayrıca, test süresi sona erdikten sonra düzenli güncellemeler almayacaktır. Bunun için normal XPipe sürümünü yüklemeniz ve çalıştırmanız gerekecektir. userDeletionTitle=Kullanıcı silme userDeletionContent=Bu kasa kullanıcısını silmek istiyor musunuz? Bu işlem, tüm verileri varsayılan kasa anahtarı kullanılarak yeniden şifreleyecektir. Bu işlem biraz zaman alacaktır. roleDeletionTitle=Rol silme diff --git a/lang/strings/translations_vi.properties b/lang/strings/translations_vi.properties index 29d85edf3..0f8b496ea 100644 --- a/lang/strings/translations_vi.properties +++ b/lang/strings/translations_vi.properties @@ -529,7 +529,8 @@ loadingSettings=Đang tải cài đặt loadingConnections=Đang tải các kết nối unlockingVault=Mở khóa kho loadingUserInterface=Đang tải giao diện người dùng -ptbNotice=Thông báo về bản thử nghiệm công khai +ptbNoticeTitle=Thông báo về bản thử nghiệm công khai +ptbNoticeContent=Cậu đang chạy bản dựng PTB của XPipe. Phiên bản này chưa ổn định và có thể chứa lỗi. Cậu không nên dùng nó như một công cụ chính hàng ngày. Ngoài ra, nó cũng sẽ không nhận được các bản cập nhật định kỳ sau giai đoạn thử nghiệm. Để có được điều đó, cậu sẽ phải cài đặt và khởi chạy bản phát hành chính thức của XPipe. userDeletionTitle=Xóa người dùng userDeletionContent=Cậu có muốn xóa người dùng kho này không? Thao tác này sẽ mã hóa lại toàn bộ dữ liệu bằng khóa kho mặc định. Quá trình này sẽ mất một lúc đấy. roleDeletionTitle=Xóa vai trò diff --git a/lang/strings/translations_zh-Hans.properties b/lang/strings/translations_zh-Hans.properties index f34c0ce82..e197e0974 100644 --- a/lang/strings/translations_zh-Hans.properties +++ b/lang/strings/translations_zh-Hans.properties @@ -738,8 +738,8 @@ loadingConnections=加载连接中... unlockingVault=解锁保险库 #custom loadingUserInterface=正在加载用户界面... -#custom -ptbNotice=公测版通知 +ptbNoticeTitle=关于公开测试版的公告 +ptbNoticeContent=您正在运行 XPipe 的 PTB 版本。该版本不稳定，可能存在漏洞。请勿将其作为日常使用的版本。此外，该版本在测试期结束后将不再获得定期更新。如需获得定期更新，您需要安装并运行 XPipe 的常规正式版。 #custom userDeletionTitle=删除用户 #custom diff --git a/lang/strings/translations_zh-Hant.properties b/lang/strings/translations_zh-Hant.properties index af5948419..3ea8af233 100644 --- a/lang/strings/translations_zh-Hant.properties +++ b/lang/strings/translations_zh-Hant.properties @@ -529,7 +529,8 @@ loadingSettings=載入設定 loadingConnections=載入連線 unlockingVault=解鎖保險庫 loadingUserInterface=載入使用者介面 -ptbNotice=關於公開測試版本的公告 +ptbNoticeTitle=關於公開測試版本的公告 +ptbNoticeContent=您目前正在執行 XPipe 的 PTB 版本。此版本不穩定，可能包含錯誤。請勿將其用作日常主要程式。此外，此版本在測試期結束後將不再獲得定期更新。若需此類更新，您必須安裝並執行 XPipe 的正式發行版。 userDeletionTitle=刪除使用者 userDeletionContent=您要刪除此金庫使用者嗎？此操作將使用預設金庫金鑰重新加密所有資料。此過程將耗費一段時間。 roleDeletionTitle=刪除角色