Skip to content

Commit

Permalink
Merge branch 'icewm-1-4-BRANCH'
Browse files Browse the repository at this point in the history
  • Loading branch information
gijsbers committed Jun 6, 2024
2 parents 35ebf60 + 7b78c76 commit 03cfb7a
Show file tree
Hide file tree
Showing 31 changed files with 384 additions and 2,793 deletions.
4 changes: 0 additions & 4 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,6 @@ esac

# Checks for header files.
AS_BOX([Header Files])
AC_HEADER_STDC
AC_HEADER_DIRENT
AC_HEADER_SYS_WAIT
AC_PATH_X
AC_PATH_XTRA
AC_CHECK_HEADERS([execinfo.h sched.h sys/sched.h])
Expand All @@ -139,7 +136,6 @@ AC_CHECK_HEADER_STDBOOL
AC_C_INLINE
AC_TYPE_PID_T
AC_TYPE_SIZE_T
AC_HEADER_TIME
AC_STRUCT_TM

AC_CHECK_SIZEOF(char, 1)
Expand Down
6 changes: 4 additions & 2 deletions doc/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@ adoc_input = $(srcdir)/icewm.adoc

$(html_documentation):
$(AM_V_GEN)if test -x "`which $(MARKDOWN) 2>/dev/null`"; then \
if test $(mark_input) -nt $(html_documentation); then \
if test $(mark_input) -nt $(html_documentation) \
-o ! -s $(html_documentation); then \
$(MARKDOWN) $(mark_input) >$@; \
fi; \
elif test -x "`which $(ASCIIDOC) 2>/dev/null`"; then \
if test $(adoc_input) -nt $(html_documentation); then \
if test $(adoc_input) -nt $(html_documentation) \
-o ! -s $(html_documentation); then \
$(ASCIIDOC) $(ASCIIDOC_BACKEND) -o $@ $(adoc_input); \
fi; \
else \
Expand Down
2 changes: 2 additions & 0 deletions man/icesh.pod
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,8 @@ by 50% and increases the height by 200 pixels.
Move the selected window or windows to the screen position I<X> I<Y>.
To specify I<X> or I<Y> values relative to the right side or bottom side
precede the value with an extra minus sign, like in C<move -+10 --20>.
When I<X> or I<Y> end with a percent sign C<%>, they refer to a percentage
of the desktop work area.

=item B<moveby> I<X> I<Y>

Expand Down
2 changes: 1 addition & 1 deletion man/icewm-preferences.pod
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ Favour Xft fonts over core X11 fonts where possible.

=item B<MailBoxPath>=""

A colon separated list of paths of your mailboxes.
A list of paths of your mailboxes separated by spaces.
If this is empty, $MAILPATH or $MAIL is used instead.

Path to a mbox file. Remote mail boxes are accessed by specifying an URL
Expand Down
46 changes: 27 additions & 19 deletions man/icewm.pod
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ B<icewm> [I<OPTIONS>]

=head2 DESCRIPTION

B<icewm> is a window manager for the X11 window system.
It aims to be small, fast and familiar to new users.
B<icewm> is a small and fast window manager for the X11 window system. It
is best started by L<icewm-session(1)>, which also starts L<icewmbg(1)>.

B<icewm> is called a re-parenting window manager,
because it draws small frames around application windows.
By dragging this frame with the mouse, windows are resized or moved.
B<icewm> is called I<re-parenting>, because it draws frames around
application windows. Drag this frame with the mouse, to move or resize
a window.

Because windows may overlap, B<icewm> is also a stacking window manager.
Many windows may exist, some hidden behind others.
Expand All @@ -26,6 +26,7 @@ By switching between workspaces, the user can attend to different tasks,
while keeping oversight. This is supported by a task bar and a pager.

The installation comes with several themes. Choose a theme via a menu.
Install extra themes automatically with the B<--install> option.

B<icewm> is compliant with the ICCCM and EWMH window manager specifications.

Expand Down Expand Up @@ -523,22 +524,29 @@ also be changed by bringing the drag icon to the screen edge.

