diff --git a/src/qt/languages/86box.pot b/src/qt/languages/86box.pot index 96bbf479c..5caf94756 100644 --- a/src/qt/languages/86box.pot +++ b/src/qt/languages/86box.pot @@ -1086,16 +1086,25 @@ msgstr "" msgid "Paused" msgstr "" -msgid "Paused (Waiting)" +msgid "Waiting" msgstr "" msgid "Powered Off" msgstr "" -msgid "waiting" +msgid "%n running" msgstr "" -msgid "total" +msgid "%n paused" +msgstr "" + +msgid "%n waiting" +msgstr "" + +msgid "%1 total" +msgstr "" + +msgid "VMs: %1" msgstr "" msgid "System Directory:" @@ -1152,9 +1161,6 @@ msgstr "" msgid "Load configuration from file" msgstr "" -msgid "System Name" -msgstr "" - msgid "System name" msgstr "" @@ -1179,9 +1185,6 @@ msgstr "" msgid "System location:" msgstr "" -msgid "System Location" -msgstr "" - msgid "System name and location" msgstr "" @@ -1194,7 +1197,7 @@ msgstr "" msgid "Please enter a system name" msgstr "" -msgid "Display Name (optional)" +msgid "Display name (optional):" msgstr "" msgid "Display name:" diff --git a/src/qt/languages/ca-ES.po b/src/qt/languages/ca-ES.po index 566746d31..497209436 100644 --- a/src/qt/languages/ca-ES.po +++ b/src/qt/languages/ca-ES.po @@ -1086,16 +1086,25 @@ msgstr "" msgid "Paused" msgstr "" -msgid "Paused (Waiting)" +msgid "Waiting" msgstr "" msgid "Powered Off" msgstr "" -msgid "waiting" +msgid "%n running" msgstr "" -msgid "total" +msgid "%n paused" +msgstr "" + +msgid "%n waiting" +msgstr "" + +msgid "%1 total" +msgstr "" + +msgid "VMs: %1" msgstr "" msgid "System Directory:" @@ -1152,9 +1161,6 @@ msgstr "" msgid "Load configuration from file" msgstr "" -msgid "System Name" -msgstr "" - msgid "System name" msgstr "" @@ -1179,9 +1185,6 @@ msgstr "" msgid "System location:" msgstr "" -msgid "System Location" -msgstr "" - msgid "System name and location" msgstr "" @@ -1194,7 +1197,7 @@ msgstr "" msgid "Please enter a system name" msgstr "" -msgid "Display Name (optional)" +msgid "Display name (optional):" msgstr "" msgid "Display name:" diff --git a/src/qt/languages/cs-CZ.po b/src/qt/languages/cs-CZ.po index fe2eb0ea3..b00f2b0de 100644 --- a/src/qt/languages/cs-CZ.po +++ b/src/qt/languages/cs-CZ.po @@ -1086,16 +1086,25 @@ msgstr "" msgid "Paused" msgstr "" -msgid "Paused (Waiting)" +msgid "Waiting" msgstr "" msgid "Powered Off" msgstr "" -msgid "waiting" +msgid "%n running" msgstr "" -msgid "total" +msgid "%n paused" +msgstr "" + +msgid "%n waiting" +msgstr "" + +msgid "%1 total" +msgstr "" + +msgid "VMs: %1" msgstr "" msgid "System Directory:" @@ -1152,9 +1161,6 @@ msgstr "" msgid "Load configuration from file" msgstr "" -msgid "System Name" -msgstr "" - msgid "System name" msgstr "" @@ -1179,9 +1185,6 @@ msgstr "" msgid "System location:" msgstr "" -msgid "System Location" -msgstr "" - msgid "System name and location" msgstr "" @@ -1194,7 +1197,7 @@ msgstr "" msgid "Please enter a system name" msgstr "" -msgid "Display Name (optional)" +msgid "Display name (optional):" msgstr "" msgid "Display name:" diff --git a/src/qt/languages/de-DE.po b/src/qt/languages/de-DE.po index 09d4ad391..0017ed9d2 100644 --- a/src/qt/languages/de-DE.po +++ b/src/qt/languages/de-DE.po @@ -1086,16 +1086,25 @@ msgstr "" msgid "Paused" msgstr "" -msgid "Paused (Waiting)" +msgid "Waiting" msgstr "" msgid "Powered Off" msgstr "" -msgid "waiting" +msgid "%n running" msgstr "" -msgid "total" +msgid "%n paused" +msgstr "" + +msgid "%n waiting" +msgstr "" + +msgid "%1 total" +msgstr "" + +msgid "VMs: %1" msgstr "" msgid "System Directory:" @@ -1152,9 +1161,6 @@ msgstr "" msgid "Load configuration from file" msgstr "" -msgid "System Name" -msgstr "" - msgid "System name" msgstr "" @@ -1179,9 +1185,6 @@ msgstr "" msgid "System location:" msgstr "" -msgid "System Location" -msgstr "" - msgid "System name and location" msgstr "" @@ -1194,7 +1197,7 @@ msgstr "" msgid "Please enter a system name" msgstr "" -msgid "Display Name (optional)" +msgid "Display name (optional):" msgstr "" msgid "Display name:" diff --git a/src/qt/languages/es-ES.po b/src/qt/languages/es-ES.po index c39070a9e..4470d5408 100644 --- a/src/qt/languages/es-ES.po +++ b/src/qt/languages/es-ES.po @@ -1086,16 +1086,25 @@ msgstr "" msgid "Paused" msgstr "" -msgid "Paused (Waiting)" +msgid "Waiting" msgstr "" msgid "Powered Off" msgstr "" -msgid "waiting" +msgid "%n running" msgstr "" -msgid "total" +msgid "%n paused" +msgstr "" + +msgid "%n waiting" +msgstr "" + +msgid "%1 total" +msgstr "" + +msgid "VMs: %1" msgstr "" msgid "System Directory:" @@ -1152,9 +1161,6 @@ msgstr "" msgid "Load configuration from file" msgstr "" -msgid "System Name" -msgstr "" - msgid "System name" msgstr "" @@ -1179,9 +1185,6 @@ msgstr "" msgid "System location:" msgstr "" -msgid "System Location" -msgstr "" - msgid "System name and location" msgstr "" @@ -1194,7 +1197,7 @@ msgstr "" msgid "Please enter a system name" msgstr "" -msgid "Display Name (optional)" +msgid "Display name (optional):" msgstr "" msgid "Display name:" diff --git a/src/qt/languages/fi-FI.po b/src/qt/languages/fi-FI.po index fddd60ef1..3cde81d31 100644 --- a/src/qt/languages/fi-FI.po +++ b/src/qt/languages/fi-FI.po @@ -1086,16 +1086,25 @@ msgstr "" msgid "Paused" msgstr "" -msgid "Paused (Waiting)" +msgid "Waiting" msgstr "" msgid "Powered Off" msgstr "" -msgid "waiting" +msgid "%n running" msgstr "" -msgid "total" +msgid "%n paused" +msgstr "" + +msgid "%n waiting" +msgstr "" + +msgid "%1 total" +msgstr "" + +msgid "VMs: %1" msgstr "" msgid "System Directory:" @@ -1152,9 +1161,6 @@ msgstr "" msgid "Load configuration from file" msgstr "" -msgid "System Name" -msgstr "" - msgid "System name" msgstr "" @@ -1179,9 +1185,6 @@ msgstr "" msgid "System location:" msgstr "" -msgid "System Location" -msgstr "" - msgid "System name and location" msgstr "" @@ -1194,7 +1197,7 @@ msgstr "" msgid "Please enter a system name" msgstr "" -msgid "Display Name (optional)" +msgid "Display name (optional):" msgstr "" msgid "Display name:" diff --git a/src/qt/languages/fr-FR.po b/src/qt/languages/fr-FR.po index 9cdb6fbc9..97caa1e1f 100644 --- a/src/qt/languages/fr-FR.po +++ b/src/qt/languages/fr-FR.po @@ -1086,16 +1086,25 @@ msgstr "" msgid "Paused" msgstr "" -msgid "Paused (Waiting)" +msgid "Waiting" msgstr "" msgid "Powered Off" msgstr "" -msgid "waiting" +msgid "%n running" msgstr "" -msgid "total" +msgid "%n paused" +msgstr "" + +msgid "%n waiting" +msgstr "" + +msgid "%1 total" +msgstr "" + +msgid "VMs: %1" msgstr "" msgid "System Directory:" @@ -1152,9 +1161,6 @@ msgstr "" msgid "Load configuration from file" msgstr "" -msgid "System Name" -msgstr "" - msgid "System name" msgstr "" @@ -1179,9 +1185,6 @@ msgstr "" msgid "System location:" msgstr "" -msgid "System Location" -msgstr "" - msgid "System name and location" msgstr "" @@ -1194,7 +1197,7 @@ msgstr "" msgid "Please enter a system name" msgstr "" -msgid "Display Name (optional)" +msgid "Display name (optional):" msgstr "" msgid "Display name:" diff --git a/src/qt/languages/hr-HR.po b/src/qt/languages/hr-HR.po index 72572bf64..5058ea86a 100644 --- a/src/qt/languages/hr-HR.po +++ b/src/qt/languages/hr-HR.po @@ -1086,16 +1086,25 @@ msgstr "" msgid "Paused" msgstr "" -msgid "Paused (Waiting)" +msgid "Waiting" msgstr "" msgid "Powered Off" msgstr "" -msgid "waiting" +msgid "%n running" msgstr "" -msgid "total" +msgid "%n paused" +msgstr "" + +msgid "%n waiting" +msgstr "" + +msgid "%1 total" +msgstr "" + +msgid "VMs: %1" msgstr "" msgid "System Directory:" @@ -1152,9 +1161,6 @@ msgstr "" msgid "Load configuration from file" msgstr "" -msgid "System Name" -msgstr "" - msgid "System name" msgstr "" @@ -1179,9 +1185,6 @@ msgstr "" msgid "System location:" msgstr "" -msgid "System Location" -msgstr "" - msgid "System name and location" msgstr "" @@ -1194,7 +1197,7 @@ msgstr "" msgid "Please enter a system name" msgstr "" -msgid "Display Name (optional)" +msgid "Display name (optional):" msgstr "" msgid "Display name:" diff --git a/src/qt/languages/hu-HU.po b/src/qt/languages/hu-HU.po index 04f3d0087..596a3080d 100644 --- a/src/qt/languages/hu-HU.po +++ b/src/qt/languages/hu-HU.po @@ -1086,16 +1086,25 @@ msgstr "" msgid "Paused" msgstr "" -msgid "Paused (Waiting)" +msgid "Waiting" msgstr "" msgid "Powered Off" msgstr "" -msgid "waiting" +msgid "%n running" msgstr "" -msgid "total" +msgid "%n paused" +msgstr "" + +msgid "%n waiting" +msgstr "" + +msgid "%1 total" +msgstr "" + +msgid "VMs: %1" msgstr "" msgid "System Directory:" @@ -1152,9 +1161,6 @@ msgstr "" msgid "Load configuration from file" msgstr "" -msgid "System Name" -msgstr "" - msgid "System name" msgstr "" @@ -1179,9 +1185,6 @@ msgstr "" msgid "System location:" msgstr "" -msgid "System Location" -msgstr "" - msgid "System name and location" msgstr "" @@ -1194,7 +1197,7 @@ msgstr "" msgid "Please enter a system name" msgstr "" -msgid "Display Name (optional)" +msgid "Display name (optional):" msgstr "" msgid "Display name:" diff --git a/src/qt/languages/it-IT.po b/src/qt/languages/it-IT.po index a2bef4558..9f3255843 100644 --- a/src/qt/languages/it-IT.po +++ b/src/qt/languages/it-IT.po @@ -1086,17 +1086,26 @@ msgstr "In esecuzione" msgid "Paused" msgstr "In pausa" -msgid "Paused (Waiting)" -msgstr "In pausa (In attesa)" +msgid "Waiting" +msgstr "In attesa" msgid "Powered Off" msgstr "Spento" -msgid "waiting" -msgstr "in attesa" +msgid "%n running" +msgstr "%n in esecuzione" -msgid "total" -msgstr "totale" +msgid "%n paused" +msgstr "%n in pausa" + +msgid "%n waiting" +msgstr "%n In attesa" + +msgid "%1 total" +msgstr "%1 totale" + +msgid "VMs: %1" +msgstr "" msgid "System Directory:" msgstr "Directory Sistema:" @@ -1152,9 +1161,6 @@ msgstr "Incolla il contenuto del file di configurazione esistente nella casella msgid "Load configuration from file" msgstr "Carica configurazione da file" -msgid "System Name" -msgstr "Nome Sistema" - msgid "System name" msgstr "Nome sistema" @@ -1179,9 +1185,6 @@ msgstr "Verrà creata una nuova cartella per il sistema nella directory selezion msgid "System location:" msgstr "Posizione sistema:" -msgid "System Location" -msgstr "Posizione Sistema" - msgid "System name and location" msgstr "Nome e posizione del sistema" @@ -1194,8 +1197,8 @@ msgstr "Inserisci il nome del sistema" msgid "Please enter a system name" msgstr "Inserisci il nome del sistema" -msgid "Display Name (optional)" -msgstr "Nome Visualizzato (opzionale)" +msgid "Display name (optional):" +msgstr "Nome visualizzato (opzionale):" msgid "Display name:" msgstr "Nome visualizzato:" diff --git a/src/qt/languages/ja-JP.po b/src/qt/languages/ja-JP.po index cf94fc8ef..7377b70a6 100644 --- a/src/qt/languages/ja-JP.po +++ b/src/qt/languages/ja-JP.po @@ -1086,16 +1086,25 @@ msgstr "" msgid "Paused" msgstr "" -msgid "Paused (Waiting)" +msgid "Waiting" msgstr "" msgid "Powered Off" msgstr "" -msgid "waiting" +msgid "%n running" msgstr "" -msgid "total" +msgid "%n paused" +msgstr "" + +msgid "%n waiting" +msgstr "" + +msgid "%1 total" +msgstr "" + +msgid "VMs: %1" msgstr "" msgid "System Directory:" @@ -1152,9 +1161,6 @@ msgstr "" msgid "Load configuration from file" msgstr "" -msgid "System Name" -msgstr "" - msgid "System name" msgstr "" @@ -1179,9 +1185,6 @@ msgstr "" msgid "System location:" msgstr "" -msgid "System Location" -msgstr "" - msgid "System name and location" msgstr "" @@ -1194,7 +1197,7 @@ msgstr "" msgid "Please enter a system name" msgstr "" -msgid "Display Name (optional)" +msgid "Display name (optional):" msgstr "" msgid "Display name:" diff --git a/src/qt/languages/ko-KR.po b/src/qt/languages/ko-KR.po index 8839f6172..a6d9d3115 100644 --- a/src/qt/languages/ko-KR.po +++ b/src/qt/languages/ko-KR.po @@ -1086,16 +1086,25 @@ msgstr "" msgid "Paused" msgstr "" -msgid "Paused (Waiting)" +msgid "Waiting" msgstr "" msgid "Powered Off" msgstr "" -msgid "waiting" +msgid "%n running" msgstr "" -msgid "total" +msgid "%n paused" +msgstr "" + +msgid "%n waiting" +msgstr "" + +msgid "%1 total" +msgstr "" + +msgid "VMs: %1" msgstr "" msgid "System Directory:" @@ -1152,9 +1161,6 @@ msgstr "" msgid "Load configuration from file" msgstr "" -msgid "System Name" -msgstr "" - msgid "System name" msgstr "" @@ -1179,9 +1185,6 @@ msgstr "" msgid "System location:" msgstr "" -msgid "System Location" -msgstr "" - msgid "System name and location" msgstr "" @@ -1194,7 +1197,7 @@ msgstr "" msgid "Please enter a system name" msgstr "" -msgid "Display Name (optional)" +msgid "Display name (optional):" msgstr "" msgid "Display name:" diff --git a/src/qt/languages/nl-NL.po b/src/qt/languages/nl-NL.po index d9b2e8aca..eef454446 100644 --- a/src/qt/languages/nl-NL.po +++ b/src/qt/languages/nl-NL.po @@ -1086,17 +1086,26 @@ msgstr "Actief" msgid "Paused" msgstr "Gepauzeerd" -msgid "Paused (Waiting)" -msgstr "Gepauzeerd (aan het wachtend)" +msgid "Waiting" +msgstr "aan het wachtend" msgid "Powered Off" msgstr "Sluit af" -msgid "waiting" -msgstr "aan het wachten" +msgid "%n running" +msgstr "%n actief" -msgid "total" -msgstr "totaal" +msgid "%n paused" +msgstr "%n gepauzeerd" + +msgid "%n waiting" +msgstr "%n aan het wachten" + +msgid "%1 total" +msgstr "%1 totaal" + +msgid "VMs: %1" +msgstr "VMs: %1" msgid "System Directory:" msgstr "Systeemmap:" @@ -1152,9 +1161,6 @@ msgstr "Plak de inhoud van het bestaande configuratiebestand in het vak hieronde msgid "Load configuration from file" msgstr "Laad configuratie van bestand" -msgid "System Name" -msgstr "Systeemnaam" - msgid "System name" msgstr "Systeemnaam" @@ -1179,9 +1185,6 @@ msgstr "Een nieuwe map voor het systeem wordt aangemaakt in de boven geselecteer msgid "System location:" msgstr "Systeemlocatie:" -msgid "System Location" -msgstr "Systeemlocatie" - msgid "System name and location" msgstr "Systeemnaam en -locatie" @@ -1194,8 +1197,8 @@ msgstr "Voer de naam in van het systeem" msgid "Please enter a system name" msgstr "Voer een naam in van het systeem" -msgid "Display Name (optional)" -msgstr "Weergavenaam (optioneel)" +msgid "Display name (optional):" +msgstr "Weergavenaam (optioneel):" msgid "Display name:" msgstr "Weergavenaam:" diff --git a/src/qt/languages/pl-PL.po b/src/qt/languages/pl-PL.po index 8e0381be3..52d1f295a 100644 --- a/src/qt/languages/pl-PL.po +++ b/src/qt/languages/pl-PL.po @@ -1086,16 +1086,25 @@ msgstr "" msgid "Paused" msgstr "" -msgid "Paused (Waiting)" +msgid "Waiting" msgstr "" msgid "Powered Off" msgstr "" -msgid "waiting" +msgid "%n running" msgstr "" -msgid "total" +msgid "%n paused" +msgstr "" + +msgid "%n waiting" +msgstr "" + +msgid "%1 total" +msgstr "" + +msgid "VMs: %1" msgstr "" msgid "System Directory:" @@ -1152,9 +1161,6 @@ msgstr "" msgid "Load configuration from file" msgstr "" -msgid "System Name" -msgstr "" - msgid "System name" msgstr "" @@ -1179,9 +1185,6 @@ msgstr "" msgid "System location:" msgstr "" -msgid "System Location" -msgstr "" - msgid "System name and location" msgstr "" @@ -1194,7 +1197,7 @@ msgstr "" msgid "Please enter a system name" msgstr "" -msgid "Display Name (optional)" +msgid "Display name (optional):" msgstr "" msgid "Display name:" diff --git a/src/qt/languages/pt-BR.po b/src/qt/languages/pt-BR.po index 54d951282..b7f1ec59c 100644 --- a/src/qt/languages/pt-BR.po +++ b/src/qt/languages/pt-BR.po @@ -1087,16 +1087,25 @@ msgid "Paused" msgstr "Pausado" msgid "Paused (Waiting)" -msgstr "Pausado (Esperando)" +msgstr "Esperando" msgid "Powered Off" msgstr "Desligado" -msgid "waiting" -msgstr "esperando" +msgid "%n running" +msgstr "%n rodando" -msgid "total" -msgstr "total" +msgid "%n paused" +msgstr "%n pausado" + +msgid "%n waiting" +msgstr "%n esperando" + +msgid "%1 total" +msgstr "%1 total" + +msgid "VMs: %1" +msgstr "" msgid "System Directory:" msgstr "Diretório do Sistema:" @@ -1152,9 +1161,6 @@ msgstr "Cole o conteúdo de uma configuração existente na caixa abaixo." msgid "Load configuration from file" msgstr "Carregar configuração do arquivo" -msgid "System Name" -msgstr "Nome do Sistema" - msgid "System name" msgstr "Nome do sistema" @@ -1179,9 +1185,6 @@ msgstr "Um novo diretório para o sistema será criado no diretório acima" msgid "System location:" msgstr "Local do sistema:" -msgid "System Location" -msgstr "Local do Sistema" - msgid "System name and location" msgstr "Nome do sistema e local" @@ -1194,8 +1197,8 @@ msgstr "Digite o nome do sistema" msgid "Please enter a system name" msgstr "Por favor digite um nome de sistema" -msgid "Display Name (optional)" -msgstr "Nome de exibição (opcional)" +msgid "Display name (optional):" +msgstr "Nome de exibição (opcional):" msgid "Display name:" msgstr "Nome de exibição:" diff --git a/src/qt/languages/pt-PT.po b/src/qt/languages/pt-PT.po index 416136a5b..c29e04bdf 100644 --- a/src/qt/languages/pt-PT.po +++ b/src/qt/languages/pt-PT.po @@ -1086,16 +1086,25 @@ msgstr "" msgid "Paused" msgstr "" -msgid "Paused (Waiting)" +msgid "Waiting" msgstr "" msgid "Powered Off" msgstr "" -msgid "waiting" +msgid "%n running" msgstr "" -msgid "total" +msgid "%n paused" +msgstr "" + +msgid "%n waiting" +msgstr "" + +msgid "%1 total" +msgstr "" + +msgid "VMs: %1" msgstr "" msgid "System Directory:" @@ -1152,9 +1161,6 @@ msgstr "" msgid "Load configuration from file" msgstr "" -msgid "System Name" -msgstr "" - msgid "System name" msgstr "" @@ -1179,9 +1185,6 @@ msgstr "" msgid "System location:" msgstr "" -msgid "System Location" -msgstr "" - msgid "System name and location" msgstr "" @@ -1194,7 +1197,7 @@ msgstr "" msgid "Please enter a system name" msgstr "" -msgid "Display Name (optional)" +msgid "Display name (optional):" msgstr "" msgid "Display name:" diff --git a/src/qt/languages/ru-RU.po b/src/qt/languages/ru-RU.po index a2e3b1fbc..dd53206e7 100644 --- a/src/qt/languages/ru-RU.po +++ b/src/qt/languages/ru-RU.po @@ -1084,19 +1084,28 @@ msgid "Running" msgstr "Работает" msgid "Paused" -msgstr "Приостановлено" +msgstr "Приостановлена" -msgid "Paused (Waiting)" -msgstr "Приостановлено (Ожидание)" - -msgid "Powered Off" -msgstr "Выключено" - -msgid "waiting" +msgid "Waiting" msgstr "Ожидание" -msgid "total" -msgstr "Всего" +msgid "Powered Off" +msgstr "Выключена" + +msgid "%n running" +msgstr "%n работает" + +msgid "%n paused" +msgstr "%n приостановлено" + +msgid "%n waiting" +msgstr "%n ожидает" + +msgid "%1 total" +msgstr "всего %1" + +msgid "VMs: %1" +msgstr "Машин: %1" msgid "System Directory:" msgstr "Системная папка:" @@ -1152,9 +1161,6 @@ msgstr "Вставьте содержимое существующего фай msgid "Load configuration from file" msgstr "Загрузить конфигурацию из файла" -msgid "System Name" -msgstr "Название системы" - msgid "System name" msgstr "Название системы" @@ -1179,9 +1185,6 @@ msgstr "Новая папка для системы будет создана в msgid "System location:" msgstr "Расположение системы:" -msgid "System Location" -msgstr "Расположение Системы" - msgid "System name and location" msgstr "Название системы и расположение" @@ -1194,8 +1197,8 @@ msgstr "Введите название системы" msgid "Please enter a system name" msgstr "Пожалуйста, введите название системы" -msgid "Display Name (optional)" -msgstr "Отображаемое имя (опционально)" +msgid "Display name (optional):" +msgstr "Отображаемое имя (необязательно):" msgid "Display name:" msgstr "Отображаемое имя:" diff --git a/src/qt/languages/sk-SK.po b/src/qt/languages/sk-SK.po index 7649fa860..6383e7796 100644 --- a/src/qt/languages/sk-SK.po +++ b/src/qt/languages/sk-SK.po @@ -1086,16 +1086,25 @@ msgstr "" msgid "Paused" msgstr "" -msgid "Paused (Waiting)" +msgid "Waiting" msgstr "" msgid "Powered Off" msgstr "" -msgid "waiting" +msgid "%n running" msgstr "" -msgid "total" +msgid "%n paused" +msgstr "" + +msgid "%n waiting" +msgstr "" + +msgid "%1 total" +msgstr "" + +msgid "VMs: %1" msgstr "" msgid "System Directory:" @@ -1152,9 +1161,6 @@ msgstr "" msgid "Load configuration from file" msgstr "" -msgid "System Name" -msgstr "" - msgid "System name" msgstr "" @@ -1179,9 +1185,6 @@ msgstr "" msgid "System location:" msgstr "" -msgid "System Location" -msgstr "" - msgid "System name and location" msgstr "" @@ -1194,7 +1197,7 @@ msgstr "" msgid "Please enter a system name" msgstr "" -msgid "Display Name (optional)" +msgid "Display name (optional):" msgstr "" msgid "Display name:" diff --git a/src/qt/languages/sl-SI.po b/src/qt/languages/sl-SI.po index ebd5bb353..3ab17def2 100644 --- a/src/qt/languages/sl-SI.po +++ b/src/qt/languages/sl-SI.po @@ -1086,16 +1086,25 @@ msgstr "" msgid "Paused" msgstr "" -msgid "Paused (Waiting)" +msgid "Waiting" msgstr "" msgid "Powered Off" msgstr "" -msgid "waiting" +msgid "%n running" msgstr "" -msgid "total" +msgid "%n paused" +msgstr "" + +msgid "%n waiting" +msgstr "" + +msgid "%1 total" +msgstr "" + +msgid "VMs: %1" msgstr "" msgid "System Directory:" @@ -1152,9 +1161,6 @@ msgstr "" msgid "Load configuration from file" msgstr "" -msgid "System Name" -msgstr "" - msgid "System name" msgstr "" @@ -1179,9 +1185,6 @@ msgstr "" msgid "System location:" msgstr "" -msgid "System Location" -msgstr "" - msgid "System name and location" msgstr "" @@ -1194,7 +1197,7 @@ msgstr "" msgid "Please enter a system name" msgstr "" -msgid "Display Name (optional)" +msgid "Display name (optional):" msgstr "" msgid "Display name:" diff --git a/src/qt/languages/sv-SE.po b/src/qt/languages/sv-SE.po index e5355e87b..47b7d4231 100644 --- a/src/qt/languages/sv-SE.po +++ b/src/qt/languages/sv-SE.po @@ -1086,16 +1086,25 @@ msgstr "" msgid "Paused" msgstr "" -msgid "Paused (Waiting)" +msgid "Waiting" msgstr "" msgid "Powered Off" msgstr "" -msgid "waiting" +msgid "%n running" msgstr "" -msgid "total" +msgid "%n paused" +msgstr "" + +msgid "%n waiting" +msgstr "" + +msgid "%1 total" +msgstr "" + +msgid "VMs: %1" msgstr "" msgid "System Directory:" @@ -1152,9 +1161,6 @@ msgstr "" msgid "Load configuration from file" msgstr "" -msgid "System Name" -msgstr "" - msgid "System name" msgstr "" @@ -1179,9 +1185,6 @@ msgstr "" msgid "System location:" msgstr "" -msgid "System Location" -msgstr "" - msgid "System name and location" msgstr "" @@ -1194,7 +1197,7 @@ msgstr "" msgid "Please enter a system name" msgstr "" -msgid "Display Name (optional)" +msgid "Display name (optional):" msgstr "" msgid "Display name:" diff --git a/src/qt/languages/tr-TR.po b/src/qt/languages/tr-TR.po index 7029efbc8..d272679c5 100644 --- a/src/qt/languages/tr-TR.po +++ b/src/qt/languages/tr-TR.po @@ -1086,16 +1086,25 @@ msgstr "" msgid "Paused" msgstr "" -msgid "Paused (Waiting)" +msgid "Waiting" msgstr "" msgid "Powered Off" msgstr "" -msgid "waiting" +msgid "%n running" msgstr "" -msgid "total" +msgid "%n paused" +msgstr "" + +msgid "%n waiting" +msgstr "" + +msgid "%1 total" +msgstr "" + +msgid "VMs: %1" msgstr "" msgid "System Directory:" @@ -1152,9 +1161,6 @@ msgstr "" msgid "Load configuration from file" msgstr "" -msgid "System Name" -msgstr "" - msgid "System name" msgstr "" @@ -1179,9 +1185,6 @@ msgstr "" msgid "System location:" msgstr "" -msgid "System Location" -msgstr "" - msgid "System name and location" msgstr "" @@ -1194,7 +1197,7 @@ msgstr "" msgid "Please enter a system name" msgstr "" -msgid "Display Name (optional)" +msgid "Display name (optional):" msgstr "" msgid "Display name:" diff --git a/src/qt/languages/uk-UA.po b/src/qt/languages/uk-UA.po index d0cd13f0e..9012386cb 100644 --- a/src/qt/languages/uk-UA.po +++ b/src/qt/languages/uk-UA.po @@ -1086,16 +1086,25 @@ msgstr "" msgid "Paused" msgstr "" -msgid "Paused (Waiting)" +msgid "Waiting" msgstr "" msgid "Powered Off" msgstr "" -msgid "waiting" +msgid "%n running" msgstr "" -msgid "total" +msgid "%n paused" +msgstr "" + +msgid "%n waiting" +msgstr "" + +msgid "%1 total" +msgstr "" + +msgid "VMs: %1" msgstr "" msgid "System Directory:" @@ -1152,9 +1161,6 @@ msgstr "" msgid "Load configuration from file" msgstr "" -msgid "System Name" -msgstr "" - msgid "System name" msgstr "" @@ -1179,9 +1185,6 @@ msgstr "" msgid "System location:" msgstr "" -msgid "System Location" -msgstr "" - msgid "System name and location" msgstr "" @@ -1194,7 +1197,7 @@ msgstr "" msgid "Please enter a system name" msgstr "" -msgid "Display Name (optional)" +msgid "Display name (optional):" msgstr "" msgid "Display name:" diff --git a/src/qt/languages/vi-VN.po b/src/qt/languages/vi-VN.po index 834a44c97..952d39f39 100644 --- a/src/qt/languages/vi-VN.po +++ b/src/qt/languages/vi-VN.po @@ -1086,16 +1086,25 @@ msgstr "" msgid "Paused" msgstr "" -msgid "Paused (Waiting)" +msgid "Waiting" msgstr "" msgid "Powered Off" msgstr "" -msgid "waiting" +msgid "%n running" msgstr "" -msgid "total" +msgid "%n paused" +msgstr "" + +msgid "%n waiting" +msgstr "" + +msgid "%1 total" +msgstr "" + +msgid "VMs: %1" msgstr "" msgid "System Directory:" @@ -1152,9 +1161,6 @@ msgstr "" msgid "Load configuration from file" msgstr "" -msgid "System Name" -msgstr "" - msgid "System name" msgstr "" @@ -1179,9 +1185,6 @@ msgstr "" msgid "System location:" msgstr "" -msgid "System Location" -msgstr "" - msgid "System name and location" msgstr "" @@ -1194,7 +1197,7 @@ msgstr "" msgid "Please enter a system name" msgstr "" -msgid "Display Name (optional)" +msgid "Display name (optional):" msgstr "" msgid "Display name:" diff --git a/src/qt/languages/zh-CN.po b/src/qt/languages/zh-CN.po index 3b3e01dc1..5789fa070 100644 --- a/src/qt/languages/zh-CN.po +++ b/src/qt/languages/zh-CN.po @@ -1086,17 +1086,26 @@ msgstr "正在运行" msgid "Paused" msgstr "已暂停" -msgid "Paused (Waiting)" -msgstr "暂停 (等待中)" +msgid "Waiting" +msgstr "等待中" msgid "Powered Off" msgstr "已关机" -msgid "waiting" -msgstr "等待中" +msgid "%n running" +msgstr "%n 正在运行" -msgid "total" -msgstr "总计" +msgid "%n paused" +msgstr "%n 已暂停" + +msgid "%n waiting" +msgstr "%n 等待中" + +msgid "%1 total" +msgstr "%1 总计" + +msgid "VMs: %1" +msgstr "" msgid "System Directory:" msgstr "系统目录" @@ -1152,9 +1161,6 @@ msgstr "" msgid "Load configuration from file" msgstr "" -msgid "System Name" -msgstr "" - msgid "System name" msgstr "" @@ -1179,9 +1185,6 @@ msgstr "" msgid "System location:" msgstr "" -msgid "System Location" -msgstr "" - msgid "System name and location" msgstr "" @@ -1194,7 +1197,7 @@ msgstr "" msgid "Please enter a system name" msgstr "" -msgid "Display Name (optional)" +msgid "Display name (optional):" msgstr "" msgid "Display name:" diff --git a/src/qt/languages/zh-TW.po b/src/qt/languages/zh-TW.po index d97358ec5..144ab0988 100644 --- a/src/qt/languages/zh-TW.po +++ b/src/qt/languages/zh-TW.po @@ -1086,16 +1086,25 @@ msgstr "" msgid "Paused" msgstr "" -msgid "Paused (Waiting)" +msgid "Waiting" msgstr "" msgid "Powered Off" msgstr "" -msgid "waiting" +msgid "%n running" msgstr "" -msgid "total" +msgid "%n paused" +msgstr "" + +msgid "%n waiting" +msgstr "" + +msgid "%1 total" +msgstr "" + +msgid "VMs: %1" msgstr "" msgid "System Directory:" @@ -1152,9 +1161,6 @@ msgstr "" msgid "Load configuration from file" msgstr "" -msgid "System Name" -msgstr "" - msgid "System name" msgstr "" @@ -1179,9 +1185,6 @@ msgstr "" msgid "System location:" msgstr "" -msgid "System Location" -msgstr "" - msgid "System name and location" msgstr "" @@ -1194,7 +1197,7 @@ msgstr "" msgid "Please enter a system name" msgstr "" -msgid "Display Name (optional)" +msgid "Display name (optional):" msgstr "" msgid "Display name:" diff --git a/src/qt/qt_mainwindow.ui b/src/qt/qt_mainwindow.ui index 12d353ef3..2a371014c 100644 --- a/src/qt/qt_mainwindow.ui +++ b/src/qt/qt_mainwindow.ui @@ -110,8 +110,8 @@ - + @@ -844,16 +844,16 @@ 3 - - - Open screenshots &folder... - - Open &printer tray... + + + Open screenshots &folder... + + true diff --git a/src/qt/qt_vmmanager_addmachine.cpp b/src/qt/qt_vmmanager_addmachine.cpp index 997a5cdc2..11da2b49d 100644 --- a/src/qt/qt_vmmanager_addmachine.cpp +++ b/src/qt/qt_vmmanager_addmachine.cpp @@ -58,45 +58,13 @@ VMManagerAddMachine(QWidget *parent) : QWizard(parent) #endif // Wizard wants to resize based on image. This keeps the size - setMinimumSize(size()); + setFixedSize(QSize(550, size().height())); setOption(HaveHelpButton, false); // setPixmap(LogoPixmap, QPixmap(":/settings/qt/icons/86Box-gray.ico")); -#if 0 - connect(this, &QWizard::helpRequested, this, &VMManagerAddMachine::showHelp); -#endif - setWindowTitle(tr("Add new system wizard")); } -#if 0 -void -VMManagerAddMachine::showHelp() -{ - // TBD - static QString lastHelpMessage; - - QString message; - - // Help will depend on the current page - switch (currentId()) { - case Page_Intro: - message = tr("This is the into page."); - break; - default: - message = tr("No help has been added yet, you're on your own."); - break; - } - - if (lastHelpMessage == message) { - message = tr("Did you click help twice?"); - } - - QMessageBox::information(this, tr("Add new system wizard help"), message); - lastHelpMessage = message; -} -#endif - IntroPage:: IntroPage(QWidget *parent) { @@ -244,7 +212,7 @@ NameAndLocationPage(QWidget *parent) const auto chooseDirectoryButton = new QPushButton(); chooseDirectoryButton->setIcon(QApplication::style()->standardIcon(QStyle::SP_DirIcon)); - const auto systemNameLabel = new QLabel(tr("System Name")); + const auto systemNameLabel = new QLabel(tr("System name:")); systemName = new QLineEdit(); // Special event filter to override enter key systemName->installEventFilter(this); @@ -252,7 +220,7 @@ NameAndLocationPage(QWidget *parent) systemNameValidation = new QLabel(); #ifdef CUSTOM_SYSTEM_LOCATION - const auto systemLocationLabel = new QLabel(tr("System Location")); + const auto systemLocationLabel = new QLabel(tr("System location:")); systemLocation = new QLineEdit(); // TODO: FIXME: This is using the CLI arg and needs to instead use a proper variable systemLocation->setText(QDir::toNativeSeparators(vmm_path)); @@ -261,7 +229,7 @@ NameAndLocationPage(QWidget *parent) systemLocationValidation->setWordWrap(true); #endif - const auto displayNameLabel = new QLabel(tr("Display Name (optional)")); + const auto displayNameLabel = new QLabel(tr("Display name (optional):")); displayName = new QLineEdit(); // Special event filter to override enter key displayName->installEventFilter(this); @@ -387,15 +355,18 @@ ConclusionPage(QWidget *parent) const auto systemNameLabel = new QLabel(tr("System name:")); systemNameLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred); systemName = new QLabel(); + systemName->setWordWrap(true); #ifdef CUSTOM_SYSTEM_LOCATION const auto systemLocationLabel = new QLabel(tr("System location:")); systemLocationLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred); systemLocation = new QLabel(); + systemLocation->setWordWrap(true); #endif displayNameLabel = new QLabel(tr("Display name:")); displayNameLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred); displayName = new QLabel(); + displayName->setWordWrap(true); const auto layout = new QGridLayout(); layout->addWidget(topLabel, 0, 0, 1, -1); diff --git a/src/qt/qt_vmmanager_addmachine.hpp b/src/qt/qt_vmmanager_addmachine.hpp index 92a12398a..b73b5a609 100644 --- a/src/qt/qt_vmmanager_addmachine.hpp +++ b/src/qt/qt_vmmanager_addmachine.hpp @@ -41,11 +41,6 @@ public: }; explicit VMManagerAddMachine(QWidget *parent = nullptr); - -#if 0 -private slots: - void showHelp(); -#endif }; class IntroPage : public QWizardPage { diff --git a/src/qt/qt_vmmanager_details.cpp b/src/qt/qt_vmmanager_details.cpp index 9292c7039..d6dd814ee 100644 --- a/src/qt/qt_vmmanager_details.cpp +++ b/src/qt/qt_vmmanager_details.cpp @@ -334,7 +334,7 @@ VMManagerDetails::updateProcessStatus() { QString status_text = running ? QString("%1: PID %2").arg(tr("Running"), QString::number(sysconfig->process->processId())) : tr("Not running"); - status_text.append(sysconfig->window_obscured ? QString(" (%1)").arg(tr("waiting")) : ""); + status_text.append(sysconfig->window_obscured ? QString(" (%1)").arg(tr("Waiting")) : ""); ui->statusLabel->setText(status_text); resetButton->setEnabled(running); stopButton->setEnabled(running); diff --git a/src/qt/qt_vmmanager_main.cpp b/src/qt/qt_vmmanager_main.cpp index 3dcb4d511..e3f8a7402 100644 --- a/src/qt/qt_vmmanager_main.cpp +++ b/src/qt/qt_vmmanager_main.cpp @@ -138,6 +138,18 @@ VMManagerMain::VMManagerMain(QWidget *parent) : } }); + QAction openScreenshotsFolderAction(tr("Open screenshots &folder...")); + contextMenu.addAction(&openScreenshotsFolderAction); + connect(&openScreenshotsFolderAction, &QAction::triggered, [indexAt] { + if (const auto screenshotsDir = indexAt.data(VMManagerModel::Roles::ConfigDir).toString() + QString("/screenshots/"); !screenshotsDir.isEmpty()) { + QDir dir(screenshotsDir); + if (!dir.exists()) + dir.mkpath("."); + + QDesktopServices::openUrl(QUrl(QString("file:///") + dir.canonicalPath())); + } + }); + QAction setSystemIcon(tr("Set &icon...")); contextMenu.addAction(&setSystemIcon); connect(&setSystemIcon, &QAction::triggered, [this] { @@ -357,7 +369,7 @@ illegal_chars: // Set initial status bar after the event loop starts QTimer::singleShot(0, this, [this] { - emit updateStatusRight(totalCountString()); + emit updateStatusRight(machineCountString()); }); #if EMU_BUILD_NUM != 0 @@ -686,10 +698,14 @@ VMManagerMain::getSearchCompletionList() const } QString -VMManagerMain::totalCountString() const +VMManagerMain::machineCountString(QString states) const { const auto count = vm_model->rowCount(QModelIndex()); - return QString("%1 %2").arg(QString::number(count), tr("total")); + if (!states.isEmpty()) + states.append(", "); + states.append(tr("%1 total").arg(count)); + + return tr("VMs: %1").arg(states); } void @@ -701,14 +717,26 @@ VMManagerMain::modelDataChange() QStringList stats; for (auto it = modelStats.constBegin(); it != modelStats.constEnd(); ++it) { const auto &key = it.key(); - stats.append(QString("%1 %2").arg(QString::number(modelStats[key]), key)); + QString text = ""; + switch (key) { + case VMManagerSystem::ProcessStatus::Running: + text = tr("%n running", "", modelStats[key]); + break; + case VMManagerSystem::ProcessStatus::Paused: + text = tr("%n paused", "", modelStats[key]); + break; + case VMManagerSystem::ProcessStatus::PausedWaiting: + case VMManagerSystem::ProcessStatus::RunningWaiting: + text = tr("%n waiting", "", modelStats[key]); + break; + default: + break; + } + if(!text.isEmpty()) + stats.append(text); } auto states = stats.join(", "); - if (!modelStats.isEmpty()) { - states.append(", "); - } - - emit updateStatusRight(states + totalCountString()); + emit updateStatusRight(machineCountString(states)); } void diff --git a/src/qt/qt_vmmanager_main.hpp b/src/qt/qt_vmmanager_main.hpp index 9b9401d0f..bb2bb180b 100644 --- a/src/qt/qt_vmmanager_main.hpp +++ b/src/qt/qt_vmmanager_main.hpp @@ -103,7 +103,7 @@ private: void updateDisplayName(const QModelIndex &index); void loadSettings(); [[nodiscard]] bool currentSelectionIsValid() const; - [[nodiscard]] QString totalCountString() const; + [[nodiscard]] QString machineCountString(QString states = "") const; #if EMU_BUILD_NUM != 0 void backgroundUpdateCheckStart() const; #endif diff --git a/src/qt/qt_vmmanager_main.ui b/src/qt/qt_vmmanager_main.ui index 582645b9f..566cea862 100644 --- a/src/qt/qt_vmmanager_main.ui +++ b/src/qt/qt_vmmanager_main.ui @@ -82,7 +82,7 @@ Qt::ClickFocus - Search + Search true diff --git a/src/qt/qt_vmmanager_mainwindow.cpp b/src/qt/qt_vmmanager_mainwindow.cpp index f6abc4674..3bc7ddece 100644 --- a/src/qt/qt_vmmanager_mainwindow.cpp +++ b/src/qt/qt_vmmanager_mainwindow.cpp @@ -74,7 +74,7 @@ VMManagerMainWindow(QWidget *parent) const auto searchBar = new QLineEdit(); searchBar->setMinimumWidth(150); - searchBar->setPlaceholderText(" " + tr("Search")); + searchBar->setPlaceholderText(tr("Search")); searchBar->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred); searchBar->setClearButtonEnabled(true); // Spacer to make the search go all the way to the right diff --git a/src/qt/qt_vmmanager_model.cpp b/src/qt/qt_vmmanager_model.cpp index 3f6bdc4f9..40baac90a 100644 --- a/src/qt/qt_vmmanager_model.cpp +++ b/src/qt/qt_vmmanager_model.cpp @@ -167,15 +167,12 @@ VMManagerModel::updateDisplayName(const QModelIndex &index, const QString &newDi machines.at(index.row())->setDisplayName(newDisplayName); modelDataChanged(); } -QHash +QMap VMManagerModel::getProcessStats() { - QHash stats; + QMap stats; for (const auto& system: machines) { - if (system->getProcessStatus() != VMManagerSystem::ProcessStatus::Stopped) { - auto statusString = system->getProcessStatusString(); - stats[statusString] += 1; - } + stats[system->getProcessStatus()] += 1; } return stats; } diff --git a/src/qt/qt_vmmanager_model.hpp b/src/qt/qt_vmmanager_model.hpp index 4205e8098..159dad9f2 100644 --- a/src/qt/qt_vmmanager_model.hpp +++ b/src/qt/qt_vmmanager_model.hpp @@ -57,7 +57,7 @@ public: QModelIndex getIndexForConfigFile(const QFileInfo& config_file); void reload(QWidget* parent = nullptr); void updateDisplayName(const QModelIndex &index, const QString &newDisplayName); - QHash getProcessStats(); + QMap getProcessStats(); int getActiveMachineCount(); void refreshConfigs(); signals: diff --git a/src/qt/qt_vmmanager_system.cpp b/src/qt/qt_vmmanager_system.cpp index 5130ac50c..e056b2331 100644 --- a/src/qt/qt_vmmanager_system.cpp +++ b/src/qt/qt_vmmanager_system.cpp @@ -1175,7 +1175,7 @@ VMManagerSystem::processStatusToString(VMManagerSystem::ProcessStatus status) return tr("Paused"); case VMManagerSystem::ProcessStatus::PausedWaiting: case VMManagerSystem::ProcessStatus::RunningWaiting: - return tr("Paused (Waiting)"); + return QString("%1 (%2)").arg(tr("Paused"), tr("Waiting")); default: return tr("Unknown Status"); }