diff --git a/app/src/main/java/io/xpipe/app/core/check/AppHomebrewCoreutilsCheck.java b/app/src/main/java/io/xpipe/app/core/check/AppHomebrewCoreutilsCheck.java index ec12429e4..8a8e91b8b 100644 --- a/app/src/main/java/io/xpipe/app/core/check/AppHomebrewCoreutilsCheck.java +++ b/app/src/main/java/io/xpipe/app/core/check/AppHomebrewCoreutilsCheck.java @@ -29,7 +29,6 @@ public class AppHomebrewCoreutilsCheck { ErrorEvent.fromMessage("You have the homebrew coreutils package installed and added to your PATH." + " The coreutils commands overwrite and are incompatible to the native macOS commands, which XPipe expects." + " Please remove the coreutils commands from your PATH prior to launching XPipe.") - .noDefaultActions() .term() .handle(); } diff --git a/app/src/main/java/io/xpipe/app/issue/ErrorHandlerComp.java b/app/src/main/java/io/xpipe/app/issue/ErrorHandlerComp.java index 98a590078..1513c9414 100644 --- a/app/src/main/java/io/xpipe/app/issue/ErrorHandlerComp.java +++ b/app/src/main/java/io/xpipe/app/issue/ErrorHandlerComp.java @@ -201,6 +201,10 @@ public class ErrorHandlerComp extends SimpleComp { } desc = desc.trim(); + if (event.isTerminal()) { + desc = desc + "\n\n" + AppI18n.get("terminalErrorDescription"); + } + var graphic = new FontIcon("mdomz-warning"); graphic.setIconColor(Color.RED); diff --git a/dist/changelogs/13.1_incremental.md b/dist/changelogs/13.1_incremental.md index ca86c73a3..4018353a7 100644 --- a/dist/changelogs/13.1_incremental.md +++ b/dist/changelogs/13.1_incremental.md @@ -2,6 +2,8 @@ - Add pin tab button to the file browser menu bar to make tab splitting more prominent - Add file browser setting to automatically start up with local machine tab pinned - Add download context menu action in file browser as an alternative to dragging files to the download box +- Add warning message when the incompatible coreutils homebrew package is in the PATH on macOS +- Fix git sync failing when it required a password prompt - Fix proxmox detection not working when not using the PVE distro and not logging in as root - Fix startup check for user directory permissions not working - Fix various small bugs diff --git a/lang/app/strings/translations_da.properties b/lang/app/strings/translations_da.properties index 064f625db..4c8c44e0d 100644 --- a/lang/app/strings/translations_da.properties +++ b/lang/app/strings/translations_da.properties @@ -556,3 +556,4 @@ downloadsDirectory=Brugerdefineret download-mappe downloadsDirectoryDescription=Den brugerdefinerede mappe, som downloadede filer skal placeres i, når man klikker på knappen Flyt til downloads. Som standard vil XPipe bruge din brugers download-bibliotek. pinLocalMachineOnStartup=Fastgør fane for lokal maskine ved opstart pinLocalMachineOnStartupDescription=Åbn automatisk en fane på den lokale maskine og fastgør den. Det er nyttigt, hvis du ofte bruger en delt filbrowser med den lokale maskine og fjernfilsystemet åbent. +terminalErrorDescription=Denne fejl er terminal, og XPipe kan ikke fortsætte uden at løse den. diff --git a/lang/app/strings/translations_de.properties b/lang/app/strings/translations_de.properties index 495b8bf90..55b7f0729 100644 --- a/lang/app/strings/translations_de.properties +++ b/lang/app/strings/translations_de.properties @@ -550,3 +550,4 @@ downloadsDirectory=Benutzerdefiniertes Download-Verzeichnis downloadsDirectoryDescription=Das benutzerdefinierte Verzeichnis, in das heruntergeladene Dateien verschoben werden sollen, wenn du auf die Schaltfläche In Downloads verschieben klickst. Standardmäßig verwendet XPipe dein Benutzer-Download-Verzeichnis. pinLocalMachineOnStartup=Registerkarte "Lokaler Rechner" beim Starten anheften pinLocalMachineOnStartupDescription=Öffne automatisch eine Registerkarte für den lokalen Rechner und pinne sie an. Dies ist nützlich, wenn du häufig einen geteilten Dateibrowser verwendest, bei dem der lokale Rechner und das entfernte Dateisystem geöffnet sind. +terminalErrorDescription=Dieser Fehler ist terminal und XPipe kann nicht weiterarbeiten, ohne ihn zu beheben. diff --git a/lang/app/strings/translations_en.properties b/lang/app/strings/translations_en.properties index 8812a20ba..5273ab3b1 100644 --- a/lang/app/strings/translations_en.properties +++ b/lang/app/strings/translations_en.properties @@ -555,4 +555,5 @@ enableTerminalDockingDescription=With terminal docking you can dock terminal win downloadsDirectory=Custom downloads directory downloadsDirectoryDescription=The custom directory to put downloaded files into when clicking on the move to downloads button. By default, XPipe will use your user downloads directory. pinLocalMachineOnStartup=Pin local machine tab on startup -pinLocalMachineOnStartupDescription=Automatically open a local machine tab and pin it. This is useful if you are frequently using a split file browser with the local machine and remote file system open. \ No newline at end of file +pinLocalMachineOnStartupDescription=Automatically open a local machine tab and pin it. This is useful if you are frequently using a split file browser with the local machine and remote file system open. +terminalErrorDescription=This error is terminal and XPipe can't continue without fixing it. diff --git a/lang/app/strings/translations_es.properties b/lang/app/strings/translations_es.properties index 7a4aa3ce3..d26884e66 100644 --- a/lang/app/strings/translations_es.properties +++ b/lang/app/strings/translations_es.properties @@ -537,3 +537,4 @@ downloadsDirectory=Directorio de descargas personalizado downloadsDirectoryDescription=El directorio personalizado en el que colocar los archivos descargados al pulsar el botón mover a descargas. Por defecto, XPipe utilizará tu directorio de descargas de usuario. pinLocalMachineOnStartup=Fijar la pestaña de máquina local al iniciar pinLocalMachineOnStartupDescription=Abre automáticamente una pestaña de la máquina local y fíjala. Esto es útil si utilizas con frecuencia un explorador de archivos dividido con la máquina local y el sistema de archivos remoto abiertos. +terminalErrorDescription=Este error es terminal y XPipe no puede continuar sin solucionarlo. diff --git a/lang/app/strings/translations_fr.properties b/lang/app/strings/translations_fr.properties index eb01ea470..52b23ab21 100644 --- a/lang/app/strings/translations_fr.properties +++ b/lang/app/strings/translations_fr.properties @@ -537,3 +537,4 @@ downloadsDirectory=Répertoire de téléchargements personnalisé downloadsDirectoryDescription=Le répertoire personnalisé dans lequel placer les fichiers téléchargés lorsqu'on clique sur le bouton déplacer vers les téléchargements. Par défaut, XPipe utilisera le répertoire des téléchargements de l'utilisateur. pinLocalMachineOnStartup=Onglet de la machine locale au démarrage pinLocalMachineOnStartupDescription=Ouvrir automatiquement un onglet de machine locale et l'épingler. C'est utile si tu utilises fréquemment un navigateur de fichiers fractionné avec la machine locale et le système de fichiers distant ouverts. +terminalErrorDescription=Cette erreur est terminale et XPipe ne peut pas continuer sans la réparer. diff --git a/lang/app/strings/translations_it.properties b/lang/app/strings/translations_it.properties index 6e5e92754..a622b29f5 100644 --- a/lang/app/strings/translations_it.properties +++ b/lang/app/strings/translations_it.properties @@ -537,3 +537,4 @@ downloadsDirectory=Directory di download personalizzata downloadsDirectoryDescription=La directory personalizzata in cui inserire i file scaricati quando si fa clic sul pulsante sposta nei download. Per impostazione predefinita, XPipe utilizzerà la directory dei download dell'utente. pinLocalMachineOnStartup=Blocca la scheda della macchina locale all'avvio pinLocalMachineOnStartupDescription=Apre automaticamente una scheda del computer locale e la blocca. Questa funzione è utile se utilizzi spesso un browser di file suddiviso con il computer locale e il file system remoto aperti. +terminalErrorDescription=Questo errore è un terminale e XPipe non può continuare senza risolvere il problema. diff --git a/lang/app/strings/translations_ja.properties b/lang/app/strings/translations_ja.properties index 646e10eac..758f56bb2 100644 --- a/lang/app/strings/translations_ja.properties +++ b/lang/app/strings/translations_ja.properties @@ -537,3 +537,4 @@ downloadsDirectory=カスタムダウンロードディレクトリ downloadsDirectoryDescription=ダウンロードに移動ボタンをクリックしたときに、ダウンロードしたファイルを置くカスタムディレクトリ。デフォルトでは、XPipeはユーザーダウンロードディレクトリを使用する。 pinLocalMachineOnStartup=起動時にローカルマシンのタブをピン留めする pinLocalMachineOnStartupDescription=ローカルマシンのタブを自動的に開き、ピン留めする。これは、ローカルマシンとリモートファイルシステムを開いた状態で、分割ファイルブラウザを頻繁に使用する場合に便利である。 +terminalErrorDescription=このエラーは末期的なもので、XPipeはこのエラーを修正しなければ続行できない。 diff --git a/lang/app/strings/translations_nl.properties b/lang/app/strings/translations_nl.properties index 76635876c..396183b31 100644 --- a/lang/app/strings/translations_nl.properties +++ b/lang/app/strings/translations_nl.properties @@ -537,3 +537,4 @@ downloadsDirectory=Aangepaste downloadmap downloadsDirectoryDescription=De aangepaste map om gedownloade bestanden in te plaatsen als je op de knop Verplaats naar downloads klikt. Standaard gebruikt XPipe je gebruikersdownloadmap. pinLocalMachineOnStartup=Tabblad lokale machine vastpinnen bij het opstarten pinLocalMachineOnStartupDescription=Automatisch een lokale machine tab openen en vastpinnen. Dit is handig als je vaak een gesplitste bestandsbrowser gebruikt met de lokale machine en het externe bestandssysteem open. +terminalErrorDescription=Deze fout is terminaal en XPipe kan niet verder zonder deze fout op te lossen. diff --git a/lang/app/strings/translations_pt.properties b/lang/app/strings/translations_pt.properties index e456a3cf8..2b155e020 100644 --- a/lang/app/strings/translations_pt.properties +++ b/lang/app/strings/translations_pt.properties @@ -537,3 +537,4 @@ downloadsDirectory=Diretório de transferências personalizado downloadsDirectoryDescription=O diretório personalizado para colocar os arquivos baixados ao clicar no botão mover para downloads. Por defeito, o XPipe utiliza o diretório de downloads do utilizador. pinLocalMachineOnStartup=Fixa o separador da máquina local no arranque pinLocalMachineOnStartupDescription=Abre automaticamente um separador da máquina local e fixa-o. Isto é útil se estiveres a utilizar frequentemente um navegador de ficheiros dividido com a máquina local e o sistema de ficheiros remoto abertos. +terminalErrorDescription=Este erro é terminal e o XPipe não pode continuar sem o corrigir. diff --git a/lang/app/strings/translations_ru.properties b/lang/app/strings/translations_ru.properties index 3049395b8..f0ffe9e7f 100644 --- a/lang/app/strings/translations_ru.properties +++ b/lang/app/strings/translations_ru.properties @@ -537,3 +537,4 @@ downloadsDirectory=Пользовательский каталог загруз downloadsDirectoryDescription=Пользовательская директория, в которую будут помещаться скачанные файлы при нажатии на кнопку перемещения в загрузки. По умолчанию XPipe будет использовать твой пользовательский каталог загрузок. pinLocalMachineOnStartup=Закрепить вкладку локальной машины при запуске pinLocalMachineOnStartupDescription=Автоматически открывай вкладку локальной машины и закрепляй ее. Это полезно, если ты часто используешь разделенный файловый браузер с открытыми локальной машиной и удаленной файловой системой. +terminalErrorDescription=Эта ошибка является терминальной, и XPipe не сможет продолжить работу без ее устранения. diff --git a/lang/app/strings/translations_tr.properties b/lang/app/strings/translations_tr.properties index 135cf87b2..884fdda96 100644 --- a/lang/app/strings/translations_tr.properties +++ b/lang/app/strings/translations_tr.properties @@ -538,3 +538,4 @@ downloadsDirectory=Özel indirme dizini downloadsDirectoryDescription=İndirilen dosyaları indirilenlere taşı düğmesine tıklandığında yerleştirilecek özel dizin. Varsayılan olarak, XPipe kullanıcı indirme dizininizi kullanacaktır. pinLocalMachineOnStartup=Başlangıçta yerel makine sekmesini sabitleme pinLocalMachineOnStartupDescription=Otomatik olarak bir yerel makine sekmesi açın ve sabitleyin. Bu, yerel makine ve uzak dosya sistemi açıkken sık sık bölünmüş bir dosya tarayıcısı kullanıyorsanız kullanışlıdır. +terminalErrorDescription=Bu hata ölümcüldür ve XPipe bunu düzeltmeden devam edemez. diff --git a/lang/app/strings/translations_zh.properties b/lang/app/strings/translations_zh.properties index a851914d7..a7bc148cb 100644 --- a/lang/app/strings/translations_zh.properties +++ b/lang/app/strings/translations_zh.properties @@ -537,3 +537,4 @@ downloadsDirectory=自定义下载目录 downloadsDirectoryDescription=单击 "移动到下载 "按钮时将下载文件放入的自定义目录。默认情况下,XPipe 将使用您的用户下载目录。 pinLocalMachineOnStartup=启动时 Pin 本地计算机选项卡 pinLocalMachineOnStartupDescription=自动打开本地计算机标签并将其固定。如果你经常在打开本地机器和远程文件系统的情况下使用分割文件浏览器,这将非常有用。 +terminalErrorDescription=此错误为终端错误,如果不修复,XPipe 将无法继续运行。