The task bar contains a command-line prompt called the address bar,
if B<EnableAddressBar>=1. It is always shown when B<ShowAddressBar>=1,
otherwise it is activated by B<KeySysAddressBar>=C<Alt+Ctrl+Space>.
In it a shell command can be typed, which is executed by the
B<AddressBarCommand>=C</bin/sh> when pressing C<Enter>.
On C<Control+Enter> this command is executed in a new terminal
as given by B<TerminalCommand>.
otherwise it is activated by B<KeySysAddressBar>=C<Alt+Ctrl+space>.
In it a shell command can be typed. On I<Enter> it is executed by the
B<AddressBarCommand>=C</bin/sh>. On I<Control+Enter> this command is
executed in a new terminal as given by B<TerminalCommand>.

Commands are executed relative to the working directory of icewm.
This can be shown by executing C<pwd>. It can be changed using the C<cd>
command. Without argument it defaults to the home directory. With one
argument it is changed. This argument is expanded when it starts with a
dollar or tilde. When it is equal to C<->, it reverts to the previous
directory.
This is shown by C<pwd>. Change it with C<cd>. Without argument C<cd>
defaults to the home directory. With one argument it is changed.
This argument is expanded when it starts with a dollar or tilde.
When it is equal to C<->, it reverts to the previous directory.

The address bar has a history that is navigable by I<Up> and I<Down>.
It supports file completion using C<Tab> or C<Ctrl+I>, cut/copy/paste
and these editing operations:
This history is saved in a file F<ahistory> in your icewm directory
and restored when icewm starts.

Completion is supported using I<Tab> or I<Ctrl+I>. The leading command
is completed from directories in your PATH, while file arguments are
expanded from the location in the file system. In addition usernames
and environment variables can also be expanded. For example, C<echo $TMP>
and I<Tab> may expand to C<echo $TMPDIR> and C<echo ~ro> and I<Tab> may
expand to C<echo ~root>.

The address bar implements cut/copy/paste and these editing operations:

=over

Expand Down Expand Up @@ -834,7 +842,7 @@ Rolls up the active window.

Hides the active window.

=item B<KeyWinMenu>=C<Alt+Space>
=item B<KeyWinMenu>=C<Alt+space>

Posts the window menu.

Expand Down Expand Up @@ -938,7 +946,7 @@ Activates the IceWM root menu in the lower left corner.

Opens the IceWM system window list in the center of the screen.

=item B<KeySysAddressBar>=C<Alt+Ctrl+Space>
=item B<KeySysAddressBar>=C<Alt+Ctrl+space>

Opens the address bar in the task bar where a command can be typed.

Expand Down
1 change: 0 additions & 1 deletion po/LINGUAS
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ pt
pt_BR
ro
ru
si
sk
sl
sv
Expand Down
18 changes: 9 additions & 9 deletions po/pt.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: icewm 1.6.6.83\n"
"Report-Msgid-Bugs-To: https://github.com/bbidulock/icewm/issues\n"
"POT-Creation-Date: 2024-05-20 16:47+0200\n"
"PO-Revision-Date: 2023-07-23 12:15+0000\n"
"POT-Creation-Date: 2024-05-09 20:44+0200\n"
"PO-Revision-Date: 2024-05-23 01:46+0000\n"
"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
"Language-Team: Portuguese <https://l10n.opensuse.org/projects/icewm/"
"icewm-1-4-branch/pt/>\n"
Expand All @@ -17,7 +17,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.9.1\n"
"X-Generator: Weblate 5.5.5\n"

#: src/aapm.cc:113
#, c-format
Expand Down Expand Up @@ -2268,7 +2268,7 @@ msgstr " -o, --output=FILE Redirecionar todos os resultados para FILE.\n"

#: src/wmapp.cc:1655
msgid " -i, --install=THEME Install THEME from extra or 'list'.\n"
msgstr ""
msgstr " -i, --install=TEMA Instalar TEMA a partir de extra ou 'lista'.\n"

#: src/wmapp.cc:1658
#, c-format
Expand Down Expand Up @@ -2440,23 +2440,23 @@ msgstr "Recarregar win_options"
msgid "Reload ke_ys"
msgstr "Recarregar tec_las"

#: src/wmframe.cc:1376
#: src/wmframe.cc:1375
msgid "Rename"
msgstr "Renomear"

