Skip to content

Commit 85f7003

Browse files
gijsbersgijsbers
committed
Merge remote-tracking branch 'upstream/icewm-1-4-BRANCH' into icewm-1-4-BRANCH
2 parents 467f07b + 6af4047 commit 85f7003

23 files changed

+491
-441
lines changed

‎INSTALL-cmakebuild.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,13 @@ Developer/Integrator notes:
3535
```
3636
-DEXTRA_LIBS="-lsupc++"
3737
-DENABLE_LTO=ON
38-
-DEXTRA_MSGMERGE=--verbose -DEXTRA_MSGFMT=--verbose
38+
-DEXTRA_MSGMERGE=--verbose -DEXTRA_MSGFMT=--verbose --log-level=VERBOSE
3939
```
40+
* There is a special target called `update_pot` which refreshes the
41+
translation master template
42+
* Another special option is `-DPO_UPDATE=ON` which extends the `install`
43+
target to replace the PO files in the input source code. NOTE: this might
44+
trigger another recompilation of MO files later.
4045

4146
* There is a configuration example for cmake builds in rebuild.sh.
4247
run: `./rebuild.sh -r --prefix=/usr`

‎man/icewm-keys.pod

+4-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ following four ways, which are identical:
3636
key "Ctrl+plus" xterm
3737
key "Ctrl++" xterm
3838

39-
To bind the mouse use C<Pointer_Button1> for button 1, and so on.
39+
To bind the mouse, use C<Pointer_Button1> for button 1, and so on.
40+
This only works when the mouse is over the root window.
41+
See below for examples.
42+
4043
The command C<icesh keys> instructs icewm to reload this file.
4144

4245
=head2 FORMAT

‎man/icewmbg.pod

+6-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
=head2 NAME
44

5-
icewmbg - a background settings manager for the IceWM window manager
5+
icewmbg - a desktop background image manager for IceWM
66

77
=head2 SYNOPSIS
88

@@ -16,8 +16,7 @@ its own background.
1616

1717
When the background image changes, B<icewmbg> can be notified to
1818
update the background. When switching workspaces, it checks the image
19-
file modification time. If the file has changed, it reloads the
20-
image from file.
19+
file modification time. If it has changed, it reloads the image.
2120

2221
B<icewmbg> supports semitransparency. Semitransparent background
2322
images and colours can be configured.
@@ -136,6 +135,10 @@ A leading tilde or environment variable is expanded.
136135

137136
Print a list of all preference values that B<icewmbg> will use.
138137

138+
=item B<--verbose>
139+
140+
Print a log of actions and some events.
141+
139142
=back
140143

141144
=head2 GENERAL OPTIONS

‎po/CMakeLists.txt

+42-25
Original file line numberDiff line numberDiff line change
@@ -37,34 +37,51 @@ if(gettext AND xgettext AND msgmerge AND msgfmt)
3737
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
3838
COMMENT "Extracting translatable messages to ${_potFile} -- may require config restart!")
3939
ADD_CUSTOM_TARGET(update_pot DEPENDS stamp-potfile)
40+
message(VERBOSE "Adding update_pot target to update ${_potFile}")
4041

41-
if(EXISTS ${_potFile})
42+
if(EXISTS ${_potFile})
4243

43-
if(SKIP_TRANSLATIONS)
44-
ADD_CUSTOM_TARGET(translations)
45-
else()
46-
ADD_CUSTOM_TARGET(translations ALL)
47-
endif()
44+
if(SKIP_TRANSLATIONS)
45+
message(VERBOSE "NOTE: SKIP_TRANSLATIONS is set, building i18n files is not part of the default build!")
46+
ADD_CUSTOM_TARGET(translations)
47+
else()
48+
ADD_CUSTOM_TARGET(translations ALL)
49+
endif()
4850

