Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci-fedora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ jobs:
make indent && \
git diff --exit-code && \
\
make -j$(nproc) && \

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(apparently) losing the parallel build seems unfortunate.
in principle, every target should work with -j. if it doesn't, some dependencies are missing.

make check && \
make install \
make -j$(nproc) distcheck && \

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, here we go (cf. first commit). this is asking for a re-cut, but i'm not sure how yet.

\
make -C doc/man \

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you could just use the artifacts from distcheck's build. it doesn't auto-clean after itself.

'

- name: Render manual pages to HTML
Expand All @@ -76,7 +76,7 @@ jobs:

for MANPAGE in $MANPAGES ; do
man.mandoc -K utf-8 -mandoc -T html -O style=mandoc.css \
$(pwd)/install-prefix/share/man/man1/$MANPAGE.1 > man/$MANPAGE.html
$(pwd)/doc/man/$MANPAGE.1 > man/$MANPAGE.html
done

echo "<div align='right'>Manual pages: " > man/header.html
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/ci-freebsd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,16 @@ jobs:
- name: Build on FreeBSD
uses: vmactions/freebsd-vm@v1
with:
sync: nfs
prepare: |
pkg install -y autoconf automake gettext libtool pkgconf
pkg install -y aspell check glib libssh2 libX11 python3

run: |
./autogen.sh

pw useradd test -d "$(pwd)"
chown -R test $(pwd)

su - test -c ' \
./autogen.sh && \
\
export CFLAGS="${{ inputs.CFLAGS }}" && \
\
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-solaris.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ jobs:
uses: vmactions/solaris-vm@v1
with:
release: "11.4-gcc" # autoconf automake developer/gcc/gcc-c libtool pkg-config
sync: nfs
prepare: |
pkg install --no-backup-be --no-refresh --accept -v \
aspell check glib2 libssh2 libx11

run: |
./autogen.sh

useradd -d "$(pwd)" test
chown -R test $(pwd)

su - test -c ' \
./autogen.sh && \
\
export PKG_CONFIG_PATH=/usr/lib/64/pkgconfig && \
\
./configure \
Expand Down
17 changes: 3 additions & 14 deletions .github/workflows/ci-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,9 @@ jobs:
- name: Bootstrap build system
run: ./autogen.sh

- name: Build distribution archive
run: |
mkdir -p build-distrib && cd $_

../configure

make dist-bzip2

- name: Build full configuration
run: |
tar -xjf $(ls build-distrib/mc-*.tar.bz2) --one-top-level=build-full
cd build-full
mkdir build-full && cd $_

../configure \
--prefix="$(pwd)/install" \
Expand All @@ -47,8 +38,7 @@ jobs:

- name: Build ncurses configuration
run: |
tar -xjf $(ls build-distrib/mc-*.tar.bz2) --one-top-level=build-ncurses
cd build-ncurses
mkdir build-ncurses && cd $_

../configure \
--prefix="$(pwd)/install" \
Expand All @@ -60,8 +50,7 @@ jobs:

- name: Build minimal configuration
run: |
tar -xjf $(ls build-distrib/mc-*.tar.bz2) --one-top-level=build-minimal
cd build-minimal
mkdir build-minimal && cd $_

../configure \
--prefix="$(pwd)/install" \
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ make.clang
make.gcc
make.tcc
misc/mc.ext.ini
mc.charsets
tests/lib/vfs/mc.charsets
src/vfs/extfs/helpers/torrent
src/vfs/extfs/helpers/uc1541
tests/src/editor/test-data.txt
Expand Down
17 changes: 7 additions & 10 deletions autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,13 @@ cd "$srcdir"

${AUTORECONF:-autoreconf} --verbose --install --force -I m4 ${AUTORECONF_FLAGS}

# Generate po/POTFILES.in
if ! xgettext -h 2>&1 | grep -- '--keyword' >/dev/null ; then
echo "gettext is unable to extract translations, set XGETTEXT to GNU gettext!" >&2
touch po/POTFILES.in
else
${XGETTEXT:-xgettext} --keyword=_ --keyword=N_ --keyword=Q_ --output=- \
`find . -name '*.[ch]'` | ${SED-sed} -ne '/^#:/{s/#://;s/:[0-9]*/\
/g;s/ //g;p;}' | \
grep -v '^$' | sort | uniq >po/POTFILES.in
fi
# Generate po/POTFILES.in from sources that call `_ ()`, `N_ ()`, `Q_ ()`
# or `ngettext ()`; false positives are harmless, `xgettext` skips them
for f in `find lib src -name '*.[ch]'`; do
if grep '_ *(' "$f" >/dev/null || grep 'gettext *(' "$f" >/dev/null; then
echo "$f"
fi
done | LC_ALL=C sort >po/POTFILES.in

