Commit adb8f6d7 authored by Alf Gaida's avatar Alf Gaida

Cherry-picking upstream release 0.11.0.

* Synced debian/foo with experimental
* Bumped Standards to 3.9.8, no changes needed
* Bumped compat to 10
* Removed --parallel from rules, standard in compat 10
* Bumped build dependency debhelper (>= 10)
* Bumped build dependency liblxqt-dev (>= 0.11.0)
* Bumped build dependency libqtxdg-dev (>= 2.0.0)
* Added build dependency libkf5windowsystem-dev
* Added build dependency libqt5svg5-dev
* Added Recommends obconf-qt-l10n
* Fixed VCS fields, using plain /git/
* Used GPL-2+ for debian, no need to introduce a second license
* Fixed copyrights Format field to https
* Dropped patches, applied upstream
* Added translation control to rules
* Set CMAKE_BUILD_TYPE=RelWithDebInfo
* Exported LC_ALL=C.UTF-8, make builds reproducible
* Cleaned up source/options and .gitignore
parent 2f8e9ef0
build
*.kdev4
src/translations/obconf-qt
Copyright:
Copyright (c) 2012-2014 LXQt team
Copyright (c) 2012-2016 LXQt team
This program is based on source code from the ObConf project
<http://openbox.org/wiki/ObConf:About>
......
obconf-qt-0.11.0 / 2016-09-24
=============================
* Bump version to 0.2.0 (#20)
* Extend README.md
* occured -> occurred
* build: Use external translations
* ts-files removal
* Bump year
* Work around grep 2.23 new behaviour
* Don't track $IDE settings
* Japanese translation update
* Reflect replacement README --> README.md in CMakeLists.txt
* Use markdown for README
* Update translations
* Fix license file
* Hungarian translations added
* src/CMakeLists.txt: do not completely overwrite CMAKE_CXX_FLAGS
* Use GNUInstallDirs
* Small build fix (themes dir path)
* Update German translation
* Update translations.
* Update the About dialog.
* Port missing "Dock" options from obconf gtk+ version.
* Support changing the name of desktops.
* German translation
* Default to Qt5
0.9.0 / 2015-02-25
==================
* Generate .desktop file again
* Enhance Portuguese translations
* Portuguese update with fixes
* Fix COPYING and AUTHORS information. The license should be GPL2, not LGPL. * Also update AUTHORS file to include more information of upstream obconf project.
* remove the old and outdated packaging stub
* lxqt_translate_desktop: pass -h instead of --no-filename to grep which is compatible with Busybox
* lxqt_translate_desktop: Updates code to cope with the cmake-policy CMP0054
* Adds .gitigore
* Fixes the app icon install location
* Adds .desktop translations support
* Update translations
* Makes it extract and compile and load translations
* Renames the translations files to their proper names
* Translate to Russian .desktop file
* Update Russian translation
* Commit from LXDE Pootle server by user andika.: 611 of 611 strings translated (0 need review).
* Commit from LXDE Pootle server by user rago1975.: 611 of 611 strings translated (0 need review).
* Support Qt5.
0.1.0 / 2014-05-07
==================
* Sync COPYING file with the actual used license
* Commit from LXDE Pootle server by user knedlyk.: 72 of 108 strings translated (0 fuzzy).
* Commit from LXDE Pootle server by user knedlyk.: 54 of 108 strings translated (1 fuzzy).
* Commit from LXDE Pootle server by user strebski.: 108 of 108 strings translated (0 fuzzy).
* Update AUTHORS and COPYING
* Do not re-generate *.ts files everytime
* Commit from LXDE Pootle server by user strebski.: 105 of 108 strings translated (0 fuzzy).
* Commit from LXDE Pootle server by user strebski.: 102 of 108 strings translated (0 fuzzy).
* Commit from LXDE Pootle server by user strebski.: 95 of 108 strings translated (1 fuzzy).
* Commit from LXDE Pootle server by user strebski.: 89 of 108 strings translated (1 fuzzy).
* Commit from LXDE Pootle server by user zvacet.: 73 of 108 strings translated (0 fuzzy).
* Commit from LXDE Pootle server by user hirkmt.: 108 of 108 strings translated (0 fuzzy).
* New files added from LXDE Pootle server based on templates
* Handle translations correctly.
* Commit from LXDE Pootle server by user zvacet.: 72 of 108 strings translated (0 fuzzy).
* Commit from LXDE Pootle server by user Fitoschido.: 107 of 108 strings translated (0 fuzzy).
* Commit from LXDE Pootle server by user strebski.: 83 of 108 strings translated (1 fuzzy).
* Commit from LXDE Pootle server by user Fitoschido.: 103 of 108 strings translated (0 fuzzy).
* Commit from LXDE Pootle server by user mbouzada.: 108 of 108 strings translated (0 fuzzy).
* Commit from LXDE Pootle server by user Fitoschido.: 98 of 108 strings translated (0 fuzzy).
* Commit from LXDE Pootle server by user zvacet.: 64 of 108 strings translated (0 fuzzy).
* New files added from LXDE Pootle server based on templates
* New files added from LXDE Pootle server based on templates
* Commit from LXDE Pootle server by user strebski.: 82 of 108 strings translated (0 fuzzy).
* Commit from LXDE Pootle server by user smarquespt.: 106 of 108 strings translated (0 fuzzy).
* Commit from LXDE Pootle server by user andika.: 108 of 108 strings translated (0 fuzzy).
* Commit from LXDE Pootle server by user andika.: 65 of 108 strings translated (0 fuzzy).
* Commit from LXDE Pootle server by user Fitoschido.: 87 of 108 strings translated (0 fuzzy).
* New files added from LXDE Pootle server based on templates
* Commit from LXDE Pootle server by user smarquespt.: 56 of 108 strings translated (0 fuzzy).
* New files added from LXDE Pootle server based on templates
* Commit from LXDE Pootle server by user strebski.: 63 of 108 strings translated (0 fuzzy).
* Commit from LXDE Pootle server by user strebski.: 54 of 108 strings translated (0 fuzzy).
* New files added from LXDE Pootle server based on templates
* New files added from LXDE Pootle server based on templates
* New files added from LXDE Pootle server based on templates
* New files added from LXDE Pootle server based on templates
* New files added from LXDE Pootle server based on templates
* New files added from LXDE Pootle server based on templates
* New files added from LXDE Pootle server based on templates
* New files added from LXDE Pootle server based on templates
* Commit from LXDE Pootle server by user brother.: 108 of 108 strings translated (0 fuzzy).
* New files added from LXDE Pootle server based on templates
* Implement changing font and remove unnecessary files. This commit is done in front of our presidential palace during a protest.
* Add a debian directory
* Fix signal/slot auto-connection problems. Add contents for README and AUTHORS.
* Remove unnecessary files.
* Remove unused files.
* Implement theme configuration.
* Fix text labels. Replace _ with & for keyboard shortcuts.
* Fix mouse page.
* Fix move & resize page.
* Ask openbox to reload confie file correctly. * Remove unnecessary files.
* Split different tab page into different *.cpp files.
* Partially handle combobox.
* Little UI polishing.
* Partially implement config options.
* Initial import into git repo.
......@@ -27,6 +27,9 @@ else()
message(STATUS "Building with Qt${Qt5Core_VERSION_STRING}")
endif()
#Note: no run-time dependency on liblxqt, just a build dependency for lxqt_translate_ts/desktop
find_package(lxqt REQUIRED)
find_package(PkgConfig)
pkg_check_modules(GLIB REQUIRED
glib-2.0
......@@ -54,7 +57,7 @@ set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
set (CPACK_PACKAGE_VENDOR "")
set (CPACK_PACKAGE_VERSION_MAJOR "0")
set (CPACK_PACKAGE_VERSION_MINOR "1")
set (CPACK_PACKAGE_VERSION_MINOR "2")
set (CPACK_PACKAGE_VERSION_PATCH "0")
set (CPACK_GENERATOR TBZ2)
set (CPACK_SOURCE_GENERATOR TBZ2)
......
# obconf-qt
# ObConf-Qt
A Qt port of [ObConf](http://openbox.org/wiki/ObConf:About), a configuration
editor for the [OpenBox](http://openbox.org) window manager.
## Overview
ObConf-Qt is a Qt port of [ObConf](http://openbox.org/wiki/ObConf:About), a configuration editor for window manager [OpenBox](http://openbox.org).
It is maintained by the LXQt project but can be used independently from this desktop environment.
## Installation
### Compiling source code
Runtime dependencies are xkbcommon, qtx11extras, xdg-utils, hicolor-icon-theme and Openbox.
Additional build dependencies are CMake and optionally Git to pull latest VCS checkouts. The localization files were outsourced to repository [lxqt-l10n](https://github.com/lxde/lxqt-l10n) so the corresponding dependencies are needed, too. Please refer to this repository's `README.md` for further information.
Code configuration is handled by CMake. CMake variable `CMAKE_INSTALL_PREFIX` has to be set to `/usr` on most operating systems.
To build run `make`, to install `make install` which accepts variable `DESTDIR` as usual.
### Binary packages
Official binary packages are available in Arch Linux and Debian (as of Debian stretch).
The tool is missing in Fedora so far. Same applies to openSUSE where it is about to be included, though.
......@@ -71,13 +71,13 @@ function(lxqt_translate_desktop _RESULT)
set(_pattern "'\\[.*]\\s*='")
if (_translations)
add_custom_command(OUTPUT ${_outFile}
COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
COMMAND grep -h ${_pattern} ${_translations} >> ${_outFile}
COMMAND grep -v -a "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
COMMAND grep -h -a ${_pattern} ${_translations} >> ${_outFile}
COMMENT "Generating ${_fileName}${_fileExt}"
)
else()
add_custom_command(OUTPUT ${_outFile}
COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
COMMAND grep -v -a "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
COMMENT "Generating ${_fileName}${_fileExt}"
)
endif()
......
/*.debhelper
/*.log
/*.substvars
/debhelper-build-stamp
/files
/obconf-qt/
......
obconf-qt (0.11.0-2) unstable; urgency=medium
* Cherry-picking upstream release 0.11.0.
* Synced debian/foo with experimental
* Bumped Standards to 3.9.8, no changes needed
* Bumped compat to 10
* Removed --parallel from rules, standard in compat 10
* Bumped build dependency debhelper (>= 10)
* Bumped build dependency liblxqt-dev (>= 0.11.0)
* Bumped build dependency libqtxdg-dev (>= 2.0.0)
* Added build dependency libkf5windowsystem-dev
* Added build dependency libqt5svg5-dev
* Added Recommends obconf-qt-l10n
* Fixed VCS fields, using plain /git/
* Used GPL-2+ for debian, no need to introduce a second license
* Fixed copyrights Format field to https
* Dropped patches, applied upstream
* Added translation control to rules
* Set CMAKE_BUILD_TYPE=RelWithDebInfo
* Exported LC_ALL=C.UTF-8, make builds reproducible
* Cleaned up source/options and .gitignore
-- Alf Gaida <agaida@siduction.org> Tue, 18 Oct 2016 20:08:08 +0200
obconf-qt (0.9.0+20151227-2) unstable; urgency=medium
* make build reproducible again (Closes: 815900), thanks to Eduard Sanou
......
......@@ -5,22 +5,27 @@ Uploaders: Alf Gaida <agaida@siduction.org>,
Andrew Lee (李健秋) <ajqlee@debian.org>
Section: utils
Priority: optional
Build-Depends: cmake (>= 3.0.2),
debhelper (>= 9),
Build-Depends: debhelper (>= 10),
cmake (>= 3.0.2),
libkf5windowsystem-dev,
liblxqt0-dev (>= 0.11.0),
libqt5svg5-dev,
libqt5x11extras5-dev,
libqt5xdg-dev (>= 2.0.0),
openbox-dev,
pkg-config,
qttools5-dev,
qttools5-dev-tools
Standards-Version: 3.9.7
Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/obconf-qt.git/?h=debian/sid
Vcs-Git: https://anonscm.debian.org/cgit/pkg-lxqt/obconf-qt.git -b debian/sid
Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/obconf-qt.git -b debian/sid
Homepage: https://github.com/lxde/obconf-qt
Package: obconf-qt
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends}
Recommends: obconf-qt-l10n
Description: Openbox configuration with a Qt interface
obconf-qt is an utility to configure openbox with a Qt interface.
.
......
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: obconf-qt
Source: https://github.com/lxde/obconf-qt
......@@ -9,21 +9,7 @@ License: GPL-2.0+
Files: debian/*
Copyright: 2013-2016 Alf Gaida <agaida@siduction.org>
2015 Andrew Lee (李健秋) <ajqlee@debian.org>
License: LGPL-2.1+
License: LGPL-2.1+
This program or library is free software; you can redistribute it
and/or modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
.
On Debian systems, the complete text of the GNU Lesser General
Public License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".
License: GPL-2.0+
License: GPL-2.0+
This program is free software; you can redistribute it and/or modify
......
[DEFAULT]
debian-branch = debian/sid
debian-branch = debian/experimental
upstream-branch = upstream/latest
pristine-tar = True
......
Description: Make builds reproducible again
Fixed upstream, so no need to send the patch upstream
Author: Alf Gaida <agaida@siduction.org>
Bug-Debian: https://bugs.debian.org/815900
--- obconf-qt-0.9.0+20151227.orig/cmake/LXQtTranslateDesktop.cmake
+++ obconf-qt-0.9.0+20151227/cmake/LXQtTranslateDesktop.cmake
@@ -71,13 +71,13 @@ function(lxqt_translate_desktop _RESULT)
set(_pattern "'\\[.*]\\s*='")
if (_translations)
add_custom_command(OUTPUT ${_outFile}
- COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
- COMMAND grep -h ${_pattern} ${_translations} >> ${_outFile}
+ COMMAND grep -a -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
+ COMMAND grep -a -h ${_pattern} ${_translations} >> ${_outFile}
COMMENT "Generating ${_fileName}${_fileExt}"
)
else()
add_custom_command(OUTPUT ${_outFile}
- COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
+ COMMAND grep -a -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
COMMENT "Generating ${_fileName}${_fileExt}"
)
endif()
reproducible-builds.patch
#!/usr/bin/make -f
#export DH_VERBOSE=1
# export DH_VERBOSE=1
export LC_ALL=C.UTF-8
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
%:
dh ${@} --buildsystem cmake \
--parallel
dh ${@} --buildsystem cmake
override_dh_auto_configure:
dh_auto_configure -- \
-DPULL_TRANSLATIONS=OFF\
-DUPDATE_TRANSLATIONS=OFF\
-DCMAKE_BUILD_TYPE=RelWithDebInfo
tar-ignore=.gitignore
tar-ignore=obconf-qt.kdev4
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.22 (GNU/Linux)
mQINBFJevCYBEACx+Hvy+Vsuf+V5jeLUnzjAmHoy8DfTeGWr3ts30IapLHrfi0+U
WpzNnISO77yTr4VNboVZH+GHM/rnPfieODfB4ZW6CZLlInMSKUXcgQsEqXpyBZhA
Ib/SPy2bOfHly1uRJes0uRDsH5+v/hD74sByfnjQlrvI68O6wvGZmDFMNNPVO8+/
OWBSBNkBuVrrZOMSPsLwQGJ4UtUQ4whburaPJG4VZJc5DLbzJGbEuACc0IAEYJS3
7AfXVXn4j4Gc9F3o1xTUnbOBnwGPquWwUIm3FM7Ec2OdkvMt3EwvnkMAfeVrq3iE
FDD/KZTxdL0BZH3QD8gB7Jm4v4f3Nkobg6JCvCbcH3wBdZW4mASbwWzfRaDC2zHb
ErTglD7PpShLKZZ0pr9okWZEGw4Ku3q8ALi1JXK/ePTmsBlvkVskOJ3Nnd0avgH4
+Q/vZoKfH8EhNY745rI+8CE9iv6V9XiSUt4CKEWAENt4A8hq6U2vV+jZv3B6AgD7
ZjiI59yD4YuYubu8rCnNizTgh1voVw3ietknn/x2H5yH8fByWZ5uL87C0ky/uma6
ZGbiiAtM4kdkyDMrfRV5nlEG9EKAGPVu5mjeSCrfkETwZ9OFPz1AuDye4ZEXrrcC
iRQ7RX6/GtW18aHER0kzGnfwx5KJzkDrRBY8A2PdXLBcrsN4WpK9EX01PQARAQAB
tCNKZXJvbWUgTGVjbGFuY2hlIDxqZXJvbWVAbGVjbGFuLmNoPokCPwQTAQIAKQUC
Ul68JgIbAwUJAeEzgAcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEDfgrx/a
SPNzSHIP/1ewXcC0TFBcvDD7MrIP7anyNfiWfW7cxkR8GSamkg6HTa6Ndyr1FFjJ
OoDFUP37jWhu59CsHxs2D0zRWJktezfvElscRgqbHcdpIznqsGdI8hXCZafhBGVb
sdAB2LRawcXGxnXt7XajPcSVwLWRE62caBqohznU2iWvI780WNjEbZoA0LhZwaFF
UUPJm8ea9v0IkZVKUyg9WONZ1U7FEG9SaEiSpI8kJdx1fvCwZVDV/NRO5GqnJaho
P1LCne4YdwS6pt1/fRgk32IHxxZfHlLzLHxb6v1JmIg72x28qCmGyK9oFBDbbnYu
6Aq8XbHogOrD5vJM2Pfm2IhV0+JHOjfQbddv8tsAH1M+LI+tToXmg5st1AU3wnTn
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
=fF8P
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
=h7ww
-----END PGP PUBLIC KEY BLOCK-----
version=3
version=4
opts="pgpsigurlmangle=s/$/.asc/" \
https://github.com/lxde/obconf-qt/releases .*/([\d\.]+).tar.gz
https://github.com/lxde/obconf-qt/releases .*/obconf-qt-([\d\.]+).tar.xz
......@@ -57,45 +57,26 @@ add_custom_command(
# add translation for obconf-qt
option (UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
set(TRANSLATION_TEMPLATE "translations/obconf-qt.ts")
file(GLOB TS_FILES translations/obconf-qt_*.ts)
if(USE_QT4)
if (UPDATE_TRANSLATIONS)
qt4_create_translation(QMS_FILES
${obconf-qt_SRCS}
${obconf-qt_UI_H}
${TRANSLATION_TEMPLATE}
OPTIONS -locations absolute)
qt4_create_translation(QMS_FILES
${obconf-qt_SRCS}
${obconf-qt_UI_H}
${TS_FILES}
OPTIONS -locations absolute)
else (UPDATE_TRANSLATIONS)
qt4_add_translation(QM_FILES ${TS_FILES})
endif (UPDATE_TRANSLATIONS)
else(USE_QT4) # use qt4
if (UPDATE_TRANSLATIONS)
qt5_create_translation(QMS_FILES
${obconf-qt_SRCS}
${obconf-qt_UI_H}
${TRANSLATION_TEMPLATE}
OPTIONS -locations absolute)
qt5_create_translation(QM_FILES
${obconf-qt_SRCS}
${obconf-qt_UI_H}
${TS_FILES}
OPTIONS -locations absolute)
else (UPDATE_TRANSLATIONS)
qt5_add_translation(QM_FILES ${TS_FILES})
endif (UPDATE_TRANSLATIONS)
endif(USE_QT4)
if(UPDATE_TRANSLATIONS)
add_custom_target(update_obconf-qt_translations ALL DEPENDS ${QMS})
endif()
include(LXQtTranslateTs)
lxqt_translate_ts(QM_FILES
USE_QT4
${USE_QT4}
UPDATE_TRANSLATIONS
${UPDATE_TRANSLATIONS}
SOURCES
${obconf-qt_SRCS}
${obconf-qt_UI_H}
INSTALL_DIR
"${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/translations"
PULL_TRANSLATIONS
${PULL_TRANSLATIONS}
CLEAN_TRANSLATIONS
${CLEAN_TRANSLATIONS}
TRANSLATIONS_REPO
${TRANSLATIONS_REPO}
TRANSLATIONS_REFSPEC
${TRANSLATIONS_REFSPEC}
)
# install a desktop entry file
include(LXQtTranslateDesktop)
......@@ -105,7 +86,6 @@ lxqt_translate_desktop(DESKTOP_FILES
)
install(FILES ${DESKTOP_FILES} DESTINATION share/applications)
install(FILES ${QM_FILES} DESTINATION share/obconf-qt/translations)
# prevent the generated files from being deleted during make clean
set_directory_properties(PROPERTIES CLEAN_NO_CUSTOM true)
......
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1">
<context>
<name>Fm::FontButton</name>
<message>
<location filename="../fontbutton.cpp" line="46"/>
<source>Bold</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../fontbutton.cpp" line="50"/>
<source>Italic</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainDialog</name>
<message>
<location filename="../../build/src/ui_obconf.h" line="829"/>
<source>Window Manager Preferences</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="834"/>
<source>Theme</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="836"/>
<source>Appearance</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="838"/>
<source>Font</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="840"/>
<location filename="../../build/src/ui_obconf.h" line="855"/>
<source>Windows</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="842"/>
<source>Move &amp; Resize</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="844"/>
<source>Mouse</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="846"/>
<source>Desktops</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="848"/>
<source>Margins</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="850"/>
<source>Dock</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="853"/>
<source>&amp;Install a new theme...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="854"/>
<source>Create a theme &amp;archive (.obt)...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="856"/>
<source>&amp;Windows retain a border when undecorated</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="857"/>
<source>A&amp;nimate iconify and restore</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="858"/>
<source>Window Titles</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="859"/>
<source>Button order:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="860"/>
<source>N: Window icon
L: Window label (Title)
I: Iconify (Minimize)
M: Maximize
C: Close
S: Shade (Roll up)
D: Omnipresent (On all desktops)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="873"/>
<source>&amp;Active window title: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="874"/>
<source>&amp;Inactive window title: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="875"/>
<source>Menu &amp;header: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="876"/>
<source>&amp;Menu Item: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="877"/>
<source>Active &amp;On-screen display: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="878"/>
<source>Inactive O&amp;n-screen display: </source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="879"/>
<source>Focus &amp;new windows when they appear</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="880"/>
<source>&amp;Place new windows under the mouse pointer</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="881"/>
<source>&amp;Center new windows when they are placed</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="882"/>
<source>Prefer to place new windows &amp;on:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="885"/>
<source>All monitors</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="886"/>
<source>The active monitor</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="887"/>
<source>The monitor with the mouse</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="888"/>
<source>Primary monitor</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="890"/>
<source>Primary Monitor</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="891"/>
<source>The primary monitor is where Openbox will place dialogs, such as the one used for cycling windows.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../build/src/ui_obconf.h" line="892"/>
<source>Primary &amp