49-
foreach(_lang ${LANGUAGES})
50-
SET(_tempPO "${CMAKE_CURRENT_BINARY_DIR}/${_lang}.po")
51-
ADD_CUSTOM_COMMAND(OUTPUT ${_tempPO}
52-
COMMAND msgmerge -o ${_tempPO} ${EXTRA_MSGMERGE} -s ${CMAKE_CURRENT_SOURCE_DIR}/${_lang}.po ${_potFile}
53-
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
54-
COMMENT "Updated: ${_tempPO}")
55-
ADD_CUSTOM_TARGET(generate-${_lang}.po DEPENDS ${_tempPO})
56-
57-
SET(_tempMO "${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo")
58-
ADD_CUSTOM_COMMAND(OUTPUT ${_tempMO}
59-
COMMAND msgfmt -o ${_tempMO} ${EXTRA_MSGFMT} ${_tempPO}
60-
DEPENDS ${_tempPO}
61-
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
62-
#COMMENT "Compiled: ${_tempMO}")
63-
ADD_CUSTOM_TARGET(generate-${_lang}.gmo DEPENDS ${_tempMO})
64-
install(FILES ${_tempMO} DESTINATION "${LOCDIR}/${_lang}/LC_MESSAGES/" RENAME "${PACKAGE}.mo" OPTIONAL)
65-
add_dependencies(translations generate-${_lang}.gmo)
66-
endforeach()
51+
foreach(_lang ${LANGUAGES})
52+
SET(_tempPO "${CMAKE_CURRENT_BINARY_DIR}/${_lang}.po")
53+
set(_srcPO "${CMAKE_CURRENT_SOURCE_DIR}/${_lang}.po")
54+
message(VERBOSE "Generating updated ${_tempPO} from ${_srcPO}")
55+
ADD_CUSTOM_COMMAND(OUTPUT ${_tempPO}
56+
COMMAND msgmerge -o "${_tempPO}" ${EXTRA_MSGMERGE} -s "${_srcPO}" "${_potFile}"
57+
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
58+
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${_lang}.po" ${_potFile}
59+
COMMENT "Updated: ${_tempPO}")
60+
ADD_CUSTOM_TARGET(generate-${_lang}.po DEPENDS ${_tempPO})
6761

68-
endif()
62+
if(PO_UPDATE)
63+
set(SRC_UPDATE COMMAND ${CMAKE_COMMAND} -E copy_if_different "${_tempPO}" "${_srcPO}")
64+
else()
65+
set(SRC_UPDATE )
66+
endif()
67+
68+
SET(_tempMO "${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo")
69+
ADD_CUSTOM_COMMAND(OUTPUT "${_tempMO}"
70+
COMMAND msgfmt -o ${_tempMO} ${EXTRA_MSGFMT} ${_tempPO}
71+
${SRC_UPDATE}
72+
DEPENDS ${_tempPO}
73+
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
74+
#COMMENT "Compiled: ${_tempMO}")
75+
ADD_CUSTOM_TARGET(generate-${_lang}.gmo DEPENDS ${_tempMO})
76+
install(FILES ${_tempMO} DESTINATION "${LOCDIR}/${_lang}/LC_MESSAGES/" RENAME "${PACKAGE}.mo" OPTIONAL)
77+
add_dependencies(translations generate-${_lang}.gmo)
78+
endforeach()
79+
80+
endif()
81+
82+
else()
83+
message(STATUS "Some of those tools not found, skipping translations! gettext, xgettext, msgmerge, msgfmt")
6984

7085
endif()
86+
87+
# vim: set noexpandtab:ts=2:shiftwidth=2:

‎po/de.po

+7-9
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ msgstr ""
77
"Project-Id-Version: icewm 1.2.26\n"
88
"Report-Msgid-Bugs-To: https://github.com/bbidulock/icewm/issues\n"
99
"POT-Creation-Date: 2023-12-28 19:22+0100\n"
10-
"PO-Revision-Date: 2023-02-09 15:14+0000\n"
10+
"PO-Revision-Date: 2024-02-29 14:42+0000\n"
1111
"Last-Translator: Gemineo <vistatec@gemineo.de>\n"
12-
"Language-Team: German <https://l10n.opensuse.org/projects/icewm/icewm-1-4-"
13-
"branch/de/>\n"
12+
"Language-Team: German <https://l10n.opensuse.org/projects/icewm/"
13+
"icewm-1-4-branch/de/>\n"
1414
"Language: de\n"
1515
"MIME-Version: 1.0\n"
1616
"Content-Type: text/plain; charset=UTF-8\n"
@@ -2034,7 +2034,7 @@ msgstr "Schlaf-_Modus"
20342034

20352035
#: src/wmapp.cc:528 src/wmdialog.cc:91
20362036
msgid "_Hibernate"
2037-
msgstr ""
2037+
msgstr "_Tiefschlaf"
20382038

20392039
#: src/wmapp.cc:532
20402040
msgid "Restart _Icewm"
@@ -2284,7 +2284,7 @@ msgstr ""
22842284

22852285
#: src/wmapp.cc:1633
22862286
msgid " -o, --output=FILE Redirect all output to FILE.\n"
2287-
msgstr ""
2287+
msgstr " -o, --output=DATEI Gesamte Ausgabe an DATEI umleiten.\n"
22882288

22892289
#: src/wmapp.cc:1638
22902290
#, c-format
@@ -2452,13 +2452,11 @@ msgstr "_Über"
24522452

24532453
#: src/wmdialog.cc:95
24542454
msgid "Reload win_options"
2455-
msgstr ""
2455+
msgstr "Win-_Optionen neu laden"
24562456

24572457
#: src/wmdialog.cc:96
2458-
#, fuzzy
2459-
#| msgid "Reload"
24602458
msgid "Reload ke_ys"
2461-
msgstr "Neu laden"
2459+
msgstr "S_chlüssel neu laden"
24622460

24632461
#: src/wmframe.cc:1375
24642462
msgid "Rename"

‎po/es.po

+7-9
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ msgstr ""
88
"Project-Id-Version: IceWM 1.2.26\n"
99
"Report-Msgid-Bugs-To: https://github.com/bbidulock/icewm/issues\n"
1010
"POT-Creation-Date: 2023-12-28 19:22+0100\n"
11-
"PO-Revision-Date: 2023-02-08 22:14+0000\n"
11+
"PO-Revision-Date: 2024-02-29 23:42+0000\n"
1212
"Last-Translator: Antonio Simón <antonio@trans-mission.com>\n"
13-
"Language-Team: Spanish <https://l10n.opensuse.org/projects/icewm/icewm-1-4-"
14-
"branch/es/>\n"
13+
"Language-Team: Spanish <https://l10n.opensuse.org/projects/icewm/"
14+
"icewm-1-4-branch/es/>\n"
1515
"Language: es\n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=UTF-8\n"
@@ -2029,7 +2029,7 @@ msgstr "Modo _Suspendido"
20292029

20302030
#: src/wmapp.cc:528 src/wmdialog.cc:91
20312031
msgid "_Hibernate"
2032-
msgstr ""
2032+
msgstr "_Hibernar"
20332033

20342034
#: src/wmapp.cc:532
20352035
msgid "Restart _Icewm"
@@ -2278,7 +2278,7 @@ msgstr ""
22782278

22792279
#: src/wmapp.cc:1633
22802280
msgid " -o, --output=FILE Redirect all output to FILE.\n"
2281-
msgstr ""
2281+
msgstr " -o, --output=FILE Redirige toda la salida a FILE.\n"
22822282

22832283
#: src/wmapp.cc:1638
22842284
#, c-format
@@ -2445,13 +2445,11 @@ msgstr "_Acerca de"
24452445

24462446
#: src/wmdialog.cc:95
24472447
msgid "Reload win_options"
2448-
msgstr ""
2448+
msgstr "Volver a cargar _opciones win"
24492449

24502450
#: src/wmdialog.cc:96
2451-
#, fuzzy
2452-
#| msgid "Reload"
24532451
msgid "Reload ke_ys"
2454-
msgstr "Volver a cargar"
2452+
msgstr "Volver a cargar cla_ves"
24552453

24562454
#: src/wmframe.cc:1375
24572455
msgid "Rename"

‎po/fr.po

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ msgstr ""
88
"Project-Id-Version: icewm 1.2.15pre3\n"
99
"Report-Msgid-Bugs-To: https://github.com/bbidulock/icewm/issues\n"
1010
"POT-Creation-Date: 2023-12-28 19:22+0100\n"
11-
"PO-Revision-Date: 2023-04-21 11:14+0000\n"
12-
"Last-Translator: Wallon <franckjl@hotmail.com>\n"
13-
"Language-Team: French <https://l10n.opensuse.org/projects/icewm/icewm-1-4-"
14-
"branch/fr/>\n"
11+
"PO-Revision-Date: 2024-03-04 17:42+0000\n"
12+
"Last-Translator: Sophie Leroy <sophie@stoquart.com>\n"
13+
"Language-Team: French <https://l10n.opensuse.org/projects/icewm/"
14+
"icewm-1-4-branch/fr/>\n"
1515
"Language: fr\n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=UTF-8\n"
@@ -2052,7 +2052,7 @@ msgstr "_Mode veille"
20522052

20532053
#: src/wmapp.cc:528 src/wmdialog.cc:91
20542054
msgid "_Hibernate"
2055-
msgstr ""
2055+
msgstr "_Hyberner"
20562056

20572057
#: src/wmapp.cc:532
20582058
msgid "Restart _Icewm"
@@ -2303,7 +2303,7 @@ msgstr ""
23032303

23042304
#: src/wmapp.cc:1633
23052305
msgid " -o, --output=FILE Redirect all output to FILE.\n"
2306-
msgstr ""
2306+
msgstr " -o, --output=FICHIER Rediriger toutes les sorties vers FICHIER.\n"
23072307

23082308
#: src/wmapp.cc:1638
23092309
#, c-format

‎po/it.po

+7-9
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ msgstr ""
1111
"Project-Id-Version: IceWM 1.2.31\n"
1212
"Report-Msgid-Bugs-To: https://github.com/bbidulock/icewm/issues\n"
1313
"POT-Creation-Date: 2023-12-28 19:22+0100\n"
14-
"PO-Revision-Date: 2023-02-07 14:14+0000\n"
14+
"PO-Revision-Date: 2024-03-01 16:42+0000\n"
1515
"Last-Translator: Davide Aiello <davide.aiello@novilingulists.com>\n"
16-
"Language-Team: Italian <https://l10n.opensuse.org/projects/icewm/icewm-1-4-"
17-
"branch/it/>\n"
16+
"Language-Team: Italian <https://l10n.opensuse.org/projects/icewm/"
17+
"icewm-1-4-branch/it/>\n"
1818
"Language: it\n"
1919
"MIME-Version: 1.0\n"
2020
"Content-Type: text/plain; charset=UTF-8\n"
@@ -2034,7 +2034,7 @@ msgstr "_Modalità ri_sparmio energetico"
20342034

20352035
#: src/wmapp.cc:528 src/wmdialog.cc:91
20362036
msgid "_Hibernate"
2037-
msgstr ""
2037+
msgstr "_Iberna"
20382038

20392039
#: src/wmapp.cc:532
20402040
msgid "Restart _Icewm"
@@ -2282,7 +2282,7 @@ msgstr ""
22822282

22832283
#: src/wmapp.cc:1633
22842284
msgid " -o, --output=FILE Redirect all output to FILE.\n"
2285-
msgstr ""
2285+
msgstr " -o, --output=FILE Reindirizza tutti gli output al FILE.\n"
22862286

22872287
#: src/wmapp.cc:1638
22882288
#, c-format
@@ -2447,13 +2447,11 @@ msgstr "_Informazioni"
24472447

24482448
#: src/wmdialog.cc:95
24492449
msgid "Reload win_options"
2450-
msgstr ""
2450+
msgstr "Ricarica win_options"
24512451

24522452
#: src/wmdialog.cc:96
2453-
#, fuzzy
2454-
#| msgid "Reload"
24552453
msgid "Reload ke_ys"
2456-
msgstr "Ricarica"
2454+
msgstr "Ricarica ke_ys"
24572455

24582456
#: src/wmframe.cc:1375
24592457
msgid "Rename"

0 commit comments

Comments
 (0)