matter/matt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: locale files merge conflict

Browse Source
This commit is contained in:
ngn 2024-08-16 03:54:31 +03:00
commit 3edf678b30
3 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -11,7 +11,7 @@ OBJS = $(patsubst src/%.c,dist/%.o,$(SRCS))
CFLAGS = -O3 -fstack-protector-strong -fcf-protection=full -fstack-clash-protection
LIBS = -linih -lmp
VERSION = 24.02
VERSION = 24.01
all: dist dist/matt $(PO_OUTS)

77
locale/tr/LC_MESSAGES/matt.po
View File

@ -8,11 +8,11 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-08-16 03:44+0300\n"
"POT-Creation-Date: 2024-08-16 03:54+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: tr\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -31,9 +31,8 @@ msgid "Unknown configuration option: %s/%s"
msgstr "Unknown configuration option: %s/%s"
#: src/config.c:79
#, fuzzy
msgid "Failed to access the configuration file: "
msgstr "Failed to access the configuration file: %s"
msgstr "Failed to access the configuration file: "
#: src/config.c:84
msgid "Failed to parse the configuration"
@ -81,6 +80,31 @@ msgstr "Please answer with y/n"
msgid "Received a segfault"
msgstr "Received a segfault"
#: src/main.c:63
#, fuzzy
msgid "show information about a single package"
msgstr "show information about a single package"
#: src/main.c:64
msgid "list all the installed packages"
msgstr "list all the installed packages"
#: src/main.c:65
msgid "update the pool info and package lists"
msgstr "update the pool info and package lists"
#: src/main.c:66
msgid "install package(s) from remote pools"
msgstr "install package(s) from remote pools"
#: src/main.c:67
msgid "remove installed package(s)"
msgstr "remove installed package(s)"
#: src/main.c:68
msgid "update installed package(s)"
msgstr "update installed package(s)"
#: src/main.c:102
msgid "Failed to lock, matt is already running"
msgstr "Failed to lock, matt is already running"
@ -94,24 +118,21 @@ msgid "Failed to access the root directory, are you running as root?"
msgstr "Failed to access the root directory, are you running as root?"
#: src/main.c:134
#, fuzzy
msgid "Failed to access the data directory ("
msgstr "Failed to access the configuration file: %s"
msgstr "Failed to access the data directory ("
#: src/main.c:138
#, fuzzy
msgid "Failed to access the temp directory ("
msgstr "Failed to open the editor: %s"
msgstr "Failed to access the temp directory ("
#: src/main.c:142
#, fuzzy, c-format
#, c-format
msgid "Failed to initialize libmp context: %s"
msgstr "Failed to install "
msgstr "Failed to initialize libmp context: %s"
#: src/main.c:153
#, fuzzy
msgid "Failed to create the pools directory ("
msgstr "Failed to open the editor: %s"
msgstr "Failed to create the pools directory ("
#: src/main.c:163
msgid "Failed to add pool "
@ -123,12 +144,12 @@ msgstr "Command not found: "
#: src/main.c:178
msgid "Displaying help information"
msgstr ""
msgstr "Displaying help information"
#: src/main.c:181
#, fuzzy, c-format
#, c-format
msgid "MatterLinux package manager %s (libmp %s)"
msgstr "MatterLinux package manager (version %s)"
msgstr "MatterLinux package manager %s (libmp %s)"
#: src/main.c:182
msgid "Usage: "
@ -182,7 +203,7 @@ msgstr "Package "
#: src/cmd/info.c:48 src/cmd/install.c:28 src/cmd/list.c:18 src/cmd/remove.c:22
#: src/cmd/sync.c:15 src/cmd/update.c:17
msgid "Unknown argument: "
msgstr ""
msgstr "Unknown argument: "
#: src/cmd/info.c:53 src/cmd/list.c:23
msgid "Listing options for the list command:"
@ -258,12 +279,11 @@ msgstr "There are no avaliable pools, have you synced yet?"
#: src/cmd/install.c:62
msgid "Specified "
msgstr ""
msgstr "Specified "
#: src/cmd/install.c:72
#, fuzzy
msgid "Failed to load "
msgstr "Failed to download "
msgstr "Failed to load "
#: src/cmd/install.c:82 src/cmd/remove.c:54
msgid "Failed to find "
@ -375,22 +395,3 @@ msgstr "All packages are up-to-date"
#: src/cmd/update.c:67
msgid "Failed to update "
msgstr "Failed to update "
#~ msgid "Cannot remove "
#~ msgstr "Cannot remove "
#, c-format
#~ msgid "Failed to sync %s: %s"
#~ msgstr "Failed to sync %s: %s"
#, c-format
#~ msgid "Bad root directory (%s): %s"
#~ msgstr "Bad root directory (%s): %s"
#, c-format
#~ msgid "Bad datadir (%s): %s"
#~ msgstr "Bad datadir (%s): %s"
#, c-format
#~ msgid "Bad tmpdir (%s): %s"
#~ msgstr "Bad tmpdir (%s): %s"

12
src/main.c
View File

@ -60,12 +60,12 @@ int main(int argc, char *argv[], char *envp[]) {
textdomain("matt");
cmd_t commands[] = {
{.name = "info", .desc = "show information about a single package", .root = false, .func = cmd_info },
{.name = "list", .desc = "list all the installed packages", .root = false, .func = cmd_list },
{.name = "sync", .desc = "update the pool info and package lists", .root = true, .func = cmd_sync },
{.name = "install", .desc = "install package(s) from remote pools", .root = true, .func = cmd_install},
{.name = "remove", .desc = "remove installed package(s)", .root = true, .func = cmd_remove },
{.name = "update", .desc = "update installed package(s)", .root = true, .func = cmd_update },
{.name = "info", .desc = _("show information about a single package"), .root = false, .func = cmd_info },
{.name = "list", .desc = _("list all the installed packages"), .root = false, .func = cmd_list },
{.name = "sync", .desc = _("update the pool info and package lists"), .root = true, .func = cmd_sync },
{.name = "install", .desc = _("install package(s) from remote pools"), .root = true, .func = cmd_install},
{.name = "remove", .desc = _("remove installed package(s)"), .root = true, .func = cmd_remove },
{.name = "update", .desc = _("update installed package(s)"), .root = true, .func = cmd_update },
};
char *full_datadir = NULL, *full_tmpdir = NULL, *full_pooldir = NULL;