"$srcdir/version.sh" "$srcdir"

Expand Down
24 changes: 13 additions & 11 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ AC_DEFINE([PACKAGE], ["mc"], [Name of package])
dnl Enable silent rules by default (if yes)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

# Enforce failing upon unknown `./configure` options by default
if test "x$enable_option_checking" != xno; then
enable_option_checking=fatal
fi

mc_VERSION

AM_MAINTAINER_MODE
Expand Down Expand Up @@ -334,7 +339,13 @@ dnl ############################################################################
AC_CHECK_FUNCS([setlocale])

AM_GNU_GETTEXT([external], [need-ngettext])
AM_GNU_GETTEXT_VERSION([0.18.2])

dnl Do NOT replace this with AM_GNU_GETTEXT_REQUIRE_VERSION: it makes autopoint
dnl copy the files of the installed gettext instead. Since gettext 0.24, these
dnl require a make that supports `!=' (GNU make >= 4.0 or BSD make), so tarballs
dnl made on a recent system wouldn't build with the native make on macOS,
dnl Solaris or AIX.
AM_GNU_GETTEXT_VERSION([0.19.8])

mc_ENCODING

Expand Down Expand Up @@ -511,7 +522,7 @@ ALL_DOC_LINGUAS="es hu it pl ru sr"
DOC_LINGUAS=
if test "x$USE_NLS" = xyes; then
if test -z "$LINGUAS"; then
langs="`grep -v '^#' $srcdir/po/LINGUAS`"
langs="`sed -e '/^#/d' -e 's/#.*//' $srcdir/po/LINGUAS`"
else
langs="$LINGUAS"
fi
Expand Down Expand Up @@ -736,12 +747,3 @@ Configuration:
Internal editor: ${edit_msg}
Diff viewer: ${diff_msg}
])

dnl option checking is disable by default due to AC_CONFIG_SUBDIRS
dnl we enable it back for top-level ./configure
if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
fatal) AC_MSG_ERROR([unrecognized options: $ac_unrecognized_opts]) ;;
*) AC_MSG_WARN( [unrecognized options: $ac_unrecognized_opts]) ;;
esac
fi
2 changes: 1 addition & 1 deletion doc/HACKING
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ This command can take a while.

Note that the version of gettext doesn't affect the snapshot because the
distributed files are installed by gettext from archives for the version
used in the AM_GNU_GETTEXT_VERSION macro, which is 0.18.2.
used in the AM_GNU_GETTEXT_VERSION macro.



Expand Down
2 changes: 1 addition & 1 deletion doc/INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Build requirements for GNU Midnight Commander
- slang2 or ncurses screen library
- https://www.jedsoft.org/slang/
- https://invisible-island.net/ncurses/ncurses.html
- gettext >= 0.18.2
- gettext >= 0.19.8

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'd add "(upstream commits require exactly this version)" or something like that.

- https://www.gnu.org/software/gettext/
- gpm (general purpose mouse daemon as an alternative to xterm mouse)
- https://www.nico.schottelius.org/software/gpm/
Expand Down
1 change: 0 additions & 1 deletion misc/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
mc.ext
ext.d/doc.sh
ext.d/misc.sh
ext.d/text.sh
mc.charsets
Expand Down
1 change: 0 additions & 1 deletion po/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
*.mo
*.msg
*.pox
*.pot
Makefile
Makefile.in
Makefile.in.in
Expand Down
18 changes: 15 additions & 3 deletions po/Makevars
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,18 @@ MSGID_BUGS_ADDRESS =
EXTRA_LOCALE_CATEGORIES =

# Suppress location information by default
MSGMERGE_FLAGS = --no-location
MSGMERGE = msgmerge ${MSGMERGE_FLAGS}
MSGMERGE_UPDATE = msgmerge --update ${MSGMERGE_FLAGS}
MSGMERGE_OPTIONS = --no-location

# mc.pot is tracked in git, which doesn't preserve timestamps, and the PO
# files come from Transifex, so neither "make" nor "make dist" should
# update them; use "make update-po" explicitly.
PO_DEPENDS_ON_POT = no
DIST_DEPENDS_ON_UPDATE_PO = no

# Without "update-po", "make -j dist" builds the same .gmo files both from
# "dist2" and from "stamp-po" in parallel, which then fail to rename
.NOTPARALLEL:

# The .gmo files are only rebuilt via "stamp-po", so it must also be
# outdated when the PO files change, e.g., after "git pull"
stamp-po: $(POFILES)
13 changes: 0 additions & 13 deletions po/Rules-pot-defaults

This file was deleted.

58 changes: 27 additions & 31 deletions po/af.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Midnight Commander\n"
"Report-Msgid-Bugs-To: https://github.com/MidnightCommander/mc/issues\n"
"POT-Creation-Date: 2026-03-01 11:35+0300\n"
"POT-Creation-Date: 2026-10-22 11:34+0200\n"
"PO-Revision-Date: 2010-12-29 10:19+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Afrikaans (http://app.transifex.com/mc/mc/language/af/)\n"
Expand Down Expand Up @@ -464,12 +464,6 @@ msgstr ""
msgid "Shift"
msgstr ""

msgid "The TERM environment variable is unset!\n"
msgstr ""

msgid "Cannot check SIGWINCH pipe"
msgstr ""

#, c-format
msgid ""
"\n"
Expand All @@ -494,6 +488,12 @@ msgid ""
"Check the TERM environment variable.\n"
msgstr ""

msgid "The TERM environment variable is unset!\n"
msgstr ""

msgid "Cannot check SIGWINCH pipe"
msgstr ""

msgid "B"
msgstr ""

Expand Down Expand Up @@ -1775,6 +1775,9 @@ msgstr ""
msgid "&Preallocate space"
msgstr ""

msgid "Use COW file cloning"
msgstr ""

msgid "Esc key mode"
msgstr ""

Expand Down Expand Up @@ -2718,6 +2721,13 @@ msgstr ""
msgid "Sorry, I could not put the job in background"
msgstr ""

#, c-format
msgid ""
"Destination\n"
"%s\n"
"must be a directory"
msgstr ""

msgid "S&uspend"
msgstr ""

Expand Down Expand Up @@ -2990,9 +3000,6 @@ msgstr ""
msgid "Screen lis&t"
msgstr ""

msgid "&Listing format edit"
msgstr ""

msgid "Edit &extension file"
msgstr ""

Expand Down Expand Up @@ -3563,13 +3570,6 @@ msgid ""
"%s"
msgstr ""

#, c-format
msgid ""
"Destination\n"
"%s\n"
"must be a directory"
msgstr ""

#, c-format
msgid "Delete %s?"
msgstr ""
Expand Down Expand Up @@ -3854,6 +3854,12 @@ msgid ""
"%s"
msgstr ""

#, c-format
msgid ""
"Corrupted cpio header encountered in\n"
"%s"
msgstr ""

#, c-format
msgid ""
"Inconsistent hardlinks of\n"
Expand All @@ -3866,12 +3872,6 @@ msgstr ""
msgid "%s contains duplicate entries! Skipping!"
msgstr ""

#, c-format
msgid ""
"Corrupted cpio header encountered in\n"
"%s"
msgstr ""

#, c-format
msgid ""
"Unexpected end of file\n"
Expand Down Expand Up @@ -4217,6 +4217,9 @@ msgstr ""
msgid "Aborted transfer would be successful."
msgstr ""

msgid "tar: mc_lseek not stopped at a record boundary"
msgstr ""

msgid "Inconsistent tar archive"
msgstr ""

Expand All @@ -4235,9 +4238,6 @@ msgid ""
"doesn't look like a tar archive"
msgstr ""

msgid "tar: mc_lseek not stopped at a record boundary"
msgstr ""

msgid "Invalid value"
msgstr ""

Expand Down Expand Up @@ -4328,15 +4328,11 @@ msgstr ""
msgid ""
"Cannot open\n"
"%s\n"
"in parse mode\n"
"%s"
"in parse mode"
msgstr ""

msgid "Search done"
msgstr ""

msgid "Continue from beginning?"
msgstr ""

msgid "Cannot fetch a local copy of /ftp://some.host/editme.txt"
msgstr ""
Loading
Loading