#: src/wmframe.cc:1377
#: src/wmframe.cc:1376
msgid "Rename the window title"
msgstr "Renomear o título da janela"

#: src/wmframe.cc:1871
#: src/wmframe.cc:1868
msgid ""
"WARNING! All unsaved changes will be lost when\n"
"this client is killed. Do you wish to proceed?"
msgstr ""
"ATENÇÃO! Qualquer alteração não guardada será perdida\n"
"ao interromper este cliente. Deseja continuar?"

#: src/wmframe.cc:1876
#: src/wmframe.cc:1873
msgid "Kill Client: "
msgstr "Interromper cliente: "

Expand Down Expand Up @@ -2839,7 +2839,7 @@ msgstr ""
msgid "iconv doesn't supply (sufficient) %s to %s converters."
msgstr "iconv não supre (suficientes) %s para conversores %s."

#: src/ylocale.cc:241
#: src/ylocale.cc:247
#, c-format
msgid "Invalid multibyte string \"%s\": %s"
msgstr "Cadeia multibyte \"%s\" inválida: %s"
Expand Down
20 changes: 10 additions & 10 deletions po/pt_BR.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ msgid ""
msgstr ""
"Project-Id-Version: icewm 1.3.4pre2\n"
"Report-Msgid-Bugs-To: https://github.com/bbidulock/icewm/issues\n"
"POT-Creation-Date: 2024-05-20 16:47+0200\n"
"PO-Revision-Date: 2023-10-04 23:15+0000\n"
"Last-Translator: Luiz Fernando Ranghetti <elchevive68@gmail.com>\n"
"POT-Creation-Date: 2024-05-09 20:44+0200\n"
"PO-Revision-Date: 2024-05-23 22:46+0000\n"
"Last-Translator: Rodrigo Macedo <sottomaiormacedotec@sottomaiormacedo.tech>\n"
"Language-Team: Portuguese (Brazil) <https://l10n.opensuse.org/projects/icewm/"
"icewm-1-4-branch/pt_BR/>\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"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.9.1\n"
"X-Generator: Weblate 5.5.5\n"
"X-Language: pt_BR\n"

#: src/aapm.cc:113
Expand Down Expand Up @@ -2297,7 +2297,7 @@ msgstr " -o, --output=ARQUIVO Redireciona toda as saídas para o ARQUIVO.\n"

#: src/wmapp.cc:1655
msgid " -i, --install=THEME Install THEME from extra or 'list'.\n"
msgstr ""
msgstr " -i, --install=THEME Instale o TEMA do extra ou da 'list'.\n"

#: src/wmapp.cc:1658
#, c-format
Expand Down Expand Up @@ -2469,15 +2469,15 @@ msgstr "Recarregar win_options"
msgid "Reload ke_ys"
msgstr "Recarregar c_haves"

#: src/wmframe.cc:1376
#: src/wmframe.cc:1375
msgid "Rename"
msgstr "Renomear"

#: src/wmframe.cc:1377
#: src/wmframe.cc:1376
msgid "Rename the window title"
msgstr "Renomear o título da janela"

#: src/wmframe.cc:1871
#: src/wmframe.cc:1868
msgid ""
"WARNING! All unsaved changes will be lost when\n"
"this client is killed. Do you wish to proceed?"
Expand All @@ -2487,7 +2487,7 @@ msgstr ""
"perdidas quando este cliente for finalizado.\n"
"Você quer continuar?"

#: src/wmframe.cc:1876
#: src/wmframe.cc:1873
msgid "Kill Client: "
msgstr "Interromper o Cliente: "

Expand Down Expand Up @@ -2878,7 +2878,7 @@ msgstr ""
msgid "iconv doesn't supply (sufficient) %s to %s converters."
msgstr "O iconv não supre (suficientemente) %s para os conversores %s."

#: src/ylocale.cc:241
#: src/ylocale.cc:247
#, c-format
msgid "Invalid multibyte string \"%s\": %s"
msgstr "A cadeia de vários bytes \"%s\" não é válida: %s"
Expand Down
Loading

0 comments on commit 03cfb7a

Please sign in to comment.