Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make linking with -lsupc++ effective (w/o stdlibc++) #14

Merged
merged 4 commits into from
Jan 25, 2015
Merged

Make linking with -lsupc++ effective (w/o stdlibc++) #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f462658
Make linking with -lsupc++ effective (w/o stdlibc++)
Code7R Jan 25, 2015
2c82649
German translation update and review
Code7R Jan 25, 2015
aa0652f
Basic review of Russian translation (incomplete)
Code7R Jan 25, 2015
efef969
Language update, merge with some translations from Debian, manual rev…
Code7R Jan 25, 2015
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
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ it in winter ;-) The aim of IceWM is to have good 'Feel' and decent
**_Quick Start_**
---

This is the icewm-1.3.9 package, released under LGPL license 2014-09-01. This release as well as future versions here, can all be obtained from the GitHub repository using a command such as:
This is the icewm-1.3.9.23 package, released under LGPL license 2015-01-24. This release as well as future versions here, can all be obtained from the GitHub repository using a command such as:

git clone http://github.com/bbidulock/icewm.git

Expand Down Expand Up @@ -58,7 +58,7 @@ file `COPYING'.

Documentation for configuring the window manager can be obtained from
http://www.icewm.org/ or from the online manual: point your browser at
file:///usr/share/doc/icewm-1.3.9/icewm.html.
file:///usr/share/doc/icewm-1.3.9.23/icewm.html.

Unfortunately the documentation is for version 1.2.27 and is incomplete
at that; however, it is for the most part usable. Also, a rather sparse
Expand All @@ -78,7 +78,7 @@ Currently, the only included utilities are **icewmbg** (_a background setting pr
---

Unspecified keyboard shortcuts can be handled with the **bbkeys(1)**
utility available from: http://sourceforge.net/projects/bbkeys/ <br>
utility available from: http://bbkeys.sourceforge.net <br>
For additional utilities see: [http://www.icewm.org/FAQ/IceWM-FAQ-11.html](http://www.icewm.org/FAQ/IceWM-FAQ-11.html)
<br>

Expand Down
8 changes: 5 additions & 3 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
# Process this file with autoconf to produce a configure script.

AC_PREREQ([2.69])
AC_INIT([icewm],[1.3.9],[http://github.com/bbidulock/icewm])
AC_INIT([icewm],[1.3.9.23],[http://github.com/bbidulock/icewm])
AC_CONFIG_SRCDIR([src/ysmapp.cc])
AC_CONFIG_AUX_DIR([scripts])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
AC_CANONICAL_TARGET

DATE='2014-09-01'
DATE='2015-01-24'
AC_SUBST([DATE])

APPLICATIONS='icewm icewm-session icesh icewmhint icewmbg icewmtray'
Expand Down Expand Up @@ -43,7 +43,7 @@ LT_LANG([C++])
AC_PROG_LIBTOOL
AC_SUBST([LIBTOOL_DEPS])

AM_GNU_GETTEXT_VERSION([0.19.2])
AM_GNU_GETTEXT_VERSION([0.19.3])
AM_GNU_GETTEXT([external])

AC_ARG_ENABLE([i18n],
Expand Down Expand Up @@ -453,6 +453,8 @@ AC_ARG_VAR([EXTRA_LIBS], [Extra core libraries.])

CORE_LIBS="$CORE_LIBS "'$(EXTRA_LIBS)'

AC_ARG_VAR([CXXLD], [Alternative libtool linker command.])

# needed by lib/menu.in
AC_SUBST([CONFIG_GNOME2_MENU_DIR])
dnl AC_SUBST([GNOME_VER])
Expand Down
3 changes: 2 additions & 1 deletion configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,5 @@ esac
LDFLAGS="$LDFLAGS" \
DEBUG_CFLAGS="$DEBUG_CFLAGS" \
DEBUG_CXXFLAGS="$DEBUG_CXXFLAGS" \
EXTRA_LIBS="/usr/lib/libsupc++.a"
EXTRA_LIBS="-lsupc++" \
CXXLD=gcc
121 changes: 116 additions & 5 deletions po/be.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.2.2\n"
"Report-Msgid-Bugs-To: http://github.com/bbidulock/icewm\n"
"POT-Creation-Date: 2015-01-24 17:58-0700\n"
"POT-Creation-Date: 2015-01-25 20:43+0100\n"
"PO-Revision-Date: 2003-01-27 22:26+0300\n"
"Last-Translator: Hleb Valoska <[email protected]>\n"
"Language-Team: Belarusian <[email protected]>\n"
Expand Down Expand Up @@ -36,7 +36,7 @@ msgid " - Full"
msgstr ""

#: src/acpustatus.cc:231
#, fuzzy, c-format
#, c-format
msgid "CPU Load: %3.2f %3.2f %3.2f, %u"
msgstr "Загрузка CPU: %3.2f %3.2f %3.2f, %u працэсаў"

Expand Down Expand Up @@ -102,7 +102,7 @@ msgid "%ld mail messages."
msgstr "%ld лістоў."

#: src/apppstatus.cc:204
#, fuzzy, c-format
#, c-format
msgid ""
"Interface %s:\n"
" Current rate (in/out):\t%li %s/%li %s\n"
Expand All @@ -111,10 +111,10 @@ msgid ""
" Online time:\t%ld:%02ld:%02ld%s%s"
msgstr ""
"Інтэрфэйс %s:\n"
" Бягучая хуткасьць (нам/вонкі):\t%lli %s/%lli %s\n"
" Бягучая хуткасьць (нам/вонкі):\t%li %s/%li %s\n"
" Сярэдняя хуткасьць (нам/вонкі):\t%lli %s/%lli %s\n"
" Перададзена (нам/вонкі):\t%lli %s/%lli %s\n"
" Час на лініі:\t%d:%02d:%02d%s%s"
" Час на лініі:\t%ld:%02ld:%02ld%s%s"

#: src/apppstatus.cc:216
msgid ""
Expand Down Expand Up @@ -1387,6 +1387,114 @@ msgstr "\"%s\" не апісвае агульную схему інтэрнэт
msgid "\"%s\" contains no scheme description"
msgstr "\"%s\" ня ўтрымлівае апісаньня схемы"

#, fuzzy
#~ msgid ""
#~ "Interface %s:\n"
#~ " Current rate (in/out):\t%li %s/%li %s\n"
#~ " Current average (in/out):\t%lli %s/%lli %s\n"
#~ " Total average (in/out):\t%li %s/%li %s\n"
#~ " Transferred (in/out):\t%lli %s/%lli %s\n"
#~ " Online time:\t%ld:%02ld:%02ld%s%s"
#~ msgstr ""
#~ "Інтэрфэйс %s:\n"
#~ " Бягучая хуткасьць (нам/вонкі):\t%lli %s/%lli %s\n"
#~ " Сярэдняя хуткасьць (нам/вонкі):\t%lli %s/%lli %s\n"
#~ " Перададзена (нам/вонкі):\t%lli %s/%lli %s\n"
#~ " Час на лініі:\t%d:%02d:%02d%s%s"

#, fuzzy
#~ msgid ""
#~ " Usage: %s [OPTION]...\n"
#~ " \n"
#~ " Plays audio files on GUI events raised by IceWM.\n"
#~ " \n"
#~ " Options:\n"
#~ " \n"
#~ " -d, --display=DISPLAY Display used by IceWM "
#~ "(default: $DISPLAY).\n"
#~ " -s, --sample-dir=DIR Specifies the directory which "
#~ "contains\n"
#~ " the sound files (ie ~/.icewm/sounds).\n"
#~ " -i, --interface=TARGET Specifies the sound output "
#~ "target\n"
#~ " interface, one of OSS, YIFF, ESD\n"
#~ " -D, --device=DEVICE (OSS only) specifies the "
#~ "digital signal\n"
#~ " processor (default /dev/dsp).\n"
#~ " -S, --server=ADDR:PORT (ESD and YIFF) specifies server "
#~ "address and\n"
#~ " port number (default localhost:16001 for ESD\n"
#~ " and localhost:9433 for YIFF).\n"
#~ " -m, --audio-mode[=MODE] (YIFF only) specifies the "
#~ "Audio mode (leave\n"
#~ " blank to get a list).\n"
#~ " --audio-mode-auto (YIFF only) change Audio mode on "
#~ "the fly to\n"
#~ " best match sample's Audio (can cause\n"
#~ " problems with other Y clients, overrides\n"
#~ " --audio-mode).\n"
#~ " \n"
#~ " -v, --verbose Be verbose (prints out each "
#~ "sound event to\n"
#~ " stdout).\n"
#~ " -V, --version Prints version information and "
#~ "exits.\n"
#~ " -h, --help Prints (this) help screen and "
#~ "exits.\n"
#~ " \n"
#~ " Return values:\n"
#~ " \n"
#~ " 0 Success.\n"
#~ " 1 General error.\n"
#~ " 2 Command line error.\n"
#~ " 3 Subsystems error (ie cannot connect to server).\n"
#~ "\n"
#~ msgstr ""
#~ "Ужывай: %s [ОПЦЫЯ]...\n"
#~ "\n"
#~ "Прайграе аўдыёфайлы, адпаведныя здарэньням GUI, учыненым IceWM'ам.\n"
#~ "\n"
#~ "Опцыі:\n"
#~ "\n"
#~ " -d, --display=ДЫСПЛЕЙ Ужыты IceWM'ам дысплей (даўнята: "
#~ "$DISPLAY).\n"
#~ " -s, --sample-dir=КАТ Вызначае каталёг, які ўтрымлівае гукавыя\n"
#~ " файлы (г.зн. ~/.icewm/sounds).\n"
#~ " -i, --interface=АТРЫМАЛЬНІК Вызначае атрымальнік гукавога вываду,\n"
#~ " можа быць: OSS, YIFF ці ESD\n"
#~ " -D, --device=ПРЫЛАДА (Толькі OSS) вызначае апрацоўшчык "
#~ "лічбавага\n"
#~ " гукавога сыгналу (даўнята /dev/dsp).\n"
#~ " -S, --server=АДР:ПОРТ\t (ESD ды YIFF) вызначае адрас ды нумар порту\n"
#~ " сэрвэру (даўнята localhost:16001 для ESD\n"
#~ "\t\t\t\tды localhost:9433 для YIFF).\n"
#~ " -m, --audio-mode[=РЭЖЫМ] (Толькі YIFF) вызначае аўдыёрэжым "
#~ "(пакінь\n"
#~ " пустым, каб атрымаць сьпіс).\n"
#~ " --audio-mode-auto \t(Толькі YIFF) зьмяняе аўдыёрэжым зьлёту для\n"
#~ " найлепшай адпаведнасьці ўзору (можа "
#~ "выклікаць\n"
#~ " праблемы зь іншымі кліентамі Y, "
#~ "перавызначае\n"
#~ " --audio-mode).\n"
#~ "\n"
#~ " -v, --verbose Быць шматслоўным (пісаць кожнае гукавое\n"
#~ " здарэньне ў stdout).\n"
#~ " -V, --version Напісаць вэрсію ды выйсьці.\n"
#~ " -h, --help Напісаць (гэты) экран даведкі ды "
#~ "выйсьці.\n"
#~ "\n"
#~ "Вяртае значэньні:\n"
#~ "\n"
#~ " 0 Пасьпяхова.\n"
#~ " 1 Агульная памылка.\n"
#~ " 2 Памылка каманднага радка.\n"
#~ " 3 Памылка падсыстэмы (г.зн. немагчыма злучыцца з сэрвэрам).\n"
#~ "\n"

#~ msgid "Could not find pixel map %s"
#~ msgstr "Немагчыма знайсьці мапу піксаляў %s"

#~ msgid "Out of memory for pixel map %s"
#~ msgstr "Не стае памяці для мапы піксаляў %s"

Expand Down Expand Up @@ -1569,3 +1677,6 @@ msgstr "\"%s\" ня ўтрымлівае апісаньня схемы"

#~ msgid "M"
#~ msgstr "M"

#~ msgid "CPU Load: %3.2f %3.2f %3.2f, %d processes."
#~ msgstr "Загрузка CPU: %3.2f %3.2f %3.2f, %d працэсаў"
138 changes: 135 additions & 3 deletions po/bg.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: IceWM 1.2.10\n"
"Report-Msgid-Bugs-To: http://github.com/bbidulock/icewm\n"
"POT-Creation-Date: 2015-01-24 17:58-0700\n"
"POT-Creation-Date: 2015-01-25 20:43+0100\n"
"PO-Revision-Date: 2003-08-13 16:16+0200\n"
"Last-Translator: Pavel Pyuter <[email protected]>\n"
"Language-Team: Bulgarian\n"
Expand Down Expand Up @@ -114,9 +114,8 @@ msgid ""
" Online time:\t%ld:%02ld:%02ld%s%s"
msgstr ""
"Интерфейс %s:\n"
" Текуща скорост (вход/изход):\t%lli %s/%lli %s\n"
" Текуща скорост (вход/изход):\t%li %s/%li %s\n"
" Текуща средна скорост (вход/изход):\t%lli %s/%lli %s\n"
" Средна скорост (вход/изход):\t%lli %s/%lli %s\n"
" Прехвърлени (вход/изход):\t%lli %s/%lli %s\n"
" Време:\t%d:%02d:%02d%s%s"

Expand Down Expand Up @@ -1388,6 +1387,136 @@ msgstr ""
msgid "\"%s\" contains no scheme description"
msgstr ""

#, fuzzy
#~ msgid ""
#~ "Interface %s:\n"
#~ " Current rate (in/out):\t%li %s/%li %s\n"
#~ " Current average (in/out):\t%lli %s/%lli %s\n"
#~ " Total average (in/out):\t%li %s/%li %s\n"
#~ " Transferred (in/out):\t%lli %s/%lli %s\n"
#~ " Online time:\t%ld:%02ld:%02ld%s%s"
#~ msgstr ""
#~ "Интерфейс %s:\n"
#~ " Текуща скорост (вход/изход):\t%lli %s/%lli %s\n"
#~ " Текуща средна скорост (вход/изход):\t%lli %s/%lli %s\n"
#~ " Средна скорост (вход/изход):\t%lli %s/%lli %s\n"
#~ " Прехвърлени (вход/изход):\t%lli %s/%lli %s\n"
#~ " Време:\t%d:%02d:%02d%s%s"

#, fuzzy
#~ msgid ""
#~ " Usage: %s [OPTION]...\n"
#~ " \n"
#~ " Plays audio files on GUI events raised by IceWM.\n"
#~ " \n"
#~ " Options:\n"
#~ " \n"
#~ " -d, --display=DISPLAY Display used by IceWM "
#~ "(default: $DISPLAY).\n"
#~ " -s, --sample-dir=DIR Specifies the directory which "
#~ "contains\n"
#~ " the sound files (ie ~/.icewm/sounds).\n"
#~ " -i, --interface=TARGET Specifies the sound output "
#~ "target\n"
#~ " interface, one of OSS, YIFF, ESD\n"
#~ " -D, --device=DEVICE (OSS only) specifies the "
#~ "digital signal\n"
#~ " processor (default /dev/dsp).\n"
#~ " -S, --server=ADDR:PORT (ESD and YIFF) specifies server "
#~ "address and\n"
#~ " port number (default localhost:16001 for ESD\n"
#~ " and localhost:9433 for YIFF).\n"
#~ " -m, --audio-mode[=MODE] (YIFF only) specifies the "
#~ "Audio mode (leave\n"
#~ " blank to get a list).\n"
#~ " --audio-mode-auto (YIFF only) change Audio mode on "
#~ "the fly to\n"
#~ " best match sample's Audio (can cause\n"
#~ " problems with other Y clients, overrides\n"
#~ " --audio-mode).\n"
#~ " \n"
#~ " -v, --verbose Be verbose (prints out each "
#~ "sound event to\n"
#~ " stdout).\n"
#~ " -V, --version Prints version information and "
#~ "exits.\n"
#~ " -h, --help Prints (this) help screen and "
#~ "exits.\n"
#~ " \n"
#~ " Return values:\n"
#~ " \n"
#~ " 0 Success.\n"
#~ " 1 General error.\n"
#~ " 2 Command line error.\n"
#~ " 3 Subsystems error (ie cannot connect to server).\n"
#~ "\n"
#~ msgstr ""
#~ "Употреба: %s [OPTION]...\n"
#~ "\n"
#~ "Възпроизвежда аудио файлове при GUI събития породени от IceWM.\n"
#~ "\n"
#~ "Опции:\n"
#~ "\n"
#~ " -d, --display=DISPLAY Дисплей използван от IceWM (подразбиране: "
#~ "$DISPLAY).\n"
#~ " -s, --sample-dir=DIR Определя директория която съдържа\n"
#~ "\t\t\t\t звуковите файлове (пр. ~/.icewm/sounds).\n"
#~ " -i, --interface=TARGET Определя изходния звуков интерфейс\n"
#~ "\t\t\t\t един от OSS, YIFF, ESD\n"
#~ " -D, --device=DEVICE (OSS само) определя digital signal\n"
#~ "\t\t\t\t processor (подразбиране /dev/dsp).\n"
#~ " -S, --server=ADDR:PORT\t(ESD и YIFF) определя адрес на сървър и\n"
#~ "\t\t\t\t номер на порт (подразбиране localhost:16001 за ESD\n"
#~ "\t\t\t\t и localhost:9433 за YIFF).\n"
#~ " -m, --audio-mode[=MODE] (YIFF само) определя аудио режим (остави\n"
#~ "\t\t\t\t празно за получаване на списък).\n"
#~ " --audio-mode-auto \t(YIFF само) сменя аудио режим в движение, за\n"
#~ "\t\t\t\t да подхожда на образеца (може да причини проблеми\n"
#~ "\t\t\t\t с други Y клиенти, отменя --audio-mode).\n"
#~ "\n"
#~ " -v, --verbose Подробен (отпечатва всяко звуково събитие "
#~ "на\n"
#~ "\t\t\t\t stdout).\n"
#~ " -V, --version Отпечатва информация за версията и "
#~ "излиза.\n"
#~ " -h, --help Отпечатва (този) помощен екран и излиза.\n"
#~ "\n"
#~ "Върнати стойности:\n"
#~ "\n"
#~ " 0 Успех.\n"
#~ " 1 Основна грешка.\n"
#~ " 2 Грешка от команден ред.\n"
#~ " 3 Грешка на подсистемите (пр. немога да се свържа със сървър).\n"
#~ "\n"

#, fuzzy
#~ msgid ""
#~ "Usage: icewmbg [ -r | -q ]\n"
#~ " -r Restart icewmbg\n"
#~ " -q Quit icewmbg\n"
#~ "Loads desktop background according to preferences file\n"
#~ " DesktopBackgroundCenter - Display desktop background centered, not "
#~ "tiled\n"
#~ " SupportSemitransparency - Support for semitransparent terminals\n"
#~ " DesktopBackgroundColor - Desktop background color\n"
#~ " DesktopBackgroundImage - Desktop background image\n"
#~ " DesktopTransparencyColor - Color to announce for semi-transparent "
#~ "windows\n"
#~ " DesktopTransparencyImage - Image to announce for semi-transparent "
#~ "windows\n"
#~ msgstr ""
#~ "Употреба: icewmbg\n"
#~ "Зарежда десктоп фон според preferences файл\n"
#~ " DesktopBackgroundCenter - Показва фон в центъра\n"
#~ " SupportSemitransparency - Поддръжка за полу-прозрачни терминали\n"
#~ " DesktopBackgroundColor - Цвят на фон\n"
#~ " DesktopBackgroundImage - Изображение за фон\n"
#~ " DesktopTransparencyColor - Цвят за полу-прозрачни прозорци\n"
#~ " DesktopTransparencyImage - Изображение за полу-прозрачни прозорци\n"

#~ msgid "Could not find pixel map %s"
#~ msgstr "Could not find pixel map %s"

#~ msgid "Out of memory for pixel map %s"
#~ msgstr "Out of memory for pixel map %s"

Expand Down Expand Up @@ -1516,3 +1645,6 @@ msgstr ""

#~ msgid "Failed to duplicate file descriptor: %s"
#~ msgstr "Failed to duplicate file descriptor: %s"

#~ msgid "CPU Load: %3.2f %3.2f %3.2f, %d processes."
#~ msgstr "CPU Натоварване: %3.2f %3.2f %3.2f, %d процеса"
Loading