This commit is contained in:
Valeria Fadeeva 2023-10-13 01:33:20 +05:00
parent d7b3fbfe23
commit 78226c985c
24 changed files with 205 additions and 205 deletions

245
Cargo.lock generated
View File

@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "aho-corasick"
version = "1.1.1"
version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab"
checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
dependencies = [
"memchr",
]
@ -140,9 +140,9 @@ dependencies = [
[[package]]
name = "bstr"
version = "1.6.2"
version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a"
checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019"
dependencies = [
"memchr",
"serde",
@ -160,30 +160,6 @@ version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
[[package]]
name = "cachyos-hello"
version = "0.10.1"
dependencies = [
"alpm",
"alpm-utils",
"gdk",
"gdk-pixbuf",
"gio",
"glib",
"gtk",
"i18n-embed",
"i18n-embed-fl",
"once_cell",
"pacmanconf",
"phf",
"reqwest",
"rust-embed",
"serde",
"serde_json",
"subprocess",
"unic-langid",
]
[[package]]
name = "cairo-rs"
version = "0.18.2"
@ -282,7 +258,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
dependencies = [
"cfg-if",
"hashbrown 0.14.0",
"hashbrown 0.14.1",
"lock_api",
"once_cell",
"parking_lot_core",
@ -306,7 +282,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
@ -326,30 +302,19 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "errno"
version = "0.3.3"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd"
checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
dependencies = [
"errno-dragonfly",
"libc",
"windows-sys",
]
[[package]]
name = "errno-dragonfly"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
dependencies = [
"cc",
"libc",
]
[[package]]
name = "fastrand"
version = "2.0.0"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
[[package]]
name = "field-offset"
@ -484,7 +449,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
@ -655,7 +620,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
@ -741,7 +706,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
@ -771,9 +736,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
[[package]]
name = "hashbrown"
version = "0.14.0"
version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
[[package]]
name = "heck"
@ -868,15 +833,15 @@ dependencies = [
"serde",
"serde_derive",
"thiserror",
"toml 0.8.0",
"toml 0.8.2",
"unic-langid",
]
[[package]]
name = "i18n-embed"
version = "0.14.0"
version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26261c73a1670a3f632a8765bb6b22c62fc391f3ddc805b87fd00cd6158e4456"
checksum = "94205d95764f5bb9db9ea98fa77f89653365ca748e27161f5bbea2ffd50e459c"
dependencies = [
"arc-swap",
"fluent",
@ -911,7 +876,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim",
"syn 2.0.37",
"syn 2.0.38",
"unic-langid",
]
@ -925,7 +890,7 @@ dependencies = [
"i18n-config",
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
@ -950,12 +915,12 @@ dependencies = [
[[package]]
name = "indexmap"
version = "2.0.0"
version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
dependencies = [
"equivalent",
"hashbrown 0.14.0",
"hashbrown 0.14.1",
]
[[package]]
@ -1006,15 +971,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
version = "0.2.148"
version = "0.2.149"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
[[package]]
name = "linux-raw-sys"
version = "0.4.7"
version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128"
checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
[[package]]
name = "locale_config"
@ -1054,11 +1019,35 @@ dependencies = [
"libc",
]
[[package]]
name = "melawy-welcome"
version = "0.10.1"
dependencies = [
"alpm",
"alpm-utils",
"gdk",
"gdk-pixbuf",
"gio",
"glib",
"gtk",
"i18n-embed",
"i18n-embed-fl",
"once_cell",
"pacmanconf",
"phf",
"reqwest",
"rust-embed",
"serde",
"serde_json",
"subprocess",
"unic-langid",
]
[[package]]
name = "memchr"
version = "2.6.3"
version = "2.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
[[package]]
name = "memoffset"
@ -1190,7 +1179,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
@ -1304,7 +1293,7 @@ dependencies = [
"phf_shared",
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
@ -1370,9 +1359,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
version = "1.0.67"
version = "1.0.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
dependencies = [
"unicode-ident",
]
@ -1412,9 +1401,9 @@ dependencies = [
[[package]]
name = "regex"
version = "1.9.5"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47"
checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87"
dependencies = [
"aho-corasick",
"memchr",
@ -1424,9 +1413,9 @@ dependencies = [
[[package]]
name = "regex-automata"
version = "0.3.8"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b"
dependencies = [
"aho-corasick",
"memchr",
@ -1435,15 +1424,15 @@ dependencies = [
[[package]]
name = "regex-syntax"
version = "0.7.5"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
checksum = "56d84fdd47036b038fc80dd333d10b6aab10d5d31f4a366e20014def75328d33"
[[package]]
name = "reqwest"
version = "0.11.20"
version = "0.11.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1"
checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
dependencies = [
"base64",
"bytes",
@ -1466,6 +1455,7 @@ dependencies = [
"serde",
"serde_json",
"serde_urlencoded",
"system-configuration",
"tokio",
"tokio-native-tls",
"tower-service",
@ -1496,7 +1486,7 @@ dependencies = [
"proc-macro2",
"quote",
"rust-embed-utils",
"syn 2.0.37",
"syn 2.0.38",
"walkdir",
]
@ -1534,9 +1524,9 @@ dependencies = [
[[package]]
name = "rustix"
version = "0.38.14"
version = "0.38.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f"
checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed"
dependencies = [
"bitflags 2.4.0",
"errno",
@ -1606,9 +1596,9 @@ checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af"
[[package]]
name = "semver"
version = "1.0.19"
version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0"
checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
[[package]]
name = "serde"
@ -1627,7 +1617,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
@ -1664,9 +1654,9 @@ dependencies = [
[[package]]
name = "sha2"
version = "0.10.7"
version = "0.10.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
dependencies = [
"cfg-if",
"cpufeatures",
@ -1742,9 +1732,9 @@ dependencies = [
[[package]]
name = "syn"
version = "2.0.37"
version = "2.0.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
dependencies = [
"proc-macro2",
"quote",
@ -1752,15 +1742,36 @@ dependencies = [
]
[[package]]
name = "system-deps"
version = "6.1.1"
name = "system-configuration"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3"
checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
dependencies = [
"bitflags 1.3.2",
"core-foundation",
"system-configuration-sys",
]
[[package]]
name = "system-configuration-sys"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
dependencies = [
"core-foundation-sys",
"libc",
]
[[package]]
name = "system-deps"
version = "6.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94af52f9402f94aac4948a2518b43359be8d9ce6cd9efc1c4de3b2f7b7e897d6"
dependencies = [
"cfg-expr",
"heck",
"pkg-config",
"toml 0.7.8",
"toml 0.8.2",
"version-compare",
]
@ -1785,29 +1796,29 @@ dependencies = [
[[package]]
name = "thiserror"
version = "1.0.48"
version = "1.0.49"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7"
checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.48"
version = "1.0.49"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
]
[[package]]
name = "tinystr"
version = "0.7.3"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b07bb54ef1f8ff27564b08b861144d3b8d40263efe07684f64987f4c0d044e3e"
checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219"
dependencies = [
"displaydoc",
]
@ -1829,9 +1840,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
version = "1.32.0"
version = "1.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
dependencies = [
"backtrace",
"bytes",
@ -1878,26 +1889,14 @@ dependencies = [
[[package]]
name = "toml"
version = "0.7.8"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
"toml_edit 0.19.15",
]
[[package]]
name = "toml"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c226a7bba6d859b63c92c4b4fe69c5b6b72d0cb897dbc8e6012298e6154cb56e"
dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
"toml_edit 0.20.0",
"toml_edit 0.20.2",
]
[[package]]
@ -1915,20 +1914,18 @@ version = "0.19.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
dependencies = [
"indexmap 2.0.0",
"serde",
"serde_spanned",
"indexmap 2.0.2",
"toml_datetime",
"winnow",
]
[[package]]
name = "toml_edit"
version = "0.20.0"
version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ff63e60a958cefbb518ae1fd6566af80d9d4be430a33f3723dfc47d1d411d95"
checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
dependencies = [
"indexmap 2.0.0",
"indexmap 2.0.2",
"serde",
"serde_spanned",
"toml_datetime",
@ -2097,7 +2094,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
"wasm-bindgen-shared",
]
@ -2131,7 +2128,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.37",
"syn 2.0.38",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@ -2251,9 +2248,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "winnow"
version = "0.5.15"
version = "0.5.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907"
dependencies = [
"memchr",
]

View File

@ -1,5 +1,5 @@
[package]
name = "cachyos-hello"
name = "melawy-welcome"
version = "0.10.1"
authors = ["Vladislav Nepogodin <nepogodin.vlad@gmail.com>"]
license = "GPLv3"

View File

@ -1,7 +1,7 @@
<div align="center">
<h1>CachyOS Welcome</h1>
<h1>Melawy Welcome</h1>
<p>
<strong>Welcome screen for CachyOS written in Rust</strong>
<strong>Welcome screen for Melawy Linux written in Rust</strong>
</p>
<p>

View File

@ -12,8 +12,8 @@ fn main() {
let out_dir = env::var("OUT_DIR").unwrap();
let status = Command::new("glib-compile-resources")
.arg(&format!("--target={}/cachyos-welcome.gresource", out_dir))
.arg("cachyos-welcome.gresource.xml")
.arg(&format!("--target={}/melawy-welcome.gresource", out_dir))
.arg("melawy-welcome.gresource.xml")
.status()
.unwrap();

View File

@ -1,4 +1,4 @@
<big>CachyOS 23.09</big>
<big>Melawy Linux 23.10</big>
Dies ist unser 10. Release im Jahr 2023.
Das Release ändert für systemd-boot die Standard-Verschlüsselungsmethode auf "luks2" und die Netzinstallation wurde aufgeräumt.

View File

@ -1,4 +1,4 @@
<big>CachyOS 23.09</big>
<big>Melawy Linux 23.10</big>
This is our 10th release in 2023.
The release does change for systemd-boot the default encryption method to "luks2" and the netinstall got a clean up.

View File

@ -1,4 +1,4 @@
<big>CachyOS 23.09</big>
<big>Melawy Linux 23.10</big>
To nasze dziesiąte wydanie w 2023 roku.
Wydanie zmienia się dla systemd-Uruchom domyślną metodę szyfrowania na "luks2", a netinstall został oczyszczony.

View File

@ -1,4 +1,4 @@
<big>CachyOS 23.09</big>
<big>Melawy Linux 23.10</big>
Это наш 10-й релиз в 2023 году.
В выпуске действительно изменен для systemd-boot метод шифрования по умолчанию на "luks2", и netinstall был очищен.

View File

@ -1,21 +1,21 @@
{
"default_locale": "en",
"autostart_path": "~/.config/autostart/cachyos-hello.desktop",
"data_path": "/usr/share/cachyos-hello/data/",
"desktop_path": "/usr/share/applications/cachyos-hello.desktop",
"autostart_path": "~/.config/autostart/melawy-welcome.desktop",
"data_path": "/usr/share/melawy-welcome/data/",
"desktop_path": "/usr/share/applications/melawy-welcome.desktop",
"installer_path": "/usr/bin/calamares",
"live_path": "/run/archiso/bootmnt/arch",
"logo_path": "/usr/share/icons/hicolor/scalable/apps/",
"save_path": "~/.config/cachyos-hello.json",
"save_path": "~/.config/melawy-welcome.json",
"urls": {
"development": "https://github.com/cachyos",
"software": "https://github.com/cachyos/cachyos-pkgbuilds",
"donate": "https://www.patreon.com/CachyOS",
"forum": "https://forum.cachyos.org",
"telegram": "https://t.me/+oR-kWT47vRdmMDli",
"discord": "https://discord.gg/qJqj94uFwE",
"reddit": "https://www.reddit.com/r/cachyos",
"twitter": "https://twitter.com/cachyos",
"wiki": "https://wiki.cachyos.org"
"development": "https://github.com/Melawy",
"software": "https://git.melawy.ru/Melawy-Linux/PKGBUILD",
"donate": "https://melawy.ru/donate",
"forum": "https://t.me/Melawy_chat",
"telegram": "https://t.me/Melawy_news",
"discord": "https://discord.gg/725zXx7RhJ",
"reddit": "https://melawy.ru",
"twitter": "https://melawy.ru",
"wiki": "https://github.com/Melawy"
}
}

View File

@ -1,6 +1,6 @@
# About dialog
about-dialog-title = CachyOS Hello
about-dialog-comments = Willkommensdialog für CachyOS
about-dialog-title = Melawy Welcome
about-dialog-comments = Willkommensdialog für Melawy Linux
# Tweaks page
tweaks = Tweaks
@ -59,8 +59,8 @@ offline-error = Die Online-Installation kann nicht gestartet werden! Keine Inter
tweaksbrowser-label = Apps/Tweaks
appbrowser-label = Apps installieren
launch-start-label = Beim Systemstart ausführen
welcome-title = Willkommen bei CachyOS!
welcome-title = Willkommen bei Melawy Linux!
welcome-body =
Danke, dass Sie sich unserer Community anschließen!
Wir, die CachyOS-Entwickler, hoffen, dass Sie es genauso sehr genießen werden CachyOS zu benutzen, wie wir es genießen, es zu entwickeln. Die Links unten werden Ihnen helfen sich in Ihrem neuen Betriebssystem zurechtzufinden. Genießen Sie diese Erfahrung und zögern Sie nicht Ihr Feedback an uns zu senden.
Wir, die Melawy Linux-Entwickler, hoffen, dass Sie es genauso sehr genießen werden Melawy Linux zu benutzen, wie wir es genießen, es zu entwickeln. Die Links unten werden Ihnen helfen sich in Ihrem neuen Betriebssystem zurechtzufinden. Genießen Sie diese Erfahrung und zögern Sie nicht Ihr Feedback an uns zu senden.

View File

@ -1,6 +1,6 @@
# About dialog
about-dialog-title = CachyOS Hello
about-dialog-comments = Welcome screen for CachyOS
about-dialog-title = Melawy Welcome
about-dialog-comments = Welcome screen for Melawy Linux
# Tweaks page
tweaks = Tweaks
@ -59,8 +59,8 @@ offline-error = Unable to start online installation! No internet connection
tweaksbrowser-label = Apps/Tweaks
appbrowser-label = Install Apps
launch-start-label = Launch at start
welcome-title = Welcome to CachyOS!
welcome-title = Welcome to Melawy Linux!
welcome-body =
Thank you for joining our community!
We, the CachyOS Developers, hope that you will enjoy using CachyOS as much as we enjoy building it. The links below will help you get started with your new operating system. So enjoy the experience, and don't hesitate to send us your feedback.
We, the Melawy Linux Developers, hope that you will enjoy using Melawy Linux as much as we enjoy building it. The links below will help you get started with your new operating system. So enjoy the experience, and don't hesitate to send us your feedback.

View File

@ -1,6 +1,6 @@
# About dialog
about-dialog-title = CachyOS Hello
about-dialog-comments = Ekran powitalny CachyOS
about-dialog-title = Melawy Welcome
about-dialog-comments = Ekran powitalny Melawy Linux
# Tweaks page
tweaks = Usprawnienia
@ -59,8 +59,8 @@ offline-error = Instalacja online niemożliwa! Brak połączenia internetowego
tweaksbrowser-label = Programy/Usprawnienia
appbrowser-label = Instalator Programów
launch-start-label = Uruchamiaj przy starcie
welcome-title = Witaj w CachyOS!
welcome-title = Witaj w Melawy Linux!
welcome-body =
Dziękujemy za dołączenie do naszej społeczności!
My, programiści CachyOS, mamy nadzieję, że używanie CachyOS przyniesie Ci tyle radości ile nam jego tworzenie. Poniższe odnośniki pomogą Ci w rozpoczęciu używania nowego systemu operacyjnego. Życzymy miłych wrażeń, nie wahaj się podzielić się z nami swoją opinią.
My, programiści Melawy Linux, mamy nadzieję, że używanie Melawy Linux przyniesie Ci tyle radości ile nam jego tworzenie. Poniższe odnośniki pomogą Ci w rozpoczęciu używania nowego systemu operacyjnego. Życzymy miłych wrażeń, nie wahaj się podzielić się z nami swoją opinią.

View File

@ -1,6 +1,6 @@
# About dialog
about-dialog-title = CachyOS Hello
about-dialog-comments = Приветственный экран CachyOS
about-dialog-title = Melawy Welcome
about-dialog-comments = Приветственный экран Melawy Linux
# Tweaks page
tweaks = Настройки
@ -58,8 +58,8 @@ offline-error = Не удается запустить онлайн-устано
tweaksbrowser-label = Приложения/Настройки
appbrowser-label = Установить ПO
launch-start-label = Автозапуск
welcome-title = Добро пожаловать в CachyOS!
welcome-title = Добро пожаловать в Melawy Linux!
welcome-body =
Благодарим Вас за то, что Вы присоединились к нашему сообществу!
Мы, разработчики CachyOS, надеемся, что пользуясь этой системой, Вы будете испытывать такое же удовольствие, какое мы испытывали, создавая ее. Представленные ниже ссылки помогут Вам начать работу. Наслаждайтесь функционалом CachyOS и оставляйте свои отзывы.
Мы, разработчики Melawy Linux, надеемся, что пользуясь этой системой, Вы будете испытывать такое же удовольствие, какое мы испытывали, создавая ее. Представленные ниже ссылки помогут Вам начать работу. Наслаждайтесь функционалом Melawy Linux и оставляйте свои отзывы.

View File

@ -3,18 +3,18 @@ Terminal=false
Type=Application
Categories=GNOME;GTK;System;
StartupNotify=false
Name=CachyOS Hello
Exec=/usr/bin/cachyos-hello
Icon=org.cachyos.hello
Comment=A tool providing access to documentation and support for new CachyOS users.
Comment[da]=En app med adgang til dokumentation og support for nye CachyOS brugere.
Comment[de]=Ein Tool für schnellen Zugriff auf Support und Dokumentation für neue CachyOS-Nutzer.
Comment[es]=Una herramienta que provee acceso a la documentación y soporte para nuevos usuarios de CachyOS.
Comment[fr]=Outil d'accès à la documentation et support aux nouveaux utilisateurs de CachyOS.
Comment[nl]=Een manier voor nieuwe CachyOS gebruikers om toegang tot documentatie en support te krijgen.
Comment[pl]=Narzędzie ułatwiające dostęp do dokumentacji i pomocy przeznaczone dla nowych użytkowników CachyOS.
Comment[pt_BR]=Uma ferramenta que fornece acesso à documentação e suporte para novos usuários CachyOS.
Comment[pt_PT]=Uma ferramenta que fornece acesso à documentação e suporte para novos usuários CachyOS.
Comment[ru]=Средство доступа к документации и поддержке для новых пользователей CachyOS.
Comment[it]=Strumento per accedere alla documentazione e supporto per nuovi utenti CachyOS.
Comment[tr]=Yeni CachyOS kullanıcıları için dökümantasyon ve destek sağlayan bir araç.
Name=Melawy Welcome
Exec=/usr/bin/melawy-welcome
Icon=org.melawy.welcome
Comment=A tool providing access to documentation and support for new Melawy Linux users.
Comment[da]=En app med adgang til dokumentation og support for nye Melawy Linux brugere.
Comment[de]=Ein Tool für schnellen Zugriff auf Support und Dokumentation für neue Melawy Linux-Nutzer.
Comment[es]=Una herramienta que provee acceso a la documentación y soporte para nuevos usuarios de Melawy Linux.
Comment[fr]=Outil d'accès à la documentation et support aux nouveaux utilisateurs de Melawy Linux.
Comment[nl]=Een manier voor nieuwe Melawy Linux gebruikers om toegang tot documentatie en support te krijgen.
Comment[pl]=Narzędzie ułatwiające dostęp do dokumentacji i pomocy przeznaczone dla nowych użytkowników Melawy Linux.
Comment[pt_BR]=Uma ferramenta que fornece acesso à documentação e suporte para novos usuários Melawy Linux.
Comment[pt_PT]=Uma ferramenta que fornece acesso à documentação e suporte para novos usuários Melawy Linux.
Comment[ru]=Средство доступа к документации и поддержке для новых пользователей Melawy Linux.
Comment[it]=Strumento per accedere alla documentazione e supporto per nuovi utenti Melawy Linux.
Comment[tr]=Yeni Melawy Linux kullanıcıları için dökümantasyon ve destek sağlayan bir araç.

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/cachyos/hello">
<file compressed="true" preprocess="xml-stripblanks">ui/cachyos-hello.glade</file>
<gresource prefix="/org/melawy/welcome">
<file compressed="true" preprocess="xml-stripblanks">ui/melawy-welcome.glade</file>
<file compressed="true">ui/style.css</file>
<file compressed="true">data/img/external-link.png</file>
<file compressed="true">data/img/discord.png</file>

View File

@ -1,4 +1,4 @@
project('cachyos-hello', 'rust',
project('melawy-welcome', 'rust',
version: '0.10.1',
license: 'GPLv3',
meson_version: '>=0.56.0',
@ -10,7 +10,7 @@ project('cachyos-hello', 'rust',
i18n = import('i18n')
gnome = import('gnome')
base_id = 'org.cachyos.hello'
base_id = 'org.melawy.welcome'
dependency('glib-2.0', version: '>= 2.66')
dependency('gio-2.0', version: '>= 2.66')

View File

@ -1,4 +1,4 @@
#!/bin/sh
mkdir -p "${DESTDIR}/${MESON_INSTALL_PREFIX}/share/cachyos-hello/"
cp -r "${MESON_SOURCE_ROOT}/src/scripts" "${DESTDIR}/${MESON_INSTALL_PREFIX}/share/cachyos-hello/"
mkdir -p "${DESTDIR}/${MESON_INSTALL_PREFIX}/share/melawy-welcome/"
cp -r "${MESON_SOURCE_ROOT}/src/scripts" "${DESTDIR}/${MESON_INSTALL_PREFIX}/share/melawy-welcome/"

3
push.sh Executable file
View File

@ -0,0 +1,3 @@
#!/bin/bash
git add . && git commit -m "Update" && git push

View File

@ -21,7 +21,7 @@ mod imp {
impl ObjectSubclass for Application {
type Type = super::Application;
const NAME: &'static str = "CachyOSHello";
const NAME: &'static str = "Melawy Welcome";
}
impl ObjectImpl for Application {}

View File

@ -1,5 +1,5 @@
pub fn init() -> Result<(), glib::Error> {
const GRESOURCE: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/cachyos-welcome.gresource"));
const GRESOURCE: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/melawy-welcome.gresource"));
gio::resources_register(&gio::Resource::from_data(&glib::Bytes::from_static(GRESOURCE))?);

View File

@ -34,7 +34,7 @@ use serde_json::json;
use std::{fs, str};
use subprocess::Exec;
const RESPREFIX: &str = "/org/cachyos/hello";
const RESPREFIX: &str = "/org/melawy/welcome";
static G_SAVE_JSON: Lazy<Mutex<serde_json::Value>> = Lazy::new(|| {
let saved_json = get_saved_json();
@ -77,7 +77,7 @@ fn quick_message(message: &'static str) {
// Spawn child process in separate thread.
std::thread::spawn(move || {
let status = match reqwest::blocking::get("https://cachyos.org") {
let status = match reqwest::blocking::get("https://melawy.ru") {
Ok(resp) => resp.status().is_success() || resp.status().is_server_error(),
_ => false,
};
@ -122,8 +122,8 @@ fn show_about_dialog() {
.translator_credits("translator-credits")
.copyright("2021-2023 CachyOS team")
.license_type(gtk::License::Gpl30)
.website("https://github.com/cachyos/cachyos-welcome")
.website_label("GitHub")
.website("https://git.melawy.ru/Melawy-Linux/melawy-welcome")
.website_label("Git")
.build();
dialog.run();
@ -172,8 +172,8 @@ fn main() {
gresource::init().expect("Could not load gresource file.");
// Set program name.
glib::set_program_name("CachyOSHello".into());
glib::set_application_name("CachyOSHello");
glib::set_program_name("Melawy Welcome".into());
glib::set_application_name("Melawy Welcome");
let application = gtk::Application::new(
Some(APP_ID), // Application id
@ -205,7 +205,7 @@ fn build_ui(application: &gtk::Application) {
);
// Init window
let builder: Builder = Builder::from_resource(&format!("{RESPREFIX}/ui/cachyos-hello.glade"));
let builder: Builder = Builder::from_resource(&format!("{RESPREFIX}/ui/melawy-welcome.glade"));
builder.connect_signals(|_builder, handler_name| {
match handler_name {
// handler_name as defined in the glade file => handler function as defined above
@ -233,7 +233,7 @@ fn build_ui(application: &gtk::Application) {
// Subtitle of headerbar
let header: HeaderBar = builder.object("headerbar").expect("Could not get the headerbar");
header.set_subtitle(Some("CachyOS rolling"));
header.set_subtitle(Some("Melawy Linux"));
// Load images
let logo_path = format!("{}/{}.svg", preferences["logo_path"].as_str().unwrap(), APP_ID);

View File

@ -56,7 +56,7 @@ done
fi
if [ -z "$terminal" ]; then
notify-send -t 1500 --app-name=CachyOS "No terminal installed" "Could not find a terminal emulator. Please install one."
notify-send -t 1500 --app-name="Melawy Linux" "No terminal installed" "Could not find a terminal emulator. Please install one."
exit 1
fi

View File

@ -106,11 +106,11 @@ pub fn run_cmd_terminal(cmd: String, escalate: bool) -> bool {
let cmd_formated = format!("{cmd}; read -p 'Press enter to exit'");
let mut args: Vec<&str> = vec![];
if escalate {
args.extend_from_slice(&["-s", "pkexec /usr/share/cachyos-hello/scripts/rootshell.sh"]);
args.extend_from_slice(&["-s", "pkexec /usr/share/melawy-welcome/scripts/rootshell.sh"]);
}
args.push(cmd_formated.as_str());
let exit_status = Exec::cmd("/usr/share/cachyos-hello/scripts/terminal-helper")
let exit_status = Exec::cmd("/usr/share/melawy-welcome/scripts/terminal-helper")
.args(args.as_slice())
.stdout(Redirection::Pipe)
.join()

View File

@ -3,27 +3,27 @@
Copyright (C) 2021-2023 CachyOS team
This file is part of cachyos-welcome.
This file is part of melawy-welcome.
cachyos-welcome is free software: you can redistribute it and/or modify
melawy-welcome is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
cachyos-welcome is distributed in the hope that it will be useful,
melawy-welcome is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with cachyos-welcome. If not, see <http://www.gnu.org/licenses/>.
along with melawy-welcome. If not, see <http://www.gnu.org/licenses/>.
-->
<interface domain="cachyos-hello">
<interface domain="melawy-welcome">
<requires lib="gtk+" version="3.20"/>
<!-- interface-css-provider-path style.css -->
<!-- interface-license-type gplv3 -->
<!-- interface-name cachyos-welcome -->
<!-- interface-name melawy-welcome -->
<!-- interface-copyright 2021-2023 CachyOS team -->
<object class="GtkImage" id="abouticon">
<property name="visible">True</property>
@ -71,7 +71,7 @@ along with cachyos-welcome. If not, see <http://www.gnu.org/licenses/>.
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="has-focus">True</property>
<property name="label" translatable="yes">Welcome to CachyOS!</property>
<property name="label" translatable="yes">Welcome to Melawy Linux!</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="scale" value="2"/>
@ -89,7 +89,7 @@ along with cachyos-welcome. If not, see <http://www.gnu.org/licenses/>.
<property name="can-focus">False</property>
<property name="label" translatable="yes">Thank you for joining our community!
We, the CachyOS Developers, hope that you will enjoy using CachyOS as much as we enjoy building it. The links below will help you get started with your new operating system. So enjoy the experience, and don't hesitate to send us your feedback.</property>
We, the Melawy Developers, hope that you will enjoy using Melawy as much as we enjoy building it. The links below will help you get started with your new operating system. So enjoy the experience, and don't hesitate to send us your feedback.</property>
<property name="justify">fill</property>
<property name="wrap">True</property>
<property name="width-chars">1</property>
@ -511,7 +511,7 @@ We, the CachyOS Developers, hope that you will enjoy using CachyOS as much as we
<object class="GtkHeaderBar" id="headerbar">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="title">CachyOS Hello</property>
<property name="title">Melawy Welcome</property>
<property name="show-close-button">True</property>
<child>
<placeholder/>