Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/github_actions/actions/upload-a…
Browse files Browse the repository at this point in the history
…rtifact-4
  • Loading branch information
danirabbit authored Feb 14, 2024
2 parents 8f3cfad + 01a209d commit b70945d
Show file tree
Hide file tree
Showing 11 changed files with 9 additions and 10 deletions.
Binary file added data/screenshot-check.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/screenshot-drivers.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/screenshot-encrypt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/screenshot-keyboard.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/screenshot-language.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/screenshot-progress.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/screenshot-success.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/screenshot-try-install.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions po/extra/ka.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-24 17:42+0000\n"
"PO-Revision-Date: 2023-03-12 12:25+0000\n"
"PO-Revision-Date: 2023-12-22 19:35+0000\n"
"Last-Translator: NorwayFun <[email protected]>\n"
"Language-Team: Georgian <https://l10n.elementary.io/projects/installer/extra/"
"ka/>\n"
Expand All @@ -11,7 +11,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.14.2\n"
"X-Generator: Weblate 5.0.2\n"

#: data/installer.metainfo.xml.in:9
msgid "Installer"
Expand All @@ -37,7 +37,7 @@ msgstr "გაუმჯობესებები:"

#: data/installer.metainfo.xml.in:61
msgid "Swipe to navigate back"
msgstr ""
msgstr "გაუსვით უკან გადასასვლელად"

#: data/installer.metainfo.xml.in:62 data/installer.metainfo.xml.in:75
#: data/installer.metainfo.xml.in:91 data/installer.metainfo.xml.in:103
Expand Down
10 changes: 5 additions & 5 deletions po/ja.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-24 17:42+0000\n"
"PO-Revision-Date: 2023-08-25 03:04+0000\n"
"PO-Revision-Date: 2024-02-10 13:11+0000\n"
"Last-Translator: Ryo Nakano <[email protected]>\n"
"Language-Team: Japanese <https://l10n.elementary.io/projects/installer/"
"installer/ja/>\n"
Expand All @@ -12,7 +12,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 4.17\n"
"X-Generator: Weblate 5.0.2\n"
"X-Launchpad-Export-Date: 2016-09-27 06:40+0000\n"

#: src/Application.vala:42
Expand Down Expand Up @@ -157,9 +157,9 @@ msgid ""
"Proprietary drivers contain private code that can't be reviewed. Security "
"and other updates are dependent on the driver vendor."
msgstr ""
"プロプライエタリードライバーには、検査不能な非公開のコードが含まれます。"
"キュリティーアップデートやそのほかのアップデートは、ドライバーの開発元に左右"
"されます。"
"プロプライエタリードライバーには、検査不能な非公開のコードが含まれます。セキ"
"ュリティアップデートやそのほかのアップデートは、ドライバーの開発元に左右され"
"ます。"

#: src/Views/DriversView.vala:54
msgid "An Internet connection is required to install NVIDIA® graphics drivers."
Expand Down
3 changes: 1 addition & 2 deletions src/Views/PartitioningView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class Installer.PartitioningView : AbstractInstallerView {
break;
case Distinst.PartitionTable.GPT:
// Device is in EFI mode, so we also require a boot partition
required_description = _("You must at least select a <b>Root (/)</b> partition and a <b>Boot (/boot/efi)</b> partition.");
required_description = _("You must at least select a <b>Root (/)</b> partition and an optional <b>Boot (/boot/efi)</b> partition.");
break;
}

Expand Down Expand Up @@ -225,7 +225,6 @@ public class Installer.PartitioningView : AbstractInstallerView {
case Distinst.PartitionTable.MSDOS:
break;
case Distinst.PartitionTable.GPT:
required |= Defined.EFI;
break;
}

Expand Down

0 comments on commit b70945d

Please sign in